1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
index bedc0b1562b9..13478ecd4113 100644
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@ -342,8 +342,6 @@ static void mvebu_pcie_handle_iobase_change(struct mvebu_pcie_port *port)
         mvebu_mbus_add_window_remap_by_id(port->io_target, port->io_attr,
                                           port->iowin_base, port->iowin_size,
                                           iobase);
-
-        pci_ioremap_io(iobase, port->iowin_base);
 }
 
 static void mvebu_pcie_handle_membase_change(struct mvebu_pcie_port *port)
@@ -735,9 +733,9 @@ static resource_size_t mvebu_pcie_align_resource(struct pci_dev *dev,
          * aligned on their size
          */
         if (res->flags & IORESOURCE_IO)
-                return round_up(start, max((resource_size_t)SZ_64K, size));
+                return round_up(start, max_t(resource_size_t, SZ_64K, size));
         else if (res->flags & IORESOURCE_MEM)
-                return round_up(start, max((resource_size_t)SZ_1M, size));
+                return round_up(start, max_t(resource_size_t, SZ_1M, size));
         else
                 return start;
 }
@@ -993,6 +991,10 @@ static int mvebu_pcie_probe(struct platform_device *pdev)
         }
 
         pcie->nports = i;
+
+        for (i = 0; i < (IO_SPACE_LIMIT - SZ_64K); i += SZ_64K)
+                pci_ioremap_io(i, pcie->io.start + i);
+
         mvebu_pcie_msi_enable(pcie);
         mvebu_pcie_enable(pcie);