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

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

Pull power management updates from Rafael Wysocki:
 "These add support for some new hardware, extend the existing hardware
  support, fix some issues and clean up code

  Specifics:

   - Add isupport for Tiger Lake in no-HWP mode to intel_pstate (Doug
     Smythies)

   - Update the AMD P-state driver (Perry Yuan):
      - Fix wrong lowest perf fetch
      - Map desired perf into pstate scope for powersave governor
      - Update pstate frequency transition delay time
      - Fix initial highest_perf value
      - Clean up

   - Move max CPU capacity to sugov_policy in the schedutil cpufreq
     governor (Lukasz Luba)

   - Add SM6115 to cpufreq-dt blocklist (Adam Skladowski)

   - Add support for Tegra239 and minor cleanups (Sumit Gupta, ye
     xingchen, and Yang Yingliang)

   - Add freq qos for qcom cpufreq driver and minor cleanups (Xuewen
     Yan, and Viresh Kumar)

   - Minor cleanups around functions called at module_init() (Xiu
     Jianfeng)

   - Use module_init and add module_exit for bmips driver (Zhang
     Jianhua)

   - Add AlderLake-N support to intel_idle (Zhang Rui)

   - Replace strlcpy() with unused retval with strscpy() in intel_idle
     (Wolfram Sang)

   - Remove redundant check from cpuidle_switch_governor() (Yu Liao)

   - Replace strlcpy() with unused retval with strscpy() in the powernv
     cpuidle driver (Wolfram Sang)

   - Drop duplicate word from a comment in the coupled cpuidle driver
     (Jason Wang)

   - Make rpm_resume() return -EINPROGRESS if RPM_NOWAIT is passed to it
     in the flags and the device is about to resume (Rafael Wysocki)

   - Add extra debugging statement for multiple active IRQs to system
     wakeup handling code (Mario Limonciello)

   - Replace strlcpy() with unused retval with strscpy() in the core
     system suspend support code (Wolfram Sang)

   - Update the intel_rapl power capping driver:
      - Use standard Energy Unit for SPR Dram RAPL domain (Zhang Rui).
      - Add support for RAPTORLAKE_S (Zhang Rui).
      - Fix UBSAN shift-out-of-bounds issue (Chao Qin)

   - Handle -EPROBE_DEFER when regulator is not probed on
     mtk-ci-devfreq.c (AngeloGioacchino Del Regno)

   - Fix message typo and use dev_err_probe() in rockchip-dfi.c
     (Christophe JAILLET)"

* tag 'pm-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (29 commits)
  cpufreq: qcom-cpufreq-hw: Add cpufreq qos for LMh
  cpufreq: Add __init annotation to module init funcs
  cpufreq: tegra194: change tegra239_cpufreq_soc to static
  PM / devfreq: rockchip-dfi: Fix an error message
  PM / devfreq: mtk-cci: Handle sram regulator probe deferral
  powercap: intel_rapl: Use standard Energy Unit for SPR Dram RAPL domain
  PM: runtime: Return -EINPROGRESS from rpm_resume() in the RPM_NOWAIT case
  intel_idle: Add AlderLake-N support
  powercap: intel_rapl: fix UBSAN shift-out-of-bounds issue
  cpufreq: tegra194: Add support for Tegra239
  cpufreq: qcom-cpufreq-hw: Fix uninitialized throttled_freq warning
  cpufreq: intel_pstate: Add Tigerlake support in no-HWP mode
  powercap: intel_rapl: Add support for RAPTORLAKE_S
  cpufreq: amd-pstate: Fix initial highest_perf value
  cpuidle: Remove redundant check in cpuidle_switch_governor()
  PM: wakeup: Add extra debugging statement for multiple active IRQs
  cpufreq: tegra194: Remove the unneeded result variable
  PM: suspend: move from strlcpy() with unused retval to strscpy()
  intel_idle: move from strlcpy() with unused retval to strscpy()
  cpuidle: powernv: move from strlcpy() with unused retval to strscpy()
  ...
parents 9388076b ac73ce39

drivers/base/power/runtime.c

+5 −2
Original line number Diff line number Diff line
@@ -792,10 +792,13 @@ static int rpm_resume(struct device *dev, int rpmflags) 
		DEFINE_WAIT(wait);



		if (rpmflags & (RPM_ASYNC | RPM_NOWAIT)) {

			if (dev->power.runtime_status == RPM_SUSPENDING)

			if (dev->power.runtime_status == RPM_SUSPENDING) {

				dev->power.deferred_resume = true;

			else

				if (rpmflags & RPM_NOWAIT)

					retval = -EINPROGRESS;

			} else {

				retval = -EINPROGRESS;

			}

			goto out;

		}

drivers/base/power/wakeup.c

+2 −0
Original line number Diff line number Diff line
@@ -944,6 +944,8 @@ void pm_system_irq_wakeup(unsigned int irq_number) 
	else

		irq_number = 0;



	pm_pr_dbg("Triggering wakeup from IRQ %d\n", irq_number);



	raw_spin_unlock_irqrestore(&wakeup_irq_lock, flags);



	if (irq_number)

drivers/cpufreq/amd-pstate.c

+21 −18
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ 
#include <asm/cpu_device_id.h>

#include "amd-pstate-trace.h"



#define AMD_PSTATE_TRANSITION_LATENCY	0x20000

#define AMD_PSTATE_TRANSITION_DELAY	500

#define AMD_PSTATE_TRANSITION_LATENCY	20000

#define AMD_PSTATE_TRANSITION_DELAY	1000



/*

 * TODO: We need more time to fine tune processors with shared memory solution
@@ -152,6 +152,7 @@ static inline int amd_pstate_enable(bool enable) 
static int pstate_init_perf(struct amd_cpudata *cpudata)

{

	u64 cap1;

	u32 highest_perf;



	int ret = rdmsrl_safe_on_cpu(cpudata->cpu, MSR_AMD_CPPC_CAP1,

				     &cap1);
@@ -163,7 +164,11 @@ static int pstate_init_perf(struct amd_cpudata *cpudata) 
	 *

	 * CPPC entry doesn't indicate the highest performance in some ASICs.

	 */

	WRITE_ONCE(cpudata->highest_perf, amd_get_highest_perf());

	highest_perf = amd_get_highest_perf();

	if (highest_perf > AMD_CPPC_HIGHEST_PERF(cap1))

		highest_perf = AMD_CPPC_HIGHEST_PERF(cap1);



	WRITE_ONCE(cpudata->highest_perf, highest_perf);



	WRITE_ONCE(cpudata->nominal_perf, AMD_CPPC_NOMINAL_PERF(cap1));

	WRITE_ONCE(cpudata->lowest_nonlinear_perf, AMD_CPPC_LOWNONLIN_PERF(cap1));
@@ -175,12 +180,17 @@ static int pstate_init_perf(struct amd_cpudata *cpudata) 
static int cppc_init_perf(struct amd_cpudata *cpudata)

{

	struct cppc_perf_caps cppc_perf;

	u32 highest_perf;



	int ret = cppc_get_perf_caps(cpudata->cpu, &cppc_perf);

	if (ret)

		return ret;



	WRITE_ONCE(cpudata->highest_perf, amd_get_highest_perf());

	highest_perf = amd_get_highest_perf();

	if (highest_perf > cppc_perf.highest_perf)

		highest_perf = cppc_perf.highest_perf;



	WRITE_ONCE(cpudata->highest_perf, highest_perf);



	WRITE_ONCE(cpudata->nominal_perf, cppc_perf.nominal_perf);

	WRITE_ONCE(cpudata->lowest_nonlinear_perf,
@@ -269,6 +279,7 @@ static void amd_pstate_update(struct amd_cpudata *cpudata, u32 min_perf, 
	u64 prev = READ_ONCE(cpudata->cppc_req_cached);

	u64 value = prev;



	des_perf = clamp_t(unsigned long, des_perf, min_perf, max_perf);

	value &= ~AMD_CPPC_MIN_PERF(~0L);

	value |= AMD_CPPC_MIN_PERF(min_perf);
@@ -312,7 +323,7 @@ static int amd_pstate_target(struct cpufreq_policy *policy, 
		return -ENODEV;



	cap_perf = READ_ONCE(cpudata->highest_perf);

	min_perf = READ_ONCE(cpudata->lowest_nonlinear_perf);

	min_perf = READ_ONCE(cpudata->lowest_perf);

	max_perf = cap_perf;



	freqs.old = policy->cur;
@@ -357,8 +368,6 @@ static void amd_pstate_adjust_perf(unsigned int cpu, 
	if (max_perf < min_perf)

		max_perf = min_perf;



	des_perf = clamp_t(unsigned long, des_perf, min_perf, max_perf);



	amd_pstate_update(cpudata, min_perf, des_perf, max_perf, true);

}
@@ -555,9 +564,7 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy) 


static int amd_pstate_cpu_exit(struct cpufreq_policy *policy)

{

	struct amd_cpudata *cpudata;



	cpudata = policy->driver_data;

	struct amd_cpudata *cpudata = policy->driver_data;



	freq_qos_remove_request(&cpudata->req[1]);

	freq_qos_remove_request(&cpudata->req[0]);
@@ -599,9 +606,7 @@ static ssize_t show_amd_pstate_max_freq(struct cpufreq_policy *policy, 
					char *buf)

{

	int max_freq;

	struct amd_cpudata *cpudata;



	cpudata = policy->driver_data;

	struct amd_cpudata *cpudata = policy->driver_data;



	max_freq = amd_get_max_freq(cpudata);

	if (max_freq < 0)
@@ -614,9 +619,7 @@ static ssize_t show_amd_pstate_lowest_nonlinear_freq(struct cpufreq_policy *poli 
						     char *buf)

{

	int freq;

	struct amd_cpudata *cpudata;



	cpudata = policy->driver_data;

	struct amd_cpudata *cpudata = policy->driver_data;



	freq = amd_get_lowest_nonlinear_freq(cpudata);

	if (freq < 0)

drivers/cpufreq/bmips-cpufreq.c

+8 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static struct cpufreq_driver bmips_cpufreq_driver = { 
	.name		= BMIPS_CPUFREQ_PREFIX,

};



static int __init bmips_cpufreq_probe(void)

static int __init bmips_cpufreq_driver_init(void)

{

	struct cpufreq_compat *cc;

	struct device_node *np;
@@ -176,7 +176,13 @@ static int __init bmips_cpufreq_probe(void) 


	return cpufreq_register_driver(&bmips_cpufreq_driver);

}

device_initcall(bmips_cpufreq_probe);

module_init(bmips_cpufreq_driver_init);



static void __exit bmips_cpufreq_driver_exit(void)

{

	cpufreq_unregister_driver(&bmips_cpufreq_driver);

}

module_exit(bmips_cpufreq_driver_exit);



MODULE_AUTHOR("Markus Mayer <mmayer@broadcom.com>");

MODULE_DESCRIPTION("CPUfreq driver for Broadcom BMIPS SoCs");

drivers/cpufreq/cpufreq-dt-platdev.c

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ static const struct of_device_id blocklist[] __initconst = { 
	{ .compatible = "qcom,sc8180x", },

	{ .compatible = "qcom,sc8280xp", },

	{ .compatible = "qcom,sdm845", },

	{ .compatible = "qcom,sm6115", },

	{ .compatible = "qcom,sm6350", },

	{ .compatible = "qcom,sm8150", },

	{ .compatible = "qcom,sm8250", },