From: Khalid Aziz Date: Tue, 3 May 2016 14:14:11 +0000 (-0600) Subject: Revert "sparc/PCI: Reserve legacy mmio after PCI mmio" X-Git-Tag: v4.1.12-102.0.20170529_2200~83 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=12d87fe530ba1ed670aab9d165a7c526485c2196;p=users%2Fjedix%2Flinux-maple.git 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 (cherry picked from commit 59860a19cf9b2acd24a7eaec6d539dbc984a90b9) Signed-off-by: Allen Pais --- diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index 0f503e29ad945..afa85d3f0202a 100644 --- 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 957dc9d0300d9..c4b6989690dcf 100644 --- 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 adad5785b308c..a3fec8f07c4da 100644 --- 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. */