86 lines
3.4 KiB
Diff
86 lines
3.4 KiB
Diff
From 8399d57cda79a662800a4cd01bd7db951355f451 Mon Sep 17 00:00:00 2001
|
|
From: Mario Limonciello <mario.limonciello@amd.com>
|
|
Date: Thu, 5 Dec 2024 16:28:42 -0600
|
|
Subject: cpufreq/amd-pstate: Move limit updating code
|
|
|
|
The limit updating code in amd_pstate_epp_update_limit() should not
|
|
only apply to EPP updates. Move it to amd_pstate_update_min_max_limit()
|
|
so other callers can benefit as well.
|
|
|
|
With this move it's not necessary to have clamp_t calls anymore because
|
|
the verify callback is called when setting limits.
|
|
|
|
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
|
|
---
|
|
drivers/cpufreq/amd-pstate.c | 28 +++++-----------------------
|
|
1 file changed, 5 insertions(+), 23 deletions(-)
|
|
|
|
--- a/drivers/cpufreq/amd-pstate.c
|
|
+++ b/drivers/cpufreq/amd-pstate.c
|
|
@@ -567,10 +567,6 @@ static void amd_pstate_update(struct amd
|
|
u32 nominal_perf = READ_ONCE(cpudata->nominal_perf);
|
|
u64 value = prev;
|
|
|
|
- min_perf = clamp_t(unsigned long, min_perf, cpudata->min_limit_perf,
|
|
- cpudata->max_limit_perf);
|
|
- max_perf = clamp_t(unsigned long, max_perf, cpudata->min_limit_perf,
|
|
- cpudata->max_limit_perf);
|
|
des_perf = clamp_t(unsigned long, des_perf, min_perf, max_perf);
|
|
|
|
max_freq = READ_ONCE(cpudata->max_limit_freq);
|
|
@@ -637,7 +633,7 @@ 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, max_freq;
|
|
+ u32 max_limit_perf, min_limit_perf, max_perf, max_freq;
|
|
struct amd_cpudata *cpudata = policy->driver_data;
|
|
|
|
max_perf = READ_ONCE(cpudata->highest_perf);
|
|
@@ -645,12 +641,8 @@ static int amd_pstate_update_min_max_lim
|
|
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)
|
|
- min_limit_perf = lowest_perf;
|
|
-
|
|
- if (max_limit_perf < min_limit_perf)
|
|
- max_limit_perf = min_limit_perf;
|
|
+ if (cpudata->policy == CPUFREQ_POLICY_PERFORMANCE)
|
|
+ min_limit_perf = min(cpudata->nominal_perf, max_limit_perf);
|
|
|
|
WRITE_ONCE(cpudata->max_limit_perf, max_limit_perf);
|
|
WRITE_ONCE(cpudata->min_limit_perf, min_limit_perf);
|
|
@@ -1592,28 +1584,18 @@ static void amd_pstate_epp_cpu_exit(stru
|
|
static int amd_pstate_epp_update_limit(struct cpufreq_policy *policy)
|
|
{
|
|
struct amd_cpudata *cpudata = policy->driver_data;
|
|
- u32 max_perf, min_perf;
|
|
u64 value;
|
|
s16 epp;
|
|
|
|
- max_perf = READ_ONCE(cpudata->highest_perf);
|
|
- min_perf = READ_ONCE(cpudata->lowest_perf);
|
|
amd_pstate_update_min_max_limit(policy);
|
|
|
|
- max_perf = clamp_t(unsigned long, max_perf, cpudata->min_limit_perf,
|
|
- cpudata->max_limit_perf);
|
|
- min_perf = clamp_t(unsigned long, min_perf, cpudata->min_limit_perf,
|
|
- cpudata->max_limit_perf);
|
|
value = READ_ONCE(cpudata->cppc_req_cached);
|
|
|
|
- if (cpudata->policy == CPUFREQ_POLICY_PERFORMANCE)
|
|
- min_perf = min(cpudata->nominal_perf, max_perf);
|
|
-
|
|
value &= ~(AMD_PSTATE_MAX_PERF_MASK | AMD_PSTATE_MIN_PERF_MASK |
|
|
AMD_PSTATE_DES_PERF_MASK);
|
|
- value |= FIELD_PREP(AMD_PSTATE_MAX_PERF_MASK, max_perf);
|
|
+ value |= FIELD_PREP(AMD_PSTATE_MAX_PERF_MASK, cpudata->max_limit_perf);
|
|
value |= FIELD_PREP(AMD_PSTATE_DES_PERF_MASK, 0);
|
|
- value |= FIELD_PREP(AMD_PSTATE_MIN_PERF_MASK, min_perf);
|
|
+ value |= FIELD_PREP(AMD_PSTATE_MIN_PERF_MASK, cpudata->min_limit_perf);
|
|
|
|
/* Get BIOS pre-defined epp value */
|
|
epp = amd_pstate_get_epp(cpudata, value);
|