cpufreq/amd-pstate: Call cppc_set_epp_perf in the reenable function

[ Upstream commit 796ff50e127af8362035f87ba29b6b84e2dd9742 ]

The EPP value being set in perf_ctrls.energy_perf is not being propagated
to the shared memory, fix that.

Signed-off-by: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Reviewed-by: Perry Yuan <perry.yuan@amd.com>
Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
Link: https://lore.kernel.org/r/20241023102108.5980-4-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>

diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
index 91d3c3b1c2d3bf4c1f05c52ef0ee7ed9abc5befa..161334937090c627ffa25ab6f8473d852195b213 100644 (file)
--- a/drivers/cpufreq/amd-pstate.c
+++ b/drivers/cpufreq/amd-pstate.c
@@ -1594,8 +1594,9 @@ static void amd_pstate_epp_reenable(struct amd_cpudata *cpudata)
                wrmsrl_on_cpu(cpudata->cpu, MSR_AMD_CPPC_REQ, value);
        } else {
                perf_ctrls.max_perf = max_perf;
-               perf_ctrls.energy_perf = AMD_CPPC_ENERGY_PERF_PREF(cpudata->epp_cached);
                cppc_set_perf(cpudata->cpu, &perf_ctrls);
+               perf_ctrls.energy_perf = AMD_CPPC_ENERGY_PERF_PREF(cpudata->epp_cached);
+               cppc_set_epp_perf(cpudata->cpu, &perf_ctrls, 1);
        }
 }
 
@@ -1636,8 +1637,9 @@ static void amd_pstate_epp_offline(struct cpufreq_policy *policy)
        } else {
                perf_ctrls.desired_perf = 0;
                perf_ctrls.max_perf = min_perf;
-               perf_ctrls.energy_perf = AMD_CPPC_ENERGY_PERF_PREF(HWP_EPP_BALANCE_POWERSAVE);
                cppc_set_perf(cpudata->cpu, &perf_ctrls);
+               perf_ctrls.energy_perf = AMD_CPPC_ENERGY_PERF_PREF(HWP_EPP_BALANCE_POWERSAVE);
+               cppc_set_epp_perf(cpudata->cpu, &perf_ctrls, 1);
        }
        mutex_unlock(&amd_pstate_limits_lock);
 }