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

Merge tag 'amd-pstate-v6.12-2024-10-16' of... 

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

Merge an amd-pstate driver fix for 6.12-rc4 from Mario Limonciello:

"Fix a regression introduced where boost control malfunctioned in
 amd-pstate"

* tag 'amd-pstate-v6.12-2024-10-16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux:
  cpufreq/amd-pstate: Use nominal perf for limits when boost is disabled
parents 940efc9f 18d9b522

drivers/cpufreq/amd-pstate.c

+14 −6
Original line number Diff line number Diff line
@@ -536,11 +536,16 @@ static int amd_pstate_verify(struct cpufreq_policy_data *policy) 


static int amd_pstate_update_min_max_limit(struct cpufreq_policy *policy)

{

	u32 max_limit_perf, min_limit_perf, lowest_perf;

	u32 max_limit_perf, min_limit_perf, lowest_perf, max_perf;

	struct amd_cpudata *cpudata = policy->driver_data;



	max_limit_perf = div_u64(policy->max * cpudata->highest_perf, cpudata->max_freq);

	min_limit_perf = div_u64(policy->min * cpudata->highest_perf, cpudata->max_freq);

	if (cpudata->boost_supported && !policy->boost_enabled)

		max_perf = READ_ONCE(cpudata->nominal_perf);

	else

		max_perf = READ_ONCE(cpudata->highest_perf);



	max_limit_perf = div_u64(policy->max * max_perf, policy->cpuinfo.max_freq);

	min_limit_perf = div_u64(policy->min * max_perf, policy->cpuinfo.max_freq);



	lowest_perf = READ_ONCE(cpudata->lowest_perf);

	if (min_limit_perf < lowest_perf)
@@ -1506,10 +1511,13 @@ static int amd_pstate_epp_update_limit(struct cpufreq_policy *policy) 
	u64 value;

	s16 epp;



	if (cpudata->boost_supported && !policy->boost_enabled)

		max_perf = READ_ONCE(cpudata->nominal_perf);

	else

		max_perf = READ_ONCE(cpudata->highest_perf);

	min_perf = READ_ONCE(cpudata->lowest_perf);

	max_limit_perf = div_u64(policy->max * cpudata->highest_perf, cpudata->max_freq);

	min_limit_perf = div_u64(policy->min * cpudata->highest_perf, cpudata->max_freq);

	max_limit_perf = div_u64(policy->max * max_perf, policy->cpuinfo.max_freq);

	min_limit_perf = div_u64(policy->min * max_perf, policy->cpuinfo.max_freq);



	if (min_limit_perf < min_perf)

		min_limit_perf = min_perf;