[PATCH v3 3/6] cpufreq: amd-pstate: Move cpufreq driver check later
From: Mario Limonciello
Date: Thu Apr 14 2022 - 13:04:06 EST
The cpufreq driver check occurs before we verify if the CPU is supported.
Depending upon module load order, this may mean that users are never
notified they can enable the shared memory solution.
Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>
---
v2->v3:
* New patch
drivers/cpufreq/amd-pstate.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
index ecd1fd5e5b5a..d323f3e3888c 100644
--- a/drivers/cpufreq/amd-pstate.c
+++ b/drivers/cpufreq/amd-pstate.c
@@ -653,10 +653,6 @@ static int __init amd_pstate_init(void)
return -ENODEV;
}
- /* don't keep reloading if cpufreq_driver exists */
- if (cpufreq_get_current_driver())
- return -EEXIST;
-
/* capability check */
if (boot_cpu_has(X86_FEATURE_CPPC)) {
pr_debug("AMD CPPC MSR based functionality is supported\n");
@@ -670,6 +666,10 @@ static int __init amd_pstate_init(void)
return -ENODEV;
}
+ /* don't keep reloading if cpufreq_driver exists */
+ if (cpufreq_get_current_driver())
+ return -EEXIST;
+
/* enable amd pstate feature */
ret = amd_pstate_enable(true);
if (ret) {
--
2.34.1