Commit 673e75ea authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge tag 'amd-pstate-v6.18-2025-10-15' of... 

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
parents 3a866087 85d7dda5

drivers/cpufreq/amd-pstate.c

+5 −1
Original line number Diff line number Diff line
@@ -1614,7 +1614,11 @@ static int amd_pstate_cpu_offline(struct cpufreq_policy *policy) 
	 * min_perf value across kexec reboots. If this CPU is just onlined normally after this, the

	 * limits, epp and desired perf will get reset to the cached values in cpudata struct

	 */

	return amd_pstate_update_perf(policy, perf.bios_min_perf, 0U, 0U, 0U, false);

	return amd_pstate_update_perf(policy, perf.bios_min_perf,

				     FIELD_GET(AMD_CPPC_DES_PERF_MASK, cpudata->cppc_req_cached),

				     FIELD_GET(AMD_CPPC_MAX_PERF_MASK, cpudata->cppc_req_cached),

				     FIELD_GET(AMD_CPPC_EPP_PERF_MASK, cpudata->cppc_req_cached),

				     false);

}



static int amd_pstate_suspend(struct cpufreq_policy *policy)