Commit 16c957f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents be9b7b6a fbd74d16

arch/x86/kernel/acpi/cppc.c

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ bool cpc_supported_by_cpu(void) 
	switch (boot_cpu_data.x86_vendor) {

	case X86_VENDOR_AMD:

	case X86_VENDOR_HYGON:

		if (boot_cpu_data.x86 == 0x19 && ((boot_cpu_data.x86_model <= 0x0f) ||

		    (boot_cpu_data.x86_model >= 0x20 && boot_cpu_data.x86_model <= 0x2f)))

			return true;

		else if (boot_cpu_data.x86 == 0x17 &&

			 boot_cpu_data.x86_model >= 0x70 && boot_cpu_data.x86_model <= 0x7f)

			return true;

		return boot_cpu_has(X86_FEATURE_CPPC);

	}

	return false;