kevin/linux
1
Fork 0
Code

second round of amd-pstate fixes for 6.11:

Browse Source 
* Fix an incorrect warning emitted on processors that don't
   support X86_FEATURE_CPPC.
 -----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCgA4FiEECwtuSU6dXvs5GA2aLRkspiR3AnYFAmbYvK8aHG1hcmlvLmxp
 bW9uY2llbGxvQGFtZC5jb20ACgkQLRkspiR3AnbEcw//f45iimYUHFB8Y7dOicmz
 WRq2GuB/MeBwYum3h7VAsErq51e8Woh/C+YqvKbf6PelrJpsVvvYvGV1RDrqZNjL
 gtD3YISccm6Fy+43U6p92jqflnjlOphaAt+GJkL55RUhtU5/X66Eja7Q0Nmi3jfp
 sJu+ozDcPOgaqyWwFdCl0i7vhwwiGsgqPAbsn+1Eu1UOM7++sSY4wfflo0IJnVJo
 xnLGgx25u/JEBRB+C1cX9gad2KfAMymyslQdoLQDD892njC+HqMhlXj/TX4R16c6
 0EvejOQf9wH1gb/l4syw9la+VmqOsloKAtLEQ32P1Rcz83ftRZ0SBDlYfiTqgVGq
 Yc/oaW4cAoJcj8XW8eDNaYe5HNJozqAYpyFT9u0tkD8pHsfhorE/B4HWjPIWR2bS
 ZlPAuS4/mnthfiup2Q/9LRPFniz4ex0qzlJTX1AVo0KUIhel+6iXsiiYKqrhDyfo
 hkbqnneFQJqZNhjogGVWlZS7jlikBpvVhwPDB2j/yGBNZtGukvjwCPt8L+AcjL7S
 mwa/dXXGs2hFFyeCApZ0oYPgcvxaZLs6jGLZzz+uuOFT8xrWzEhprPRcQIfbtM1r
 26xAiy5zY3XqUFG/4kbaXXfA2e7d929j0qX3MMVyl2mucbv78VpFp9vF3uSCnXUm
 18k5XwP8OX4P9it/XhPPyks=
 =VmBp
 -----END PGP SIGNATURE-----

Merge tag 'amd-pstate-v6.11-2024-09-04' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux

Pull an amd-pstate fix for 6.11 from Mario Limonciello:

"second round of amd-pstate fixes for 6.11:

 * Fix an incorrect warning emitted on processors that don't
   support X86_FEATURE_CPPC."

* tag 'amd-pstate-v6.11-2024-09-04' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux:
  cpufreq/amd-pstate: Remove warning for X86_FEATURE_CPPC on certain Zen models
This commit is contained in:
Rafael J. Wysocki 2024-09-05 12:41:41 +02:00
commit b02d2cf5b2
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/cpufreq/amd-pstate.c
View File

@ -1834,20 +1834,34 @@ static bool amd_cppc_supported(void)
}
/*
* If the CPPC feature is disabled in the BIOS for processors that support MSR-based CPPC,
* the AMD Pstate driver may not function correctly.
* Check the CPPC flag and display a warning message if the platform supports CPPC.
* Note: below checking code will not abort the driver registeration process because of
* the code is added for debugging purposes.
* If the CPPC feature is disabled in the BIOS for processors
* that support MSR-based CPPC, the AMD Pstate driver may not
* function correctly.
*
* For such processors, check the CPPC flag and display a
* warning message if the platform supports CPPC.
*
* Note: The code check below will not abort the driver
* registration process because of the code is added for
* debugging purposes. Besides, it may still be possible for
* the driver to work using the shared-memory mechanism.
*/
if (!cpu_feature_enabled(X86_FEATURE_CPPC)) {
if (cpu_feature_enabled(X86_FEATURE_ZEN1) || cpu_feature_enabled(X86_FEATURE_ZEN2)) {
if (c->x86_model > 0x60 && c->x86_model < 0xaf)
if (cpu_feature_enabled(X86_FEATURE_ZEN2)) {
switch (c->x86_model) {
case 0x60 ... 0x6F:
case 0x80 ... 0xAF:
warn = true;
} else if (cpu_feature_enabled(X86_FEATURE_ZEN3) || cpu_feature_enabled(X86_FEATURE_ZEN4)) {
if ((c->x86_model > 0x10 && c->x86_model < 0x1F) ||
(c->x86_model > 0x40 && c->x86_model < 0xaf))
break;
}
} else if (cpu_feature_enabled(X86_FEATURE_ZEN3) ||
cpu_feature_enabled(X86_FEATURE_ZEN4)) {
switch (c->x86_model) {
case 0x10 ... 0x1F:
case 0x40 ... 0xAF:
warn = true;
break;
}
} else if (cpu_feature_enabled(X86_FEATURE_ZEN5)) {
warn = true;
}