Commit c8b4accf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 53ae7e11 5719638d

drivers/cpufreq/amd-pstate.c

+1 −2
Original line number Diff line number Diff line
@@ -1263,7 +1263,7 @@ static int __init amd_pstate_init(void) 
	 * with amd_pstate=passive or other modes in kernel command line

	 */

	if (cppc_state == AMD_PSTATE_DISABLE) {

		pr_debug("driver load is disabled, boot with specific mode to enable this\n");

		pr_info("driver load is disabled, boot with specific mode to enable this\n");

		return -ENODEV;

	}
@@ -1353,4 +1353,3 @@ early_param("amd_pstate", amd_pstate_param); 


MODULE_AUTHOR("Huang Rui <ray.huang@amd.com>");

MODULE_DESCRIPTION("AMD Processor P-state Frequency Driver");
 
MODULE_LICENSE("GPL");

drivers/cpufreq/apple-soc-cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -189,8 +189,8 @@ static int apple_soc_cpufreq_find_cluster(struct cpufreq_policy *policy, 
	*info = match->data;



	*reg_base = of_iomap(args.np, 0);

	if (IS_ERR(*reg_base))

		return PTR_ERR(*reg_base);

	if (!*reg_base)

		return -ENOMEM;



	return 0;

}

drivers/cpufreq/intel_pstate.c

+1 −1
Original line number Diff line number Diff line
@@ -3358,6 +3358,7 @@ static const struct x86_cpu_id intel_epp_balance_perf[] = { 
	 * AlderLake Mobile CPUs.

	 */

	X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, 102),

	X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, 32),

	{}

};
@@ -3516,4 +3517,3 @@ early_param("intel_pstate", intel_pstate_setup); 


MODULE_AUTHOR("Dirk Brandewie <dirk.j.brandewie@intel.com>");

MODULE_DESCRIPTION("'intel_pstate' - P state driver Intel Core processors");
 
MODULE_LICENSE("GPL");

drivers/powercap/intel_rapl_msr.c

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ static const struct x86_cpu_id pl4_support_ids[] = { 
	{ X86_VENDOR_INTEL, 6, INTEL_FAM6_ALDERLAKE_N, X86_FEATURE_ANY },

	{ X86_VENDOR_INTEL, 6, INTEL_FAM6_RAPTORLAKE, X86_FEATURE_ANY },

	{ X86_VENDOR_INTEL, 6, INTEL_FAM6_RAPTORLAKE_P, X86_FEATURE_ANY },

	{ X86_VENDOR_INTEL, 6, INTEL_FAM6_METEORLAKE, X86_FEATURE_ANY },

	{ X86_VENDOR_INTEL, 6, INTEL_FAM6_METEORLAKE_L, X86_FEATURE_ANY },

	{}

};

drivers/powercap/powercap_sys.c

+0 −1
Original line number Diff line number Diff line
@@ -679,4 +679,3 @@ fs_initcall(powercap_init); 


MODULE_DESCRIPTION("PowerCap sysfs Driver");

MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>");
 
MODULE_LICENSE("GPL v2");