Skip to content

Commit 940efc9

Browse files
committed
Merge tag 'amd-pstate-v6.12-2024-10-10' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux
Merge an amd-pstate fix for 6.12 from Mario Limonciello: "Fix an issue with changing amd-pstate modes at runtime on shared memory systems." * tag 'amd-pstate-v6.12-2024-10-10' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux: cpufreq/amd-pstate: Fix amd_pstate mode switch on shared memory systems
2 parents 8cf0b93 + c10e50a commit 940efc9

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

drivers/cpufreq/amd-pstate.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,11 +1201,21 @@ static int amd_pstate_register_driver(int mode)
12011201
return -EINVAL;
12021202

12031203
cppc_state = mode;
1204+
1205+
ret = amd_pstate_enable(true);
1206+
if (ret) {
1207+
pr_err("failed to enable cppc during amd-pstate driver registration, return %d\n",
1208+
ret);
1209+
amd_pstate_driver_cleanup();
1210+
return ret;
1211+
}
1212+
12041213
ret = cpufreq_register_driver(current_pstate_driver);
12051214
if (ret) {
12061215
amd_pstate_driver_cleanup();
12071216
return ret;
12081217
}
1218+
12091219
return 0;
12101220
}
12111221

0 commit comments

Comments
 (0)