Skip to content

Commit 16c957f

Browse files
committed
Merge tag 'acpi-5.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki: "Fix more fallout from recent changes of the ACPI CPPC handling on AMD platforms (Mario Limonciello)" * tag 'acpi-5.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI: CPPC: Fix enabling CPPC on AMD systems with shared memory
2 parents be9b7b6 + fbd74d1 commit 16c957f

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

arch/x86/kernel/acpi/cppc.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ bool cpc_supported_by_cpu(void)
1616
switch (boot_cpu_data.x86_vendor) {
1717
case X86_VENDOR_AMD:
1818
case X86_VENDOR_HYGON:
19+
if (boot_cpu_data.x86 == 0x19 && ((boot_cpu_data.x86_model <= 0x0f) ||
20+
(boot_cpu_data.x86_model >= 0x20 && boot_cpu_data.x86_model <= 0x2f)))
21+
return true;
22+
else if (boot_cpu_data.x86 == 0x17 &&
23+
boot_cpu_data.x86_model >= 0x70 && boot_cpu_data.x86_model <= 0x7f)
24+
return true;
1925
return boot_cpu_has(X86_FEATURE_CPPC);
2026
}
2127
return false;

0 commit comments

Comments
 (0)