57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
|
From 5aea3e8c4255cb04876e3af714d58ed329376b7f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
|
||
|
|
Date: Wed, 4 Dec 2024 14:48:42 +0000
|
||
|
|
Subject: cpufreq/amd-pstate: Merge amd_pstate_epp_cpu_offline() and
|
||
|
|
amd_pstate_epp_offline()
|
||
|
|
|
||
|
|
amd_pstate_epp_offline() is only called from within
|
||
|
|
amd_pstate_epp_cpu_offline() and doesn't make much sense to have it at all.
|
||
|
|
Hence, remove it.
|
||
|
|
|
||
|
|
Also remove the unncessary debug print in the offline path while at it.
|
||
|
|
|
||
|
|
Signed-off-by: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
|
||
|
|
Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
|
||
|
|
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
|
||
|
|
---
|
||
|
|
drivers/cpufreq/amd-pstate.c | 17 ++++-------------
|
||
|
|
1 file changed, 4 insertions(+), 13 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/cpufreq/amd-pstate.c
|
||
|
|
+++ b/drivers/cpufreq/amd-pstate.c
|
||
|
|
@@ -1685,11 +1685,14 @@ static int amd_pstate_epp_cpu_online(str
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static void amd_pstate_epp_offline(struct cpufreq_policy *policy)
|
||
|
|
+static int amd_pstate_epp_cpu_offline(struct cpufreq_policy *policy)
|
||
|
|
{
|
||
|
|
struct amd_cpudata *cpudata = policy->driver_data;
|
||
|
|
int min_perf;
|
||
|
|
|
||
|
|
+ if (cpudata->suspended)
|
||
|
|
+ return 0;
|
||
|
|
+
|
||
|
|
min_perf = READ_ONCE(cpudata->lowest_perf);
|
||
|
|
|
||
|
|
mutex_lock(&amd_pstate_limits_lock);
|
||
|
|
@@ -1698,18 +1701,6 @@ static void amd_pstate_epp_offline(struc
|
||
|
|
amd_pstate_set_epp(cpudata, AMD_CPPC_EPP_BALANCE_POWERSAVE);
|
||
|
|
|
||
|
|
mutex_unlock(&amd_pstate_limits_lock);
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
-static int amd_pstate_epp_cpu_offline(struct cpufreq_policy *policy)
|
||
|
|
-{
|
||
|
|
- struct amd_cpudata *cpudata = policy->driver_data;
|
||
|
|
-
|
||
|
|
- pr_debug("AMD CPU Core %d going offline\n", cpudata->cpu);
|
||
|
|
-
|
||
|
|
- if (cpudata->suspended)
|
||
|
|
- return 0;
|
||
|
|
-
|
||
|
|
- amd_pstate_epp_offline(policy);
|
||
|
|
|
||
|
|
return 0;
|
||
|
|
}
|