[PATCH] PCI: fix probing for some mips systems

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 749ddecd47afc401c2238ef36b6671eed5a5657a..be87193cff59513aa0bf1439978a40cb3f1850ad 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -337,12 +337,19 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max
        struct pci_bus *child;
        int is_cardbus = (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS);
        u32 buses;
+       u16 bctl;
 
        pci_read_config_dword(dev, PCI_PRIMARY_BUS, &buses);
 
        DBG("Scanning behind PCI bridge %s, config %06x, pass %d\n",
            pci_name(dev), buses & 0xffffff, pass);
 
+       /* Disable MasterAbortMode during probing to avoid reporting
+          of bus errors (in some architectures) */ 
+       pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &bctl);
+       pci_write_config_word(dev, PCI_BRIDGE_CONTROL,
+                             bctl & ~PCI_BRIDGE_CTL_MASTER_ABORT);
+
        if ((buses & 0xffff00) && !pcibios_assign_all_busses() && !is_cardbus) {
                unsigned int cmax, busnr;
                /*
@@ -406,6 +413,8 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max
                pci_write_config_byte(dev, PCI_SUBORDINATE_BUS, max);
        }
 
+       pci_write_config_word(dev, PCI_BRIDGE_CONTROL, bctl);
+
        sprintf(child->name, (is_cardbus ? "PCI CardBus #%02x" : "PCI Bus #%02x"), child->number);
 
        return max;