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

Add a workaround for MP Tables that list the same PCI IRQ twice with

Browse Source 
the same APIC / pin destination in both cases.

Reported by:	Pawel Jakub Dawidek <nick@garage.freebsd.pl>
This commit is contained in:
jhb 2003-11-05 16:14:10 +00:00
parent fa05f9d270
commit de98d37928
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/amd64/amd64/mptable.c
View File

@ -895,6 +895,7 @@ mptable_pci_route_interrupt_handler(u_char *entry, void *arg)
{
struct pci_route_interrupt_args *args;
int_entry_ptr intr;
int vector;
if (*entry != MPCT_ENTRY_INT)
return;
@ -902,12 +903,24 @@ mptable_pci_route_interrupt_handler(u_char *entry, void *arg)
args = (struct pci_route_interrupt_args *)arg;
if (intr->src_bus_id != args->bus || intr->src_bus_irq != args->irq)
return;
KASSERT(args->vector == -1,
("Multiple entries for PCI IRQ %d", args->vector));
/* Make sure the APIC maps to a known APIC. */
KASSERT(ioapics[intr->dst_apic_id] != NULL,
("No I/O APIC %d to route interrupt to", intr->dst_apic_id));
args->vector = ioapic_get_vector(ioapics[intr->dst_apic_id],
/*
* Look up the vector for this APIC / pin combination. If we
* have previously matched an entry for this PCI IRQ but it
* has the same vector as this entry, just return. Otherwise,
* we use the vector for this APIC / pin combination.
*/
vector = ioapic_get_vector(ioapics[intr->dst_apic_id],
intr->dst_apic_int);
if (args->vector == vector)
return;
KASSERT(args->vector == -1,
("Multiple entries for PCI IRQ %d", args->vector));
args->vector = vector;
}
int

19
sys/i386/i386/mptable.c
View File

@ -895,6 +895,7 @@ mptable_pci_route_interrupt_handler(u_char *entry, void *arg)
{
struct pci_route_interrupt_args *args;
int_entry_ptr intr;
int vector;
if (*entry != MPCT_ENTRY_INT)
return;
@ -902,12 +903,24 @@ mptable_pci_route_interrupt_handler(u_char *entry, void *arg)
args = (struct pci_route_interrupt_args *)arg;
if (intr->src_bus_id != args->bus || intr->src_bus_irq != args->irq)
return;
KASSERT(args->vector == -1,
("Multiple entries for PCI IRQ %d", args->vector));
/* Make sure the APIC maps to a known APIC. */
KASSERT(ioapics[intr->dst_apic_id] != NULL,
("No I/O APIC %d to route interrupt to", intr->dst_apic_id));
args->vector = ioapic_get_vector(ioapics[intr->dst_apic_id],
/*
* Look up the vector for this APIC / pin combination. If we
* have previously matched an entry for this PCI IRQ but it
* has the same vector as this entry, just return. Otherwise,
* we use the vector for this APIC / pin combination.
*/
vector = ioapic_get_vector(ioapics[intr->dst_apic_id],
intr->dst_apic_int);
if (args->vector == vector)
return;
KASSERT(args->vector == -1,
("Multiple entries for PCI IRQ %d", args->vector));
args->vector = vector;
}
int