Commit 0766fa2e authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpufreq' 

Merge cpufreq changes for 6.1-rc1:

 - 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).

* pm-cpufreq:
  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
  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
  cpufreq: amd-pstate: Fix initial highest_perf value
  cpufreq: tegra194: Remove the unneeded result variable
  cpufreq: amd-pstate: update pstate frequency transition delay time
  cpufreq: amd_pstate: map desired perf into pstate scope for powersave governor
  cpufreq: amd_pstate: fix wrong lowest perf fetch
  cpufreq: amd-pstate: fix white-space
  cpufreq: amd-pstate: simplify cpudata pointer assignment
  cpufreq: bmips-cpufreq: Use module_init and add module_exit
  cpufreq: schedutil: Move max CPU capacity to sugov_policy
  cpufreq: Add SM6115 to cpufreq-dt-platdev blocklist
parents 599618e5 8e3d0867

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", },

drivers/cpufreq/highbank-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static struct notifier_block hb_cpufreq_clk_nb = { 
	.notifier_call = hb_cpufreq_clk_notify,

};



static int hb_cpufreq_driver_init(void)

static int __init hb_cpufreq_driver_init(void)

{

	struct platform_device_info devinfo = { .name = "cpufreq-dt", };

	struct device *cpu_dev;

drivers/cpufreq/intel_pstate.c

+1 −0
Original line number Diff line number Diff line
@@ -2416,6 +2416,7 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = { 
	X86_MATCH(SKYLAKE_X,		core_funcs),

	X86_MATCH(COMETLAKE,		core_funcs),

	X86_MATCH(ICELAKE_X,		core_funcs),

	X86_MATCH(TIGERLAKE,		core_funcs),

	{}

};

MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids);