tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'pm-6.3-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull more power management updates from Rafael Wysocki:
"These update power capping (new hardware support and cleanup) and
cpufreq (bug fixes, cleanups and intel_pstate adjustment for a new
platform).

Specifics:

- Fix error handling in the apple-soc cpufreq driver (Dan Carpenter)

- Change the log level of a message in the amd-pstate cpufreq driver
so it is more visible to users (Kai-Heng Feng)

- Adjust the balance_performance EPP value for Sapphire Rapids in the
intel_pstate cpufreq driver (Srinivas Pandruvada)

- Remove MODULE_LICENSE from 3 pieces of non-modular code (Nick
Alcock)

- Make a read-only kobj_type structure in the schedutil cpufreq
governor constant (Thomas Weißschuh)

- Add Add Power Limit4 support for Meteor Lake SoC to the Intel RAPL
power capping driver (Sumeet Pawnikar)"

* tag 'pm-6.3-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
cpufreq: apple-soc: Fix an IS_ERR() vs NULL check
powercap: remove MODULE_LICENSE in non-modules
cpufreq: intel_pstate: remove MODULE_LICENSE in non-modules
powercap: RAPL: Add Power Limit4 support for Meteor Lake SoC
cpufreq: amd-pstate: remove MODULE_LICENSE in non-modules
cpufreq: schedutil: make kobj_type structure constant
cpufreq: amd-pstate: Let user know amd-pstate is disabled
cpufreq: intel_pstate: Adjust balance_performance EPP for Sapphire Rapids

Linus Torvalds c8b4accf 53ae7e11

+7 -7
+1 -2
drivers/cpufreq/amd-pstate.c
··· 1263 1263 * with amd_pstate=passive or other modes in kernel command line 1264 1264 */ 1265 1265 if (cppc_state == AMD_PSTATE_DISABLE) { 1266 - pr_debug("driver load is disabled, boot with specific mode to enable this\n"); 1266 + pr_info("driver load is disabled, boot with specific mode to enable this\n"); 1267 1267 return -ENODEV; 1268 1268 } 1269 1269 ··· 1353 1353 1354 1354 MODULE_AUTHOR("Huang Rui <ray.huang@amd.com>"); 1355 1355 MODULE_DESCRIPTION("AMD Processor P-state Frequency Driver"); 1356 - MODULE_LICENSE("GPL");
+2 -2
drivers/cpufreq/apple-soc-cpufreq.c
··· 189 189 *info = match->data; 190 190 191 191 *reg_base = of_iomap(args.np, 0); 192 - if (IS_ERR(*reg_base)) 193 - return PTR_ERR(*reg_base); 192 + if (!*reg_base) 193 + return -ENOMEM; 194 194 195 195 return 0; 196 196 }
+1 -1
drivers/cpufreq/intel_pstate.c
··· 3358 3358 * AlderLake Mobile CPUs. 3359 3359 */ 3360 3360 X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, 102), 3361 + X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, 32), 3361 3362 {} 3362 3363 }; 3363 3364 ··· 3517 3516 3518 3517 MODULE_AUTHOR("Dirk Brandewie <dirk.j.brandewie@intel.com>"); 3519 3518 MODULE_DESCRIPTION("'intel_pstate' - P state driver Intel Core processors"); 3520 - MODULE_LICENSE("GPL");
+2
drivers/powercap/intel_rapl_msr.c
··· 143 143 { X86_VENDOR_INTEL, 6, INTEL_FAM6_ALDERLAKE_N, X86_FEATURE_ANY }, 144 144 { X86_VENDOR_INTEL, 6, INTEL_FAM6_RAPTORLAKE, X86_FEATURE_ANY }, 145 145 { X86_VENDOR_INTEL, 6, INTEL_FAM6_RAPTORLAKE_P, X86_FEATURE_ANY }, 146 + { X86_VENDOR_INTEL, 6, INTEL_FAM6_METEORLAKE, X86_FEATURE_ANY }, 147 + { X86_VENDOR_INTEL, 6, INTEL_FAM6_METEORLAKE_L, X86_FEATURE_ANY }, 146 148 {} 147 149 }; 148 150
-1
drivers/powercap/powercap_sys.c
··· 679 679 680 680 MODULE_DESCRIPTION("PowerCap sysfs Driver"); 681 681 MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>"); 682 - MODULE_LICENSE("GPL v2");
+1 -1
kernel/sched/cpufreq_schedutil.c
··· 546 546 kfree(to_sugov_tunables(attr_set)); 547 547 } 548 548 549 - static struct kobj_type sugov_tunables_ktype = { 549 + static const struct kobj_type sugov_tunables_ktype = { 550 550 .default_groups = sugov_groups, 551 551 .sysfs_ops = &governor_sysfs_ops, 552 552 .release = &sugov_tunables_free,