Module Name: src
Committed By: msaitoh
Date: Thu Oct 6 06:42:46 UTC 2022
Modified Files:
src/sys/arch/x86/x86: ioapic.c
Log Message:
Print detail about misconfigured APIC ID.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/x86/x86/ioapic.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/ioapic.c
diff -u src/sys/arch/x86/x86/ioapic.c:1.65 src/sys/arch/x86/x86/ioapic.c:1.66
--- src/sys/arch/x86/x86/ioapic.c:1.65 Thu Oct 7 12:52:27 2021
+++ src/sys/arch/x86/x86/ioapic.c Thu Oct 6 06:42:46 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ioapic.c,v 1.65 2021/10/07 12:52:27 msaitoh Exp $ */
+/* $NetBSD: ioapic.c,v 1.66 2022/10/06 06:42:46 msaitoh Exp $ */
/*-
* Copyright (c) 2000, 2009 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioapic.c,v 1.65 2021/10/07 12:52:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioapic.c,v 1.66 2022/10/06 06:42:46 msaitoh Exp $");
#include "opt_ddb.h"
@@ -374,8 +374,9 @@ ioapic_attach(device_t parent, device_t
* mapping later ...
*/
if (apic_id != sc->sc_pic.pic_apicid) {
- aprint_debug_dev(sc->sc_dev, "misconfigured as apic %d\n",
- apic_id);
+ aprint_debug_dev(sc->sc_dev,
+ "apid is misconfigured (%d != %d)\n",
+ apic_id, sc->sc_pic.pic_apicid);
ioapic_write(sc, IOAPIC_ID,
(ioapic_read(sc, IOAPIC_ID) & ~IOAPIC_ID_MASK)
@@ -386,7 +387,8 @@ ioapic_attach(device_t parent, device_t
if (apic_id != sc->sc_pic.pic_apicid)
aprint_error_dev(sc->sc_dev,
- "can't remap to apid %d\n", sc->sc_pic.pic_apicid);
+ "can't remap apid from %d to %d\n",
+ apic_id, sc->sc_pic.pic_apicid);
else
aprint_debug_dev(sc->sc_dev, "remapped to apic %d\n",
sc->sc_pic.pic_apicid);
