d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reprogram I/O APIC interrupt pins when registering an I/O APIC.

Browse Source 
All I/O APIC pins are masked when an I/O APIC is first probed.  The
APIC enumerator (MP Table or MADT) then parses its associated tables to
configure individual pins to set custom delivery modes or alternate
routing (e.g. routing IRQ 0 to intpin 2).  Pins for regular interrupt
pins are left masked until the first interrupt is assigned.  However,
pins with unusual settings (e.g. NMI or SMI) are never assigned an
interrupt and thus never re-programmed.  The I/O APIC code used to
reprogram all interrupt pins during registration but this was lost in
r151979.

In theory, this is mostly a no-op as the ACPI APIC table does not
include a way to enumerate NMI or SMI pins for the I/O APIC, so only
systems using an MP Table would be affected.

Reported by:	avg
MFC after:	1 month
This commit is contained in:
jhb 2016-10-14 21:51:50 +00:00
parent f689fd5a63
commit 22e05c4848
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/x86/x86/io_apic.c
View File

@ -916,12 +916,17 @@ ioapic_register(void *cookie)
io->io_id, flags >> 4, flags & 0xf, io->io_intbase,
io->io_intbase + io->io_numintr - 1);
/* Register valid pins as interrupt sources. */
/*
* Reprogram pins to handle special case pins (such as NMI and
* SMI) and register valid pins as interrupt sources.
*/
intr_register_pic(&io->io_pic);
for (i = 0, pin = io->io_pins; i < io->io_numintr; i++, pin++)
for (i = 0, pin = io->io_pins; i < io->io_numintr; i++, pin++) {
ioapic_reprogram_intpin(&pin->io_intsrc);
if (pin->io_irq < NUM_IO_INTS)
intr_register_source(&pin->io_intsrc);
}
}
/* A simple new-bus driver to consume PCI I/O APIC devices. */
static int