46 lines
1.9 KiB
Diff
46 lines
1.9 KiB
Diff
|
From fab64249be63c384484cf82f4e08724577ad3b84 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mario Limonciello <mario.limonciello@amd.com>
|
||
|
|
Date: Thu, 5 Dec 2024 16:28:38 -0600
|
||
|
|
Subject: cpufreq/amd-pstate: Use boost numerator for upper bound of
|
||
|
|
frequencies
|
||
|
|
|
||
|
|
commit 18d9b5227121 ("cpufreq/amd-pstate: Use nominal perf for limits
|
||
|
|
when boost is disabled") introduced different semantics for min/max limits
|
||
|
|
based upon whether the user turned off boost from sysfs.
|
||
|
|
|
||
|
|
This however is not necessary when the highest perf value is the boost
|
||
|
|
numerator.
|
||
|
|
|
||
|
|
Suggested-by: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
|
||
|
|
Fixes: 18d9b5227121 ("cpufreq/amd-pstate: Use nominal perf for limits when boost is disabled")
|
||
|
|
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
|
||
|
|
Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
|
||
|
|
---
|
||
|
|
drivers/cpufreq/amd-pstate.c | 13 +++++--------
|
||
|
|
1 file changed, 5 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/cpufreq/amd-pstate.c
|
||
|
|
+++ b/drivers/cpufreq/amd-pstate.c
|
||
|
|
@@ -631,16 +631,13 @@ static int amd_pstate_verify(struct cpuf
|
||
|
|
|
||
|
|
static int amd_pstate_update_min_max_limit(struct cpufreq_policy *policy)
|
||
|
|
{
|
||
|
|
- u32 max_limit_perf, min_limit_perf, lowest_perf, max_perf;
|
||
|
|
+ u32 max_limit_perf, min_limit_perf, lowest_perf, max_perf, max_freq;
|
||
|
|
struct amd_cpudata *cpudata = policy->driver_data;
|
||
|
|
|
||
|
|
- 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);
|
||
|
|
+ max_perf = READ_ONCE(cpudata->highest_perf);
|
||
|
|
+ max_freq = READ_ONCE(cpudata->max_freq);
|
||
|
|
+ max_limit_perf = div_u64(policy->max * max_perf, max_freq);
|
||
|
|
+ min_limit_perf = div_u64(policy->min * max_perf, max_freq);
|
||
|
|
|
||
|
|
lowest_perf = READ_ONCE(cpudata->lowest_perf);
|
||
|
|
if (min_limit_perf < lowest_perf)
|