Commit 680d9b2a authored by Sohil Mehta's avatar Sohil Mehta Committed by Ingo Molnar
Browse files

x86/apic: Fix 32-bit APIC initialization for extended Intel Families 



APIC detection is currently limited to a few specific Families and will
not match the upcoming Families >=18.

Extend the check to include all Families 6 or greater. Also convert it
to a VFM check to make it simpler.

Signed-off-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/r/20250219184133.816753-2-sohil.mehta@intel.com
parent a46f3226

arch/x86/kernel/apic/apic.c

+2 −2
Original line number Diff line number Diff line
@@ -2011,8 +2011,8 @@ static bool __init detect_init_APIC(void) 
	case X86_VENDOR_HYGON:

		break;

	case X86_VENDOR_INTEL:

		if (boot_cpu_data.x86 == 6 || boot_cpu_data.x86 == 15 ||

		    (boot_cpu_data.x86 == 5 && boot_cpu_has(X86_FEATURE_APIC)))

		if ((boot_cpu_data.x86 == 5 && boot_cpu_has(X86_FEATURE_APIC)) ||

		    boot_cpu_data.x86_vfm >= INTEL_PENTIUM_PRO)

			break;

		goto no_apic;

	default: