Fix an issue with changing amd-pstate modes at runtime on shared memory systems

-----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCgA4FiEECwtuSU6dXvs5GA2aLRkspiR3AnYFAmcIgHYaHG1hcmlvLmxp
 bW9uY2llbGxvQGFtZC5jb20ACgkQLRkspiR3AnYIrQ/9EexnafqdSdyPk6l3l4VH
 PK9CFGuUOHaOwYJwWpYbmYBeYowPjNFOtUuqDY7vyb7o1T4NL0VuN3XP2gZf5R/T
 0dPFJ5Bq0/iXXKY87cDNZa9+CAeBcsqz1DWB82J0iMypdfkWP8yTdIZ0LHa1H2Dl
 nC9+BJyTdXPA4i1a3ylg2ElILWNhK/jOSF0E+xAG5Uw/kexa/4ID5lXfvtTWyCmN
 T9B4wEl30hzd6fCjfwoVYRxzymZw5HZxzBvzIPEiHJ1MDofZsCZ9Ff19jz0OTvFL
 N3p94eOcYF+Wf3bOVqYae5NtomjyIyN1xFTGqHFugJSnS1naSWNikkRGZtyJOrYR
 DE/zPy2114iQb5e/rSBXd9TwiNBQ1FSPo6ilftPlrhoqQg7KoRIYcaIpRsDRMtUq
 oA7v29dPgWOhESX4fGMc9xW+r/5vb8m3L0UxASzi+nRxClCe/7KprRBiaKkmrqrL
 G9lBkiSYRx9UyV49kqphsnq5wrZJMd6cgUep3mM2XLBlYH1YIVigXIEsbX/DF6SG
 qyzli6Jw7RpBQkRpK8+wnAJQdjFtvl+riZ36WiG851yjXxADQLgRvdOqxoujrg2d
 OM81+XzG9hdKCxTlkmBvU4F801vvwDsIRFjRaN/s2p0QrwV85bSXegkGs/3Z3vlM
 NQtN2OFL5FLsjL9zlabSjt4=
 =kGXM
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Rafael J. Wysocki 2024-10-11 20:32:58 +02:00
commit 940efc9fc8

View File

@ -1201,11 +1201,21 @@ static int amd_pstate_register_driver(int mode)
return -EINVAL;
cppc_state = mode;
ret = amd_pstate_enable(true);
if (ret) {
pr_err("failed to enable cppc during amd-pstate driver registration, return %d\n",
ret);
amd_pstate_driver_cleanup();
return ret;
}
ret = cpufreq_register_driver(current_pstate_driver);
if (ret) {
amd_pstate_driver_cleanup();
return ret;
}
return 0;
}