]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
cpufreq/amd-pstate: Remove the cppc_state check in offline/online functions
authorDhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
Wed, 4 Dec 2024 14:48:41 +0000 (14:48 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Feb 2025 13:01:40 +0000 (14:01 +0100)
[ Upstream commit b78f8c87ec3e7499bb049986838636d3afbc7ece ]

Only amd_pstate_epp driver (i.e. cppc_state = ACTIVE) enters the
amd_pstate_epp_offline() and amd_pstate_epp_cpu_online() functions,
so remove the unnecessary if condition checking if cppc_state is
equal to AMD_PSTATE_ACTIVE.

Signed-off-by: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
Link: https://lore.kernel.org/r/20241204144842.164178-5-Dhananjay.Ugwekar@amd.com
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Stable-dep-of: 3ace20038e19 ("cpufreq/amd-pstate: Fix cpufreq_policy ref counting")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/cpufreq/amd-pstate.c

index 19906141ef7fe99f5fea9bc2c0ed06ca5a08b4bb..4dfe5bdcb29322d79a258dd25967479ae9b8404f 100644 (file)
@@ -1598,10 +1598,8 @@ static int amd_pstate_epp_cpu_online(struct cpufreq_policy *policy)
 
        pr_debug("AMD CPU Core %d going online\n", cpudata->cpu);
 
-       if (cppc_state == AMD_PSTATE_ACTIVE) {
-               amd_pstate_epp_reenable(cpudata);
-               cpudata->suspended = false;
-       }
+       amd_pstate_epp_reenable(cpudata);
+       cpudata->suspended = false;
 
        return 0;
 }
@@ -1630,8 +1628,7 @@ static int amd_pstate_epp_cpu_offline(struct cpufreq_policy *policy)
        if (cpudata->suspended)
                return 0;
 
-       if (cppc_state == AMD_PSTATE_ACTIVE)
-               amd_pstate_epp_offline(policy);
+       amd_pstate_epp_offline(policy);
 
        return 0;
 }