of/pci: Fix the conversion of IO ranges into IO resources

The ranges property for a host bridge controller in DT describes the
mapping between the PCI bus address and the CPU physical address.  The
resources framework however expects that the IO resources start at a pseudo
"port" address 0 (zero) and have a maximum size of IO_SPACE_LIMIT.  The
conversion from PCI ranges to resources failed to take that into account,
returning a CPU physical address instead of a port number.

Also fix all the drivers that depend on the old behaviour by fetching the
CPU physical address based on the port number where it is being needed.

Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
CC: Grant Likely <grant.likely@linaro.org>
CC: Rob Herring <robh+dt@kernel.org>
CC: Arnd Bergmann <arnd@arndb.de>
CC: Thierry Reding <thierry.reding@gmail.com>
CC: Simon Horman <horms@verge.net.au>
CC: Catalin Marinas <catalin.marinas@arm.com>

1 files changed, 12 insertions, 11 deletions

diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c
index 05e1f73a1e8d..c186a17c2cff 100644
--- a/arch/arm/mach-integrator/pci_v3.c
+++ b/arch/arm/mach-integrator/pci_v3.c
@@ -660,6 +660,7 @@ static void __init pci_v3_preinit(void)
 {
         unsigned long flags;
         unsigned int temp;
+        phys_addr_t io_address = pci_pio_to_address(io_mem.start);
 
         pcibios_min_mem = 0x00100000;
 
@@ -701,7 +702,7 @@ static void __init pci_v3_preinit(void)
         /*
          * Setup window 2 - PCI IO
          */
-        v3_writel(V3_LB_BASE2, v3_addr_to_lb_base2(io_mem.start) |
+        v3_writel(V3_LB_BASE2, v3_addr_to_lb_base2(io_address) |
                         V3_LB_BASE_ENABLE);
         v3_writew(V3_LB_MAP2, v3_addr_to_lb_map2(0));
 
@@ -742,6 +743,7 @@ static void __init pci_v3_preinit(void)
 static void __init pci_v3_postinit(void)
 {
         unsigned int pci_cmd;
+        phys_addr_t io_address = pci_pio_to_address(io_mem.start);
 
         pci_cmd = PCI_COMMAND_MEMORY |
                   PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE;
@@ -758,7 +760,7 @@ static void __init pci_v3_postinit(void)
                        "interrupt: %d\n", ret);
 #endif
 
-        register_isa_ports(non_mem.start, io_mem.start, 0);
+        register_isa_ports(non_mem.start, io_address, 0);
 }
 
 /*
@@ -867,33 +869,32 @@ static int __init pci_v3_probe(struct platform_device *pdev)
 
         for_each_of_pci_range(&parser, &range) {
                 if (!range.flags) {
-                        of_pci_range_to_resource(&range, np, &conf_mem);
+                        ret = of_pci_range_to_resource(&range, np, &conf_mem);
                         conf_mem.name = "PCIv3 config";
                 }
                 if (range.flags & IORESOURCE_IO) {
-                        of_pci_range_to_resource(&range, np, &io_mem);
+                        ret = of_pci_range_to_resource(&range, np, &io_mem);
                         io_mem.name = "PCIv3 I/O";
                 }
                 if ((range.flags & IORESOURCE_MEM) &&
                         !(range.flags & IORESOURCE_PREFETCH)) {
                         non_mem_pci = range.pci_addr;
                         non_mem_pci_sz = range.size;
-                        of_pci_range_to_resource(&range, np, &non_mem);
+                        ret = of_pci_range_to_resource(&range, np, &non_mem);
                         non_mem.name = "PCIv3 non-prefetched mem";
                 }
                 if ((range.flags & IORESOURCE_MEM) &&
                         (range.flags & IORESOURCE_PREFETCH)) {
                         pre_mem_pci = range.pci_addr;
                         pre_mem_pci_sz = range.size;
-                        of_pci_range_to_resource(&range, np, &pre_mem);
+                        ret = of_pci_range_to_resource(&range, np, &pre_mem);
                         pre_mem.name = "PCIv3 prefetched mem";
                 }
-        }
 
-        if (!conf_mem.start || !io_mem.start ||
-            !non_mem.start || !pre_mem.start) {
-                dev_err(&pdev->dev, "missing ranges in device node\n");
-                return -EINVAL;
+                if (ret < 0) {
+                        dev_err(&pdev->dev, "missing ranges in device node\n");
+                        return ret;
+                }
         }
 
         pci_v3.map_irq = of_irq_parse_and_map_pci;