Skip to content

Commit ba3319e

Browse files
committed
cpufreq/amd-pstate: Fix a regression leading to EPP 0 after resume
During the suspend sequence the cached CPPC request is destroyed with the expectation that it's restored during resume. This assumption broke when the separate cache EPP variable was removed, and then it was broken again by commit 608a76b ("cpufreq/amd-pstate: Add support for the "Requested CPU Min frequency" BIOS option") which explicitly set it to zero during suspend. Remove the invalidation and set the value during the suspend call to update limits so that the cached variable can be used to restore on resume. Fixes: 608a76b ("cpufreq/amd-pstate: Add support for the "Requested CPU Min frequency" BIOS option") Fixes: b7a4115 ("cpufreq/amd-pstate: Invalidate cppc_req_cached during suspend") Reported-by: goldens <[email protected]> Closes: https://community.frame.work/t/increased-power-usage-after-resuming-from-suspend-on-ryzen-7040-kernel-6-15-regression/ Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2391221 Tested-by: goldens <[email protected]> Tested-by: Willian Wang <[email protected]> Reported-by: Vincent Mauirn <[email protected]> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219981 Tested-by: Alex De Lorenzo <[email protected]> Reviewed-by: Gautham R. Shenoy <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mario Limonciello (AMD) <[email protected]>
1 parent 220abf7 commit ba3319e

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

drivers/cpufreq/amd-pstate.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1628,13 +1628,14 @@ static int amd_pstate_suspend(struct cpufreq_policy *policy)
16281628
* min_perf value across kexec reboots. If this CPU is just resumed back without kexec,
16291629
* the limits, epp and desired perf will get reset to the cached values in cpudata struct
16301630
*/
1631-
ret = amd_pstate_update_perf(policy, perf.bios_min_perf, 0U, 0U, 0U, false);
1631+
ret = amd_pstate_update_perf(policy, perf.bios_min_perf,
1632+
FIELD_GET(AMD_CPPC_DES_PERF_MASK, cpudata->cppc_req_cached),
1633+
FIELD_GET(AMD_CPPC_MAX_PERF_MASK, cpudata->cppc_req_cached),
1634+
FIELD_GET(AMD_CPPC_EPP_PERF_MASK, cpudata->cppc_req_cached),
1635+
false);
16321636
if (ret)
16331637
return ret;
16341638

1635-
/* invalidate to ensure it's rewritten during resume */
1636-
cpudata->cppc_req_cached = 0;
1637-
16381639
/* set this flag to avoid setting core offline*/
16391640
cpudata->suspended = true;
16401641

0 commit comments

Comments
 (0)