Revert "sparc/PCI: Keep resource idx order with bridge register number"

This reverts commit ed426d2bf0fa5244e6cfd531e25c50098df6b3cf. This
commit causes hotplug to break as documented in Orabug 22855133.

Orabug: 22855133

Signed-off-by: Khalid Aziz <khalid.aziz@oracle.com>
(cherry picked from commit 09dd990a13d7ea2a257f5be189f109fa80259599)
Signed-off-by: Allen Pais <allen.pais@oracle.com>

diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 916f221edc1e43ba01054859050b9360beaaada7..0f503e29ad94564398d331675384e05fbd0aabaf 100644 (file)
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -477,7 +477,7 @@ static void of_scan_pci_bridge(struct pci_pbm_info *pbm,
                pci_read_bridge_bases(bus);
                goto after_ranges;
        }
-       i = 3;
+       i = 1;
        for (; len >= 32; len -= 32, ranges += 8) {
                u64 start;
 
@@ -509,12 +509,6 @@ static void of_scan_pci_bridge(struct pci_pbm_info *pbm,
                                       " for bridge %s\n", node->full_name);
                                continue;
                        }
-               } else if ((flags & IORESOURCE_PREFETCH) &&
-                          !bus->resource[2]->flags) {
-                       res = bus->resource[2];
-               } else if (((flags & (IORESOURCE_MEM | IORESOURCE_PREFETCH)) ==
-                           IORESOURCE_MEM) && !bus->resource[1]->flags) {
-                       res = bus->resource[1];
                } else {
                        if (i >= PCI_NUM_RESOURCES - PCI_BRIDGE_RESOURCES) {
                                printk(KERN_ERR "PCI: too many memory ranges"