Module Name: src Committed By: bouyer Date: Mon Sep 30 17:00:10 UTC 2024
Modified Files: src/sys/arch/x86/x86: mpacpi.c Log Message: Remove check (x2apic->LocalApicId <= 0xff) in mpacpi_config_cpu(), the ACPI spec mentions this for compatibility with "legacy OSes" but doens't explicitely forbid it (AFAIK). This makes a recent Dell poweredge R750 boot to the installer. See https://mail-index.netbsd.org/port-amd64/2023/12/30/msg003666.html and https://mail-index.netbsd.org/port-amd64/2024/09/28/msg003695.html It should help for PR kern/57737 To generate a diff of this commit: cvs rdiff -u -r1.110 -r1.111 src/sys/arch/x86/x86/mpacpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/x86/x86/mpacpi.c diff -u src/sys/arch/x86/x86/mpacpi.c:1.110 src/sys/arch/x86/x86/mpacpi.c:1.111 --- src/sys/arch/x86/x86/mpacpi.c:1.110 Fri Mar 24 12:25:28 2023 +++ src/sys/arch/x86/x86/mpacpi.c Mon Sep 30 17:00:10 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: mpacpi.c,v 1.110 2023/03/24 12:25:28 bouyer Exp $ */ +/* $NetBSD: mpacpi.c,v 1.111 2024/09/30 17:00:10 bouyer Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.110 2023/03/24 12:25:28 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.111 2024/09/30 17:00:10 bouyer Exp $"); #include "acpica.h" #include "opt_acpi.h" @@ -393,17 +393,6 @@ mpacpi_config_cpu(ACPI_SUBTABLE_HEADER * case ACPI_MADT_TYPE_LOCAL_X2APIC: x2apic = (ACPI_MADT_LOCAL_X2APIC *)hdrp; - /* ACPI spec: "Logical processors with APIC ID values - * less than 255 must use the Processor Local APIC - * structure to convey their APIC information to OSPM." - * But Xen with PVH dom0 breaks this ACPI spec. - */ - if (x2apic->LocalApicId <= 0xff && vm_guest != VM_GUEST_XENPVH) { - printf("bogus MADT X2APIC entry (id = 0x%"PRIx32")\n", - x2apic->LocalApicId); - break; - } - if (x2apic->LapicFlags & ACPI_MADT_ENABLED) { if (x2apic->LocalApicId != cpunum) caa.cpu_role = CPU_ROLE_AP;