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

Merge tag 'amd-pstate-v6.11-2024-07-07' of... 

Merge tag 'amd-pstate-v6.11-2024-07-07' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux

Merge more amd-pstate changes for 6.11 from Mario Liminciello:

"This adds fixes for setting scaling max frequency on systems
 without a dedicated MSR for setting CPPC requests."

* tag 'amd-pstate-v6.11-2024-07-07' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux:
  cpufreq/amd-pstate: Fix the scaling_max_freq setting on shared memory CPPC systems
  cpufreq/amd-pstate-ut: Convert nominal_freq to khz during comparisons
parents 29acea1a 738d7d03

drivers/cpufreq/amd-pstate-ut.c

+7 −5
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ static void amd_pstate_ut_check_freq(u32 index) 
	int cpu = 0;

	struct cpufreq_policy *policy = NULL;

	struct amd_cpudata *cpudata = NULL;

	u32 nominal_freq_khz;



	for_each_possible_cpu(cpu) {

		policy = cpufreq_cpu_get(cpu);
@@ -209,13 +210,14 @@ static void amd_pstate_ut_check_freq(u32 index) 
			break;

		cpudata = policy->driver_data;



		if (!((cpudata->max_freq >= cpudata->nominal_freq) &&

			(cpudata->nominal_freq > cpudata->lowest_nonlinear_freq) &&

		nominal_freq_khz = cpudata->nominal_freq*1000;

		if (!((cpudata->max_freq >= nominal_freq_khz) &&

			(nominal_freq_khz > cpudata->lowest_nonlinear_freq) &&

			(cpudata->lowest_nonlinear_freq > cpudata->min_freq) &&

			(cpudata->min_freq > 0))) {

			amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;

			pr_err("%s cpu%d max=%d >= nominal=%d > lowest_nonlinear=%d > min=%d > 0, the formula is incorrect!\n",

				__func__, cpu, cpudata->max_freq, cpudata->nominal_freq,

				__func__, cpu, cpudata->max_freq, nominal_freq_khz,

				cpudata->lowest_nonlinear_freq, cpudata->min_freq);

			goto skip_test;

		}
@@ -229,13 +231,13 @@ static void amd_pstate_ut_check_freq(u32 index) 


		if (cpudata->boost_supported) {

			if ((policy->max == cpudata->max_freq) ||

					(policy->max == cpudata->nominal_freq))

					(policy->max == nominal_freq_khz))

				amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_PASS;

			else {

				amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;

				pr_err("%s cpu%d policy_max=%d should be equal cpu_max=%d or cpu_nominal=%d !\n",

					__func__, cpu, policy->max, cpudata->max_freq,

					cpudata->nominal_freq);

					nominal_freq_khz);

				goto skip_test;

			}

		} else {

drivers/cpufreq/amd-pstate.c

+23 −20
Original line number Diff line number Diff line
@@ -239,6 +239,26 @@ static int amd_pstate_get_energy_pref_index(struct amd_cpudata *cpudata) 
	return index;

}



static void pstate_update_perf(struct amd_cpudata *cpudata, u32 min_perf,

			       u32 des_perf, u32 max_perf, bool fast_switch)

{

	if (fast_switch)

		wrmsrl(MSR_AMD_CPPC_REQ, READ_ONCE(cpudata->cppc_req_cached));

	else

		wrmsrl_on_cpu(cpudata->cpu, MSR_AMD_CPPC_REQ,

			      READ_ONCE(cpudata->cppc_req_cached));

}



DEFINE_STATIC_CALL(amd_pstate_update_perf, pstate_update_perf);



static inline void amd_pstate_update_perf(struct amd_cpudata *cpudata,

					  u32 min_perf, u32 des_perf,

					  u32 max_perf, bool fast_switch)

{

	static_call(amd_pstate_update_perf)(cpudata, min_perf, des_perf,

					    max_perf, fast_switch);

}



static int amd_pstate_set_epp(struct amd_cpudata *cpudata, u32 epp)

{

	int ret;
@@ -255,6 +275,9 @@ static int amd_pstate_set_epp(struct amd_cpudata *cpudata, u32 epp) 
		if (!ret)

			cpudata->epp_cached = epp;

	} else {

		amd_pstate_update_perf(cpudata, cpudata->min_limit_perf, 0U,

					     cpudata->max_limit_perf, false);



		perf_ctrls.energy_perf = epp;

		ret = cppc_set_epp_perf(cpudata->cpu, &perf_ctrls, 1);

		if (ret) {
@@ -442,16 +465,6 @@ static inline int amd_pstate_init_perf(struct amd_cpudata *cpudata) 
	return static_call(amd_pstate_init_perf)(cpudata);

}



static void pstate_update_perf(struct amd_cpudata *cpudata, u32 min_perf,

			       u32 des_perf, u32 max_perf, bool fast_switch)

{

	if (fast_switch)

		wrmsrl(MSR_AMD_CPPC_REQ, READ_ONCE(cpudata->cppc_req_cached));

	else

		wrmsrl_on_cpu(cpudata->cpu, MSR_AMD_CPPC_REQ,

			      READ_ONCE(cpudata->cppc_req_cached));

}



static void cppc_update_perf(struct amd_cpudata *cpudata,

			     u32 min_perf, u32 des_perf,

			     u32 max_perf, bool fast_switch)
@@ -465,16 +478,6 @@ static void cppc_update_perf(struct amd_cpudata *cpudata, 
	cppc_set_perf(cpudata->cpu, &perf_ctrls);

}



DEFINE_STATIC_CALL(amd_pstate_update_perf, pstate_update_perf);



static inline void amd_pstate_update_perf(struct amd_cpudata *cpudata,

					  u32 min_perf, u32 des_perf,

					  u32 max_perf, bool fast_switch)

{

	static_call(amd_pstate_update_perf)(cpudata, min_perf, des_perf,

					    max_perf, fast_switch);

}



static inline bool amd_pstate_sample(struct amd_cpudata *cpudata)

{

	u64 aperf, mperf, tsc;