]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
cpufreq/amd-pstate: Use amd_pstate_update_min_max_limit() for EPP limits
authorMario Limonciello <mario.limonciello@amd.com>
Sat, 12 Oct 2024 17:45:18 +0000 (12:45 -0500)
committerMario Limonciello <mario.limonciello@amd.com>
Mon, 28 Oct 2024 19:54:35 +0000 (14:54 -0500)
When the EPP updates are set the maximum capable frequency for the
CPU is used to set the upper limit instead of that of the policy.

Adjust amd_pstate_epp_update_limit() to reuse policy calculation code
from amd_pstate_update_min_max_limit().

Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
Reviewed-by: Perry Yuan <perry.yuan@amd.com>
Tested-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
Link: https://lore.kernel.org/r/20241012174519.897-3-mario.limonciello@amd.com
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
drivers/cpufreq/amd-pstate.c

index 13dec8b1e7a8070bafabf07b2d78062b8872def6..8d2541f2c74b8c63763b2ee086e9f9180e5f6f93 100644 (file)
@@ -1485,26 +1485,13 @@ static void amd_pstate_epp_cpu_exit(struct cpufreq_policy *policy)
 static int amd_pstate_epp_update_limit(struct cpufreq_policy *policy)
 {
        struct amd_cpudata *cpudata = policy->driver_data;
-       u32 max_perf, min_perf, min_limit_perf, max_limit_perf;
+       u32 max_perf, min_perf;
        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);
+       max_perf = READ_ONCE(cpudata->highest_perf);
        min_perf = READ_ONCE(cpudata->lowest_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);
-
-       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);
+       amd_pstate_update_min_max_limit(policy);
 
        max_perf = clamp_t(unsigned long, max_perf, cpudata->min_limit_perf,
                        cpudata->max_limit_perf);