From c80b61366f8a93a84105c35c3c2ea6550a23c69a Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Sun, 11 Dec 2011 19:19:55 +0800 Subject: [PATCH] i386/ioapic_abi: Rework debug messages This merges 621d2ccf74a7c3c6069377fe217d778a3ad0d414 --- sys/platform/pc32/apic/ioapic_abi.c | 30 +++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/sys/platform/pc32/apic/ioapic_abi.c b/sys/platform/pc32/apic/ioapic_abi.c index 69683530b9..a80a077d67 100644 --- a/sys/platform/pc32/apic/ioapic_abi.c +++ b/sys/platform/pc32/apic/ioapic_abi.c @@ -952,14 +952,18 @@ ioapic_abi_gsi_cpuid(int irq, int gsi) KKASSERT(gsi >= 0); if (irq == 0 || gsi == 0) { - if (bootverbose) - kprintf("GSI %d -> CPU 0 (0)\n", gsi); + if (bootverbose) { + kprintf("IOAPIC: irq %d, gsi %d -> cpu0 (0)\n", + irq, gsi); + } return 0; } if (irq == acpi_sci_irqno()) { - if (bootverbose) - kprintf("GSI %d -> CPU 0 (sci)\n", gsi); + if (bootverbose) { + kprintf("IOAPIC: irq %d, gsi %d -> cpu0 (sci)\n", + irq, gsi); + } return 0; } @@ -968,15 +972,21 @@ ioapic_abi_gsi_cpuid(int irq, int gsi) if (cpuid < 0) { cpuid = gsi % ncpus; - if (bootverbose) - kprintf("GSI %d -> CPU %d (auto)\n", gsi, cpuid); + if (bootverbose) { + kprintf("IOAPIC: irq %d, gsi %d -> cpu%d (auto)\n", + irq, gsi, cpuid); + } } else if (cpuid >= ncpus) { cpuid = ncpus - 1; - if (bootverbose) - kprintf("GSI %d -> CPU %d (fixup)\n", gsi, cpuid); + if (bootverbose) { + kprintf("IOAPIC: irq %d, gsi %d -> cpu%d (fixup)\n", + irq, gsi, cpuid); + } } else { - if (bootverbose) - kprintf("GSI %d -> CPU %d (user)\n", gsi, cpuid); + if (bootverbose) { + kprintf("IOAPIC: irq %d, gsi %d -> cpu%d (user)\n", + irq, gsi, cpuid); + } } return cpuid; } -- 2.41.0