tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 4ba115e2 c08cfd67

+9 -2
+2
arch/x86/include/asm/intel-family.h
··· 125 125 126 126 #define INTEL_FAM6_LUNARLAKE_M 0xBD 127 127 128 + #define INTEL_FAM6_ARROWLAKE 0xC6 129 + 128 130 /* "Small Core" Processors (Atom/E-Core) */ 129 131 130 132 #define INTEL_FAM6_ATOM_BONNELL 0x1C /* Diamondville, Pineview */
+7 -2
arch/x86/kernel/acpi/boot.c
··· 146 146 147 147 pr_debug("Local APIC address 0x%08x\n", madt->address); 148 148 } 149 - if (madt->header.revision >= 5) 149 + 150 + /* ACPI 6.3 and newer support the online capable bit. */ 151 + if (acpi_gbl_FADT.header.revision > 6 || 152 + (acpi_gbl_FADT.header.revision == 6 && 153 + acpi_gbl_FADT.minor_revision >= 3)) 150 154 acpi_support_online_capable = true; 151 155 152 156 default_acpi_madt_oem_check(madt->header.oem_id, ··· 197 193 if (lapic_flags & ACPI_MADT_ENABLED) 198 194 return true; 199 195 200 - if (acpi_support_online_capable && (lapic_flags & ACPI_MADT_ONLINE_CAPABLE)) 196 + if (!acpi_support_online_capable || 197 + (lapic_flags & ACPI_MADT_ONLINE_CAPABLE)) 201 198 return true; 202 199 203 200 return false;