sparc/PCI: Reserve legacy mmio after PCI mmio

On one system found bunch of claim resource fail from pci device.
pci_sun4v f02b894c: PCI host bridge to bus 0000:00
pci_bus 0000:00: root bus resource [io  0x2007e00000000-0x2007e0fffffff] (bus address [0x0000-0xfffffff])
pci_bus 0000:00: root bus resource [mem 0x2000000000000-0x200007effffff] (bus address [0x00000000-0x7effffff])
pci_bus 0000:00: root bus resource [mem 0x2000100000000-0x20007ffffffff] (bus address [0x100000000-0x7ffffffff])
...
PCI: Claiming 0000:00:02.0: Resource 14: 0002000000000000..00020000004fffff [200]
pci 0000:00:02.0: can't claim BAR 14 [mem 0x2000000000000-0x20000004fffff]: address conflict with Video RAM area [??? 0x20000000a0000-0x20000000bffff flags 0x80000000]
pci 0000:02:00.0: can't claim BAR 0 [mem 0x2000000000000-0x20000000fffff]: no compatible bridge window
PCI: Claiming 0000:02:00.0: Resource 3: 0002000000100000..0002000000103fff [200]
pci 0000:02:00.0: can't claim BAR 3 [mem 0x2000000100000-0x2000000103fff]: no compatible bridge window
PCI: Claiming 0000:02:00.1: Resource 0: 0002000000200000..00020000002fffff [200]
pci 0000:02:00.1: can't claim BAR 0 [mem 0x2000000200000-0x20000002fffff]: no compatible bridge window
PCI: Claiming 0000:02:00.1: Resource 3: 0002000000104000..0002000000107fff [200]
pci 0000:02:00.1: can't claim BAR 3 [mem 0x2000000104000-0x2000000107fff]: no compatible bridge window
PCI: Claiming 0000:02:00.2: Resource 0: 0002000000300000..00020000003fffff [200]
pci 0000:02:00.2: can't claim BAR 0 [mem 0x2000000300000-0x20000003fffff]: no compatible bridge window
PCI: Claiming 0000:02:00.2: Resource 3: 0002000000108000..000200000010bfff [200]
pci 0000:02:00.2: can't claim BAR 3 [mem 0x2000000108000-0x200000010bfff]: no compatible bridge window
PCI: Claiming 0000:02:00.3: Resource 0: 0002000000400000..00020000004fffff [200]
pci 0000:02:00.3: can't claim BAR 0 [mem 0x2000000400000-0x20000004fffff]: no compatible bridge window
PCI: Claiming 0000:02:00.3: Resource 3: 000200000010c000..000200000010ffff [200]
pci 0000:02:00.3: can't claim BAR 3 [mem 0x200000010c000-0x200000010ffff]: no compatible bridge window

The bridge 00:02.0 resource does not get reserved as Video RAM take the position early,
and following children resources reservation all fail.

Move down Video RAM area reservation after pci mmio get reserved,
so we leave pci driver to use those regions.

-v5: merge simplify one and use pcibios_bus_to_resource()

-v6: use pci_find_bus_resource()

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Tested-by: Khalid Aziz <khalid.aziz@oracle.com>
Cc: sparclinux@vger.kernel.org
Orabug: 22855133

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

diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index ea9c6eedb7ffc37fda296662c9bd5f9a7ce0d705..0155fb7182f25e23fc6eaed5e73a726d0fec7aa8 100644 (file)
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -690,6 +690,7 @@ 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(bus);
        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 76998f80b07eac4ec6f4bba821eaaec5c2dc172d..1ebc7ff3e99e89efe9dc577ea18da4ec4806cd69 100644 (file)
--- a/arch/sparc/kernel/pci_common.c
+++ b/arch/sparc/kernel/pci_common.c
@@ -328,41 +328,46 @@ void pci_get_pbm_props(struct pci_pbm_info *pbm)
        }
 }
 
-static void pci_register_legacy_regions(struct resource *io_res,
-                                       struct resource *mem_res)
+static void pci_register_region(struct pci_bus *bus, const char *name,
+                               resource_size_t rstart, resource_size_t size)
 {
-       struct resource *p;
+       struct resource *res, *conflict, *bus_res;
+       struct pci_bus_region region;
 
-       /* VGA Video RAM. */
-       p = kzalloc(sizeof(*p), GFP_KERNEL);
-       if (!p)
+       res = kzalloc(sizeof(*res), GFP_KERNEL);
+       if (!res)
                return;
 
-       p->name = "Video RAM area";
-       p->start = mem_res->start + 0xa0000UL;
-       p->end = p->start + 0x1ffffUL;
-       p->flags = IORESOURCE_BUSY;
-       request_resource(mem_res, p);
+       res->flags = IORESOURCE_MEM;
 
-       p = kzalloc(sizeof(*p), GFP_KERNEL);
-       if (!p)
+       region.start = rstart;
+       region.end = rstart + size - 1UL;
+       pcibios_bus_to_resource(bus, res, &region);
+       bus_res = pci_find_bus_resource(bus, res);
+       if (!bus_res) {
+               kfree(res);
                return;
+       }
+
+       res->name = name;
+       res->flags |= IORESOURCE_BUSY;
+       conflict = request_resource_conflict(bus_res, res);
+       if (conflict) {
+               dev_printk(KERN_DEBUG, &bus->dev,
+                       " can't claim %s %pR: address conflict with %s %pR\n",
+                       res->name, res, conflict->name, conflict);
+               kfree(res);
+       }
+}
 
-       p->name = "System ROM";
-       p->start = mem_res->start + 0xf0000UL;
-       p->end = p->start + 0xffffUL;
-       p->flags = IORESOURCE_BUSY;
-       request_resource(mem_res, p);
+void pci_register_legacy_regions(struct pci_bus *bus)
+{
+       /* VGA Video RAM. */
+       pci_register_region(bus, "Video RAM area", 0xa0000UL, 0x20000UL);
 
-       p = kzalloc(sizeof(*p), GFP_KERNEL);
-       if (!p)
-               return;
+       pci_register_region(bus, "System ROM",     0xf0000UL, 0x10000UL);
 
-       p->name = "Video ROM";
-       p->start = mem_res->start + 0xc0000UL;
-       p->end = p->start + 0x7fffUL;
-       p->flags = IORESOURCE_BUSY;
-       request_resource(mem_res, p);
+       pci_register_region(bus, "Video ROM",      0xc0000UL,  0x8000UL);
 }
 
 static void pci_register_iommu_region(struct pci_pbm_info *pbm)
@@ -504,8 +509,6 @@ 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->io_space,
-                                   &pbm->mem_space);
        pci_register_iommu_region(pbm);
 }
 

diff --git a/arch/sparc/kernel/pci_impl.h b/arch/sparc/kernel/pci_impl.h
index 8ed416227386908ede0315b37e6524aaaa921788..99a1387e917e9e21a56258f87faf0374c1172610 100644 (file)
--- a/arch/sparc/kernel/pci_impl.h
+++ b/arch/sparc/kernel/pci_impl.h
@@ -195,6 +195,7 @@ 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_bus *bus);
 void pci_priq_msi_init(struct pci_pbm_info *pbm);
 
 /* Error reporting support. */