39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
|
From a4d255935a1ea6e4b10167df942ec641079bcdf7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mario Limonciello <mario.limonciello@amd.com>
|
||
|
|
Date: Mon, 28 Oct 2024 09:55:41 -0500
|
||
|
|
Subject: cpufreq/amd-pstate: Push adjust_perf vfunc init into cpu_init
|
||
|
|
|
||
|
|
As the driver can be changed in and out of different modes it's possible
|
||
|
|
that adjust_perf is assigned when it shouldn't be.
|
||
|
|
|
||
|
|
This could happen if an MSR design is started up in passive mode and then
|
||
|
|
switches to active mode.
|
||
|
|
|
||
|
|
To solve this explicitly clear `adjust_perf` in amd_pstate_epp_cpu_init().
|
||
|
|
|
||
|
|
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
|
||
|
|
---
|
||
|
|
drivers/cpufreq/amd-pstate.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/cpufreq/amd-pstate.c
|
||
|
|
+++ b/drivers/cpufreq/amd-pstate.c
|
||
|
|
@@ -1528,6 +1528,8 @@ static int amd_pstate_epp_cpu_init(struc
|
||
|
|
WRITE_ONCE(cpudata->cppc_cap1_cached, value);
|
||
|
|
}
|
||
|
|
|
||
|
|
+ current_pstate_driver->adjust_perf = NULL;
|
||
|
|
+
|
||
|
|
return 0;
|
||
|
|
|
||
|
|
free_cpudata1:
|
||
|
|
@@ -1887,8 +1889,6 @@ static int __init amd_pstate_init(void)
|
||
|
|
/* capability check */
|
||
|
|
if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
|
||
|
|
pr_debug("AMD CPPC MSR based functionality is supported\n");
|
||
|
|
- if (cppc_state != AMD_PSTATE_ACTIVE)
|
||
|
|
- current_pstate_driver->adjust_perf = amd_pstate_adjust_perf;
|
||
|
|
} else {
|
||
|
|
pr_debug("AMD CPPC shared memory based functionality is supported\n");
|
||
|
|
static_call_update(amd_pstate_enable, shmem_enable);
|