mips/PCI: convert to pci_scan_root_bus() for correct root bus resources

Convert from pci_scan_bus() to pci_scan_root_bus() and remove root bus
resource fixups.  This fixes the problem of "early" and "header" quirks
seeing incorrect root bus resources.

Based on original patch by Deng-Cheng Zhu.

Reference: https://lkml.org/lkml/2011/8/26/89
CC: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Deng-Cheng Zhu <dczhu@mips.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

1 files changed, 10 insertions, 7 deletions

diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 0586535872cf..fa8e378413b1 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -81,6 +81,7 @@ static void __devinit pcibios_scanbus(struct pci_controller *hose)
 {
         static int next_busno;
         static int need_domain_info;
+        LIST_HEAD(resources);
         struct pci_bus *bus;
 
         if (!hose->iommu)
@@ -89,7 +90,13 @@ static void __devinit pcibios_scanbus(struct pci_controller *hose)
         if (hose->get_busno && pci_probe_only)
                 next_busno = (*hose->get_busno)();
 
-        bus = pci_scan_bus(next_busno, hose->pci_ops, hose);
+        pci_add_resource(&resources, hose->mem_resource);
+        pci_add_resource(&resources, hose->io_resource);
+        bus = pci_scan_root_bus(NULL, next_busno, hose->pci_ops, hose,
+                                &resources);
+        if (!bus)
+                pci_free_resource_list(&resources);
+
         hose->bus = bus;
 
         need_domain_info = need_domain_info || hose->index;
@@ -245,15 +252,11 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
 {
         /* Propagate hose info into the subordinate devices.  */
 
-        struct pci_controller *hose = bus->sysdata;
         struct list_head *ln;
         struct pci_dev *dev = bus->self;
 
-        if (!dev) {
-                bus->resource[0] = hose->io_resource;
-                bus->resource[1] = hose->mem_resource;
-        } else if (pci_probe_only &&
-                   (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
+        if (pci_probe_only && dev &&
+            (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
                 pci_read_bridge_bases(bus);
                 pcibios_fixup_device_resources(dev, bus);
         }