From d904d4d9dc82e21a4d71a1831bd5c710cd24120c Mon Sep 17 00:00:00 2001
From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Thu, 9 Jun 2011 15:31:27 +0800
Subject: [PATCH] i386/mptable: Always dump MPTABLE PCI interrupt routing
 information

---
 sys/bus/pci/i386/mptable_pci.c   | 3 ---
 sys/platform/pc32/i386/machdep.c | 4 ++++
 sys/platform/pc32/i386/mptable.c | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/sys/bus/pci/i386/mptable_pci.c b/sys/bus/pci/i386/mptable_pci.c
index 7a19668cc4..3a0dc7a801 100644
--- a/sys/bus/pci/i386/mptable_pci.c
+++ b/sys/bus/pci/i386/mptable_pci.c
@@ -89,9 +89,6 @@ mptable_hostb_probe(device_t dev)
 		return (ENXIO);
 #endif
 
-	if (bootverbose)
-		mptable_pci_int_dump();
-
 	device_set_desc(dev, "MPTABLE Host-PCI bridge");
 	return (0);
 }
diff --git a/sys/platform/pc32/i386/machdep.c b/sys/platform/pc32/i386/machdep.c
index 78711181d4..8ce39f9080 100644
--- a/sys/platform/pc32/i386/machdep.c
+++ b/sys/platform/pc32/i386/machdep.c
@@ -123,6 +123,7 @@
 #include <machine_base/apic/lapic.h>
 #include <machine_base/apic/ioapic.h>
 #include <machine_base/apic/ioapic_abi.h>
+#include <machine/mptable.h>
 
 #define PHYSMAP_ENTRIES		10
 
@@ -381,6 +382,9 @@ pic_finish(void *dummy __unused)
 	/* Log ELCR information */
 	elcr_dump();
 
+	/* Log MPTABLE information */
+	mptable_pci_int_dump();
+
 	/* Finalize PIC */
 	MachIntrABI.finalize();
 }
diff --git a/sys/platform/pc32/i386/mptable.c b/sys/platform/pc32/i386/mptable.c
index ad3e8cc09c..47e82c14a4 100644
--- a/sys/platform/pc32/i386/mptable.c
+++ b/sys/platform/pc32/i386/mptable.c
@@ -1390,6 +1390,9 @@ mptable_pci_int_dump(void)
 {
 	const struct mptable_pci_int *pci_int;
 
+	if (!bootverbose)
+		return;
+
 	TAILQ_FOREACH(pci_int, &mptable_pci_int_list, mpci_link) {
 		kprintf("MPTABLE: %d:%d INT%c -> IOAPIC %d.%d\n",
 			pci_int->mpci_bus,
-- 
2.41.0