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).

Signed-off-by: Meng Li <li.meng@amd.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
index aa5e57e27d2b5a47bab7d393eab08d1aedba645d..2015c9fcc3c9145e997d15d834aeace8728fc346 100644 (file)
--- a/drivers/cpufreq/amd-pstate.c
+++ b/drivers/cpufreq/amd-pstate.c
@@ -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);