Commit 4ba115e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_urgent_for_v6.3_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Borislav Petkov:

 - Add a new Intel Arrow Lake CPU model number

 - Fix a confusion about how to check the version of the ACPI spec which
   supports a "online capable" bit in the MADT table which lead to a
   bunch of boot breakages with Zen1 systems and VMs

* tag 'x86_urgent_for_v6.3_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu: Add model number for Intel Arrow Lake processor
  x86/acpi/boot: Correct acpi_is_processor_usable() check
  x86/ACPI/boot: Use FADT version to check support for online capable
parents c08cfd67 81515ecf

arch/x86/include/asm/intel-family.h

+2 −0
Original line number Diff line number Diff line
@@ -125,6 +125,8 @@ 


#define INTEL_FAM6_LUNARLAKE_M		0xBD



#define INTEL_FAM6_ARROWLAKE		0xC6



/* "Small Core" Processors (Atom/E-Core) */



#define INTEL_FAM6_ATOM_BONNELL		0x1C /* Diamondville, Pineview */

arch/x86/kernel/acpi/boot.c

+7 −2
Original line number Diff line number Diff line
@@ -146,7 +146,11 @@ static int __init acpi_parse_madt(struct acpi_table_header *table) 


		pr_debug("Local APIC address 0x%08x\n", madt->address);

	}

	if (madt->header.revision >= 5)



	/* ACPI 6.3 and newer support the online capable bit. */

	if (acpi_gbl_FADT.header.revision > 6 ||

	    (acpi_gbl_FADT.header.revision == 6 &&

	     acpi_gbl_FADT.minor_revision >= 3))

		acpi_support_online_capable = true;



	default_acpi_madt_oem_check(madt->header.oem_id,
@@ -193,7 +197,8 @@ static bool __init acpi_is_processor_usable(u32 lapic_flags) 
	if (lapic_flags & ACPI_MADT_ENABLED)

		return true;



	if (acpi_support_online_capable && (lapic_flags & ACPI_MADT_ONLINE_CAPABLE))

	if (!acpi_support_online_capable ||

	    (lapic_flags & ACPI_MADT_ONLINE_CAPABLE))

		return true;



	return false;