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

Merge tag 'amd-pstate-v6.14-2025-01-07' of... 

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

Merge amd-pstate changes for 6.14 from Mario Limonciello:

"Fix a regression with preferred core rankings not being used.
 Fix a precision issue with frequency calculation."

* tag 'amd-pstate-v6.14-2025-01-07' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux:
  cpufreq/amd-pstate: Refactor max frequency calculation
  cpufreq/amd-pstate: Fix prefcore rankings
parents 851daf83 857a61c2

drivers/cpufreq/amd-pstate.c

+5 −10
Original line number Diff line number Diff line
@@ -815,7 +815,7 @@ static void amd_pstate_init_prefcore(struct amd_cpudata *cpudata) 
	 * sched_set_itmt_support(true) has been called and it is valid to

	 * update them at any time after it has been called.

	 */

	sched_set_itmt_core_prio((int)READ_ONCE(cpudata->highest_perf), cpudata->cpu);

	sched_set_itmt_core_prio((int)READ_ONCE(cpudata->prefcore_ranking), cpudata->cpu);



	schedule_work(&sched_prefcore_work);

}
@@ -908,9 +908,8 @@ static int amd_pstate_init_freq(struct amd_cpudata *cpudata) 
{

	int ret;

	u32 min_freq, max_freq;

	u32 nominal_perf, nominal_freq;

	u32 highest_perf, nominal_perf, nominal_freq;

	u32 lowest_nonlinear_perf, lowest_nonlinear_freq;

	u32 boost_ratio, lowest_nonlinear_ratio;

	struct cppc_perf_caps cppc_perf;



	ret = cppc_get_perf_caps(cpudata->cpu, &cppc_perf);
@@ -927,16 +926,12 @@ static int amd_pstate_init_freq(struct amd_cpudata *cpudata) 
	else

		nominal_freq = cppc_perf.nominal_freq;



	highest_perf = READ_ONCE(cpudata->highest_perf);

	nominal_perf = READ_ONCE(cpudata->nominal_perf);



	boost_ratio = div_u64(cpudata->highest_perf << SCHED_CAPACITY_SHIFT, nominal_perf);

	max_freq = (nominal_freq * boost_ratio >> SCHED_CAPACITY_SHIFT);

	max_freq = div_u64((u64)highest_perf * nominal_freq, nominal_perf);



	lowest_nonlinear_perf = READ_ONCE(cpudata->lowest_nonlinear_perf);

	lowest_nonlinear_ratio = div_u64(lowest_nonlinear_perf << SCHED_CAPACITY_SHIFT,

					 nominal_perf);

	lowest_nonlinear_freq = (nominal_freq * lowest_nonlinear_ratio >> SCHED_CAPACITY_SHIFT);



	lowest_nonlinear_freq = div_u64((u64)nominal_freq * lowest_nonlinear_perf, nominal_perf);

	WRITE_ONCE(cpudata->min_freq, min_freq * 1000);

	WRITE_ONCE(cpudata->lowest_nonlinear_freq, lowest_nonlinear_freq * 1000);

	WRITE_ONCE(cpudata->nominal_freq, nominal_freq * 1000);