From 87d0a809db0c66aad64d1f6cb9d96e15c90b762d Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Sat, 4 Jul 2009 19:31:21 +0800 Subject: [PATCH] pci: Don't allow PCIBIOS PCI-PCI bridge to attach if APIC_IO is defined PCIBIOS PCI-PCI bridge will try routing PCI interrupt using PIR, which is probably not what we want, even if MP table does not contain the PCI interrupt routing information. --- sys/bus/pci/pci_pci.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/sys/bus/pci/pci_pci.c b/sys/bus/pci/pci_pci.c index 377249a..75dcd1b 100644 --- a/sys/bus/pci/pci_pci.c +++ b/sys/bus/pci/pci_pci.c @@ -126,7 +126,12 @@ pcib_probe(device_t dev) if ((pci_get_class(dev) == PCIC_BRIDGE) && (pci_get_subclass(dev) == PCIS_BRIDGE_PCI)) { device_set_desc(dev, "PCI-PCI bridge"); - return(-10000); +#ifndef APIC_IO + return (-10000); +#else + /* PCIBIOS PCI-PCI bridge is -2000 */ + return (-1000); +#endif } return(ENXIO); } -- 1.7.7.2