github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 10:04:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Power management fix for 6.11-rc7

Browse Source 
Fix an incorrect warning emitted by the amd-pstate driver on
 processors that don't support X86_FEATURE_CPPC (Gautham Shenoy).
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAmbbUn0SHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRxg+sP/AvUoOLO1yJOpg6Pt7B3dehsYqoHH1lx
 j88wGCgyjlq8faQ87Gqxm3gNoswQRQ4Ez2z9yeL7dkZOWz/fVBVD+kduCmehacIH
 l47CEIMmbMi1k5C4ObdBXu/qSP1xnI5IwRpubOAS4olK8sv8ot+aaLRVuUSsGQuC
 TLsQ7ul94oiSCStcA8ZRPHaaRsD7UT1QZiyDXA+jtfiSBJG1o/IH6QyOMX8HBWHp
 fnLoU+GYxsVPN6qNwJFznn2znSbXynkdpYGFQbcj9TEt58PI48Bu+mMorC4NoFqD
 bfHH2KuNHq9/EXeGo2qVj8M1+DUOYrAD3f2w+w9Gnc/2wqXixGhPzH4ETtDHyGg6
 NJKzD8Ec7xIoTu7/hGH9ukgowzv9xJByy7jtdBqN7FECuKqKiC/jc4ENdq2W+aFM
 f6tAFCyRVtIe2rMewXZAWrFLrkqfx7NXGdfcUQW/vcFs+N6u+YgyGdZkVQkaPXOM
 qfj0xCpkuvM2ywftVJJFvzMYXB7Q4kKWHgmYx0bkbAkBLMLfNuvG/VSNZgaWhsFV
 ja8MvCD3p9qQyRseotIox8KEreFO897/5LmwKJ7KuVIU1IXjOZ8Q13kzA6/yEdlq
 QUgjkXyD9g2EAlimuwAYYdbrFtWJO9CtsZjx3pMdeUKptMa5I87K4NGFXPZ45RpX
 +s57P+yyckhZ
 =gTPT
 -----END PGP SIGNATURE-----

Merge tag 'pm-6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fix from Rafael Wysocki:
 "Fix an incorrect warning emitted by the amd-pstate driver on
  processors that don't support X86_FEATURE_CPPC (Gautham Shenoy)"

* tag 'pm-6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq/amd-pstate: Remove warning for X86_FEATURE_CPPC on certain Zen models
This commit is contained in:
Linus Torvalds 2024-09-06 12:17:44 -07:00
commit 788220eee3
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;
}