cpufreq/amd-pstate: Drop min and max cached frequencies

Use the perf_to_freq helpers to calculate this on the fly.
As the members are no longer cached add an extra check into
amd_pstate_epp_update_limit() to avoid unnecessary calls in
amd_pstate_update_min_max_limit().

Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
Reviewed-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>

diff --git a/drivers/cpufreq/amd-pstate-ut.c b/drivers/cpufreq/amd-pstate-ut.c
index 3a0a380c3590c7fd15c81c8910417fde00c36290..445278cf40b619811bd16bd431e149eb971f3918 100644 (file)
--- a/drivers/cpufreq/amd-pstate-ut.c
+++ b/drivers/cpufreq/amd-pstate-ut.c
@@ -214,14 +214,14 @@ static void amd_pstate_ut_check_freq(u32 index)
                        break;
                cpudata = policy->driver_data;
 
-               if (!((cpudata->max_freq >= cpudata->nominal_freq) &&
+               if (!((policy->cpuinfo.max_freq >= cpudata->nominal_freq) &&
                        (cpudata->nominal_freq > cpudata->lowest_nonlinear_freq) &&
-                       (cpudata->lowest_nonlinear_freq > cpudata->min_freq) &&
-                       (cpudata->min_freq > 0))) {
+                       (cpudata->lowest_nonlinear_freq > policy->cpuinfo.min_freq) &&
+                       (policy->cpuinfo.min_freq > 0))) {
                        amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
                        pr_err("%s cpu%d max=%d >= nominal=%d > lowest_nonlinear=%d > min=%d > 0, the formula is incorrect!\n",
-                               __func__, cpu, cpudata->max_freq, cpudata->nominal_freq,
-                               cpudata->lowest_nonlinear_freq, cpudata->min_freq);
+                               __func__, cpu, policy->cpuinfo.max_freq, cpudata->nominal_freq,
+                               cpudata->lowest_nonlinear_freq, policy->cpuinfo.min_freq);
                        goto skip_test;
                }
 
@@ -233,13 +233,13 @@ static void amd_pstate_ut_check_freq(u32 index)
                }
 
                if (cpudata->boost_supported) {
-                       if ((policy->max == cpudata->max_freq) ||
+                       if ((policy->max == policy->cpuinfo.max_freq) ||
                                        (policy->max == cpudata->nominal_freq))
                                amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_PASS;
                        else {
                                amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
                                pr_err("%s cpu%d policy_max=%d should be equal cpu_max=%d or cpu_nominal=%d !\n",
-                                       __func__, cpu, policy->max, cpudata->max_freq,
+                                       __func__, cpu, policy->max, policy->cpuinfo.max_freq,
                                        cpudata->nominal_freq);
                                goto skip_test;
                        }

diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
index 29250638a2ac016228403dad932dc4b27db9979f..ac5a6fc61db70dc0ec3e23f6eba7c02902909587 100644 (file)
--- a/drivers/cpufreq/amd-pstate.c
+++ b/drivers/cpufreq/amd-pstate.c
@@ -717,7 +717,7 @@ static int amd_pstate_cpu_boost_update(struct cpufreq_policy *policy, bool on)
        int ret = 0;
 
        nominal_freq = READ_ONCE(cpudata->nominal_freq);
-       max_freq = READ_ONCE(cpudata->max_freq);
+       max_freq = perf_to_freq(cpudata, READ_ONCE(cpudata->highest_perf));
 
        if (on)
                policy->cpuinfo.max_freq = max_freq;
@@ -917,13 +917,10 @@ static int amd_pstate_init_freq(struct amd_cpudata *cpudata)
        nominal_freq *= 1000;
 
        WRITE_ONCE(cpudata->nominal_freq, nominal_freq);
-       WRITE_ONCE(cpudata->min_freq, min_freq);
 
        max_freq = perf_to_freq(cpudata, cpudata->highest_perf);
        lowest_nonlinear_freq = perf_to_freq(cpudata, cpudata->lowest_nonlinear_perf);
-
        WRITE_ONCE(cpudata->lowest_nonlinear_freq, lowest_nonlinear_freq);
-       WRITE_ONCE(cpudata->max_freq, max_freq);
 
        /**
         * Below values need to be initialized correctly, otherwise driver will fail to load
@@ -948,9 +945,9 @@ static int amd_pstate_init_freq(struct amd_cpudata *cpudata)
 
 static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
 {
-       int min_freq, max_freq, ret;
-       struct device *dev;
        struct amd_cpudata *cpudata;
+       struct device *dev;
+       int ret;
 
        /*
         * Resetting PERF_CTL_MSR will put the CPU in P0 frequency,
@@ -981,17 +978,11 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
        if (ret)
                goto free_cpudata1;
 
-       min_freq = READ_ONCE(cpudata->min_freq);
-       max_freq = READ_ONCE(cpudata->max_freq);
-
        policy->cpuinfo.transition_latency = amd_pstate_get_transition_latency(policy->cpu);
        policy->transition_delay_us = amd_pstate_get_transition_delay_us(policy->cpu);
 
-       policy->min = min_freq;
-       policy->max = max_freq;
-
-       policy->cpuinfo.min_freq = min_freq;
-       policy->cpuinfo.max_freq = max_freq;
+       policy->cpuinfo.min_freq = policy->min = perf_to_freq(cpudata, cpudata->lowest_perf);
+       policy->cpuinfo.max_freq = policy->max = perf_to_freq(cpudata, cpudata->highest_perf);
 
        policy->boost_enabled = READ_ONCE(cpudata->boost_supported);
 
@@ -1015,9 +1006,6 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
                goto free_cpudata2;
        }
 
-       cpudata->max_limit_freq = max_freq;
-       cpudata->min_limit_freq = min_freq;
-
        policy->driver_data = cpudata;
 
        if (!current_pstate_driver->adjust_perf)
@@ -1075,14 +1063,10 @@ static int amd_pstate_cpu_suspend(struct cpufreq_policy *policy)
 static ssize_t show_amd_pstate_max_freq(struct cpufreq_policy *policy,
                                        char *buf)
 {
-       int max_freq;
        struct amd_cpudata *cpudata = policy->driver_data;
 
-       max_freq = READ_ONCE(cpudata->max_freq);
-       if (max_freq < 0)
-               return max_freq;
 
-       return sysfs_emit(buf, "%u\n", max_freq);
+       return sysfs_emit(buf, "%u\n", perf_to_freq(cpudata, READ_ONCE(cpudata->highest_perf)));
 }
 
 static ssize_t show_amd_pstate_lowest_nonlinear_freq(struct cpufreq_policy *policy,
@@ -1440,10 +1424,10 @@ static bool amd_pstate_acpi_pm_profile_undefined(void)
 
 static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)
 {
-       int min_freq, max_freq, ret;
        struct amd_cpudata *cpudata;
        struct device *dev;
        u64 value;
+       int ret;
 
        /*
         * Resetting PERF_CTL_MSR will put the CPU in P0 frequency,
@@ -1474,19 +1458,13 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)
        if (ret)
                goto free_cpudata1;
 
-       min_freq = READ_ONCE(cpudata->min_freq);
-       max_freq = READ_ONCE(cpudata->max_freq);
-
-       policy->cpuinfo.min_freq = min_freq;
-       policy->cpuinfo.max_freq = max_freq;
+       policy->cpuinfo.min_freq = policy->min = perf_to_freq(cpudata, cpudata->lowest_perf);
+       policy->cpuinfo.max_freq = policy->max = perf_to_freq(cpudata, cpudata->highest_perf);
        /* It will be updated by governor */
        policy->cur = policy->cpuinfo.min_freq;
 
        policy->driver_data = cpudata;
 
-       policy->min = policy->cpuinfo.min_freq;
-       policy->max = policy->cpuinfo.max_freq;
-
        policy->boost_enabled = READ_ONCE(cpudata->boost_supported);
 
        /*
@@ -1544,7 +1522,8 @@ static int amd_pstate_epp_update_limit(struct cpufreq_policy *policy)
        struct amd_cpudata *cpudata = policy->driver_data;
        u8 epp;
 
-       amd_pstate_update_min_max_limit(policy);
+       if (policy->min != cpudata->min_limit_freq || policy->max != cpudata->max_limit_freq)
+               amd_pstate_update_min_max_limit(policy);
 
        if (cpudata->policy == CPUFREQ_POLICY_PERFORMANCE)
                epp = 0;

diff --git a/drivers/cpufreq/amd-pstate.h b/drivers/cpufreq/amd-pstate.h
index 19d405c6d805e5fb15e5b7f0cb7580c6724fed45..014993369245803a81035e3f9b5ac53376e6904a 100644 (file)
--- a/drivers/cpufreq/amd-pstate.h
+++ b/drivers/cpufreq/amd-pstate.h
@@ -46,8 +46,6 @@ struct amd_aperf_mperf {
  * @max_limit_perf: Cached value of the performance corresponding to policy->max
  * @min_limit_freq: Cached value of policy->min (in khz)
  * @max_limit_freq: Cached value of policy->max (in khz)
- * @max_freq: the frequency (in khz) that mapped to highest_perf
- * @min_freq: the frequency (in khz) that mapped to lowest_perf
  * @nominal_freq: the frequency (in khz) that mapped to nominal_perf
  * @lowest_nonlinear_freq: the frequency (in khz) that mapped to lowest_nonlinear_perf
  * @cur: Difference of Aperf/Mperf/tsc count between last and current sample
@@ -77,11 +75,8 @@ struct amd_cpudata {
        u8      prefcore_ranking;
        u8      min_limit_perf;
        u8      max_limit_perf;
-       u32     min_limit_freq;
-       u32     max_limit_freq;
-
-       u32     max_freq;
-       u32     min_freq;
+       u32     min_limit_freq;
+       u32     max_limit_freq;
        u32     nominal_freq;
        u32     lowest_nonlinear_freq;