Revert "sparc/PCI: Reserve legacy mmio after PCI mmio"

This reverts commit 0c1736c25a4e157cc31f4bed645fded815b4db97. 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 59860a19cf9b2acd24a7eaec6d539dbc984a90b9)
Signed-off-by: Allen Pais <allen.pais@oracle.com>

diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 0f503e29ad94564398d331675384e05fbd0aabaf..afa85d3f0202a683c521a442427c4c8ff3c3cfec 100644 (file)
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -690,7 +690,6 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,
        pci_bus_register_of_sysfs(bus);
 
        pci_claim_bus_resources(bus);
-       pci_register_legacy_regions(pbm);
        pci_bus_add_devices(bus);
 
        list_for_each_entry(child, &bus->children, node)

diff --git a/arch/sparc/kernel/pci_common.c b/arch/sparc/kernel/pci_common.c
index 957dc9d0300d936315c2b09935538864d8a90476..c4b6989690dcf48736ec416eb77487755752a4b5 100644 (file)
--- a/arch/sparc/kernel/pci_common.c
+++ b/arch/sparc/kernel/pci_common.c
@@ -363,7 +363,7 @@ static void pci_register_region(struct pci_pbm_info *pbm, const char *name,
        }
 }
 
-void pci_register_legacy_regions(struct pci_pbm_info *pbm)
+static void pci_register_legacy_regions(struct pci_pbm_info *pbm)
 {
        /* VGA Video RAM. */
        pci_register_region(pbm, "Video RAM area", 0xa0000UL, 0x20000UL);
@@ -498,6 +498,7 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm)
        if (pbm->mem64_space.flags)
                request_resource(&iomem_resource, &pbm->mem64_space);
 
+       pci_register_legacy_regions(pbm);
        pci_register_iommu_region(pbm);
 }
 

diff --git a/arch/sparc/kernel/pci_impl.h b/arch/sparc/kernel/pci_impl.h
index adad5785b308cc926d0f2f97ad6cc8face16d6b9..a3fec8f07c4dad6800178d9e012974136bc762f6 100644 (file)
--- a/arch/sparc/kernel/pci_impl.h
+++ b/arch/sparc/kernel/pci_impl.h
@@ -194,7 +194,6 @@ void pci_get_pbm_props(struct pci_pbm_info *pbm);
 struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,
                                 struct device *parent);
 void pci_determine_mem_io_space(struct pci_pbm_info *pbm);
-void pci_register_legacy_regions(struct pci_pbm_info *pbm);
 void pci_priq_msi_init(struct pci_pbm_info *pbm);
 
 /* Error reporting support. */