Skip to content

Commit 673e75e

Browse files
committed
Merge tag 'amd-pstate-v6.18-2025-10-15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux
Pull amd-pstate 6.18 content (10/15/25) from Mario Limonciello: "Fix for EPP value in wrong state after S4" * tag 'amd-pstate-v6.18-2025-10-15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux: cpufreq/amd-pstate: Fix a regression leading to EPP 0 after hibernate
2 parents 3a86608 + 85d7dda commit 673e75e

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

drivers/cpufreq/amd-pstate.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1614,7 +1614,11 @@ static int amd_pstate_cpu_offline(struct cpufreq_policy *policy)
16141614
* min_perf value across kexec reboots. If this CPU is just onlined normally after this, the
16151615
* limits, epp and desired perf will get reset to the cached values in cpudata struct
16161616
*/
1617-
return amd_pstate_update_perf(policy, perf.bios_min_perf, 0U, 0U, 0U, false);
1617+
return amd_pstate_update_perf(policy, perf.bios_min_perf,
1618+
FIELD_GET(AMD_CPPC_DES_PERF_MASK, cpudata->cppc_req_cached),
1619+
FIELD_GET(AMD_CPPC_MAX_PERF_MASK, cpudata->cppc_req_cached),
1620+
FIELD_GET(AMD_CPPC_EPP_PERF_MASK, cpudata->cppc_req_cached),
1621+
false);
16181622
}
16191623

16201624
static int amd_pstate_suspend(struct cpufreq_policy *policy)

0 commit comments

Comments
 (0)