Skip to contentSkip to conversation

cpufreq: amd-pstate: adjust min/max limit perf

PATCH Applied Meng Li 3 participants 3 messages Feb 27, 2024 – Feb 29, 2024

Subsystems (4)
lore
Share & tools
lore

Meng Li

author
#0 lore raw

PATCH 1/1 cpufreq: amd-pstate: adjust min/max limit perf

The min/max limit perf values calculated based on frequency may exceed the reasonable range of perf(highest perf, lowest perf).

---
 drivers/cpufreq/amd-pstate.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/cpufreq/amd-pstate.c +14 -1
index aa5e57e27d2b..2015c9fcc3c9 100644
@@ -484,12 +484,19 @@ 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;
+	u32 max_limit_perf, min_limit_perf, lowest_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);
 
+	lowest_perf = READ_ONCE(cpudata->lowest_perf);
+	if (min_limit_perf < lowest_perf)
+		min_limit_perf = lowest_perf;
+
+	if (max_limit_perf < min_limit_perf)
+		max_limit_perf = min_limit_perf;
+
 	WRITE_ONCE(cpudata->max_limit_perf, max_limit_perf);
 	WRITE_ONCE(cpudata->min_limit_perf, min_limit_perf);
 	WRITE_ONCE(cpudata->max_limit_freq, policy->max);
@@ -1387,6 +1394,12 @@ static void amd_pstate_epp_update_limit(struct cpufreq_policy *policy)
 	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 (min_limit_perf < min_perf)
+		min_limit_perf = min_perf;
+
+	if (max_limit_perf < min_limit_perf)
+		max_limit_perf = min_limit_perf;
+
 	WRITE_ONCE(cpudata->max_limit_perf, max_limit_perf);
 	WRITE_ONCE(cpudata->min_limit_perf, min_limit_perf);
 
Signature · 1 line
2.34.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Meng Li

The min/max limit perf values calculated based on frequency may exceed the reasonable range of perf(highest perf, lowest perf).

Quoted 42 lines
---
  drivers/cpufreq/amd-pstate.c | 15 ++++++++++++++-
  1 file changed, 14 insertions(+), 1 deletion(-)
drivers/cpufreq/amd-pstate.c +14 -1
index aa5e57e27d2b..2015c9fcc3c9 100644
@@ -484,12 +484,19 @@ 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;
+	u32 max_limit_perf, min_limit_perf, lowest_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);
 
+	lowest_perf = READ_ONCE(cpudata->lowest_perf);
+	if (min_limit_perf < lowest_perf)
+		min_limit_perf = lowest_perf;
+
+	if (max_limit_perf < min_limit_perf)
+		max_limit_perf = min_limit_perf;
+
  	WRITE_ONCE(cpudata->max_limit_perf, max_limit_perf);
  	WRITE_ONCE(cpudata->min_limit_perf, min_limit_perf);
  	WRITE_ONCE(cpudata->max_limit_freq, policy->max);
@@ -1387,6 +1394,12 @@ static void amd_pstate_epp_update_limit(struct cpufreq_policy *policy)
  	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 (min_limit_perf < min_perf)
+		min_limit_perf = min_perf;
+
+	if (max_limit_perf < min_limit_perf)
+		max_limit_perf = min_limit_perf;
+
  	WRITE_ONCE(cpudata->max_limit_perf, max_limit_perf);
  	WRITE_ONCE(cpudata->min_limit_perf, min_limit_perf);