mptable: Make interrupt routing information logging consistent with PIR
authorSepherosa Ziehau <sephe@dragonflybsd.org>
Wed, 23 Mar 2011 12:41:02 +0000 (20:41 +0800)
committerSepherosa Ziehau <sephe@dragonflybsd.org>
Wed, 23 Mar 2011 15:12:50 +0000 (23:12 +0800)
sys/platform/pc32/i386/mp_machdep.c
sys/platform/pc64/x86_64/mp_machdep.c

index 43ac12b..fdeaa8c 100644 (file)
@@ -3728,10 +3728,10 @@ mptable_pci_int_dump(void)
        const struct mptable_pci_int *pci_int;
 
        TAILQ_FOREACH(pci_int, &mptable_pci_int_list, mpci_link) {
-               kprintf("MPTABLE: %d:%d.%c -> IOAPIC %d.%d\n",
+               kprintf("MPTABLE: %d:%d INT%c -> IOAPIC %d.%d\n",
                        pci_int->mpci_bus,
                        pci_int->mpci_dev,
-                       pci_int->mpci_pin + 'a',
+                       pci_int->mpci_pin + 'A',
                        pci_int->mpci_ioapic_idx,
                        pci_int->mpci_ioapic_pin);
        }
@@ -3766,11 +3766,16 @@ mptable_pci_int_route(int bus, int dev, int pin, int intline)
        if (irq < 0) {
                if (bootverbose) {
                        kprintf("MPTABLE: fixed interrupt routing "
-                               "for %d:%d.%c\n", bus, dev, pin + 'a');
+                               "for %d:%d INT%c\n", bus, dev, pin + 'A');
                }
 
                irq = ioapic_abi_find_irq(intline,
                        INTR_TRIGGER_LEVEL, INTR_POLARITY_LOW);
        }
+
+       if (irq >= 0 && bootverbose) {
+               kprintf("MPTABLE: %d:%d INT%c routed to irq %d\n",
+                       bus, dev, pin + 'A', irq);
+       }
        return irq;
 }
index 881f7e5..000a931 100644 (file)
@@ -3723,10 +3723,10 @@ mptable_pci_int_dump(void)
        const struct mptable_pci_int *pci_int;
 
        TAILQ_FOREACH(pci_int, &mptable_pci_int_list, mpci_link) {
-               kprintf("MPTABLE: %d:%d.%c -> IOAPIC %d.%d\n",
+               kprintf("MPTABLE: %d:%d INT%c -> IOAPIC %d.%d\n",
                        pci_int->mpci_bus,
                        pci_int->mpci_dev,
-                       pci_int->mpci_pin + 'a',
+                       pci_int->mpci_pin + 'A',
                        pci_int->mpci_ioapic_idx,
                        pci_int->mpci_ioapic_pin);
        }
@@ -3761,11 +3761,16 @@ mptable_pci_int_route(int bus, int dev, int pin, int intline)
        if (irq < 0) {
                if (bootverbose) {
                        kprintf("MPTABLE: fixed interrupt routing "
-                               "for %d:%d.%c\n", bus, dev, pin + 'a');
+                               "for %d:%d INT%c\n", bus, dev, pin + 'A');
                }
 
                irq = ioapic_abi_find_irq(intline,
                        INTR_TRIGGER_LEVEL, INTR_POLARITY_LOW);
        }
+
+       if (irq >= 0 && bootverbose) {
+               kprintf("MPTABLE: %d:%d INT%c routed to irq %d\n",
+                       bus, dev, pin + 'A', irq);
+       }
        return irq;
 }