Page MenuHomeFreeBSD
Files F157509362

D23965.id69224.diff
No OneTemporary
Actions

D23965.id69224.diff
View Options

Index: sys/x86/x86/io_apic.c
===================================================================
--- sys/x86/x86/io_apic.c
+++ sys/x86/x86/io_apic.c
@@ -94,7 +94,8 @@
struct ioapic {
struct pic io_pic;
u_int io_id:8; /* logical ID */
- u_int io_apic_id:4;
+ u_int io_apic_id:8;
+ u_int io_old_apic_id:8;
u_int io_intbase:8; /* System Interrupt base */
u_int io_numintr:8;
u_int io_haseoi:1;
@@ -192,8 +193,11 @@
low1 |= IOART_TRGREDG | IOART_INTMSET;
ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(src->io_intpin),
low1);
+ low1 = src->io_lowreg;
+ if (src->io_masked != 0)
+ low1 |= IOART_INTMSET;
ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(src->io_intpin),
- src->io_lowreg);
+ low1);
if (!locked)
mtx_unlock_spin(&icu_lock);
}
@@ -635,12 +639,13 @@
mtx_lock_spin(&icu_lock);
io->io_id = next_id++;
io->io_apic_id = ioapic_read(apic, IOAPIC_ID) >> APIC_ID_SHIFT;
+ io->io_old_apic_id = io->io_apic_id;
if (apic_id != -1 && io->io_apic_id != apic_id) {
+ io->io_apic_id = apic_id;
ioapic_write(apic, IOAPIC_ID, apic_id << APIC_ID_SHIFT);
mtx_unlock_spin(&icu_lock);
- io->io_apic_id = apic_id;
- printf("ioapic%u: Changing APIC ID to %d\n", io->io_id,
- apic_id);
+ printf("ioapic%u: Changing APIC ID from %d to %d\n", io->io_id,
+ io->io_old_apic_id, apic_id);
} else
mtx_unlock_spin(&icu_lock);
if (intbase == -1) {
@@ -1017,14 +1022,15 @@
}
/* Then by apic id */
STAILQ_FOREACH(io, &ioapic_list, io_next) {
- if (io->io_apic_id == apic_id)
+ if (io->io_apic_id == apic_id || io->io_old_apic_id == apic_id)
goto found;
}
mtx_unlock_spin(&icu_lock);
if (bootverbose)
device_printf(dev,
- "cannot match pci bar apic id %d against MADT\n",
- apic_id);
+ "cannot match pci bar apic id %d against MADT, "
+ "BAR0 %#jx io id %d\n",
+ apic_id, (uintmax_t)rman_get_start(res), apic_id);
fail:
bus_release_resource(dev, SYS_RES_MEMORY, rid, res);
return (ENXIO);

File Metadata

Mime Type
text/plain
Expires
Sat, May 23, 5:26 AM (13 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33442109
Default Alt Text
D23965.id69224.diff (1 KB)

Event Timeline