PCI: xgene: Use inbound resources for setup

Now that the helpers provide the inbound resources in the host bridge
'dma_ranges' resource list, convert the Xgene host bridge to use the
resource list to setup the inbound addresses.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Andrew Murray <andrew.murray@arm.com>
Cc: Toan Le <toan@os.amperecomputing.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c
index 9408269d943da6e92b075292a1d02875452dbb0f..de195fd430dc02ad8242bf237ddd2b55703de5c6 100644 (file)
--- a/drivers/pci/controller/pci-xgene.c
+++ b/drivers/pci/controller/pci-xgene.c
@@ -481,27 +481,28 @@ static int xgene_pcie_select_ib_reg(u8 *ib_reg_mask, u64 size)
 }
 
 static void xgene_pcie_setup_ib_reg(struct xgene_pcie_port *port,
-                                   struct of_pci_range *range, u8 *ib_reg_mask)
+                                   struct resource_entry *entry,
+                                   u8 *ib_reg_mask)
 {
        void __iomem *cfg_base = port->cfg_base;
        struct device *dev = port->dev;
        void *bar_addr;
        u32 pim_reg;
-       u64 cpu_addr = range->cpu_addr;
-       u64 pci_addr = range->pci_addr;
-       u64 size = range->size;
+       u64 cpu_addr = entry->res->start;
+       u64 pci_addr = cpu_addr - entry->offset;
+       u64 size = resource_size(entry->res);
        u64 mask = ~(size - 1) | EN_REG;
        u32 flags = PCI_BASE_ADDRESS_MEM_TYPE_64;
        u32 bar_low;
        int region;
 
-       region = xgene_pcie_select_ib_reg(ib_reg_mask, range->size);
+       region = xgene_pcie_select_ib_reg(ib_reg_mask, size);
        if (region < 0) {
                dev_warn(dev, "invalid pcie dma-range config\n");
                return;
        }
 
-       if (range->flags & IORESOURCE_PREFETCH)
+       if (entry->res->flags & IORESOURCE_PREFETCH)
                flags |= PCI_BASE_ADDRESS_MEM_PREFETCH;
 
        bar_low = pcie_bar_low_val((u32)cpu_addr, flags);
@@ -532,25 +533,13 @@ static void xgene_pcie_setup_ib_reg(struct xgene_pcie_port *port,
 
 static int xgene_pcie_parse_map_dma_ranges(struct xgene_pcie_port *port)
 {
-       struct device_node *np = port->node;
-       struct of_pci_range range;
-       struct of_pci_range_parser parser;
-       struct device *dev = port->dev;
+       struct pci_host_bridge *bridge = pci_host_bridge_from_priv(port);
+       struct resource_entry *entry;
        u8 ib_reg_mask = 0;
 
-       if (of_pci_dma_range_parser_init(&parser, np)) {
-               dev_err(dev, "missing dma-ranges property\n");
-               return -EINVAL;
-       }
-
-       /* Get the dma-ranges from DT */
-       for_each_of_pci_range(&parser, &range) {
-               u64 end = range.cpu_addr + range.size - 1;
+       resource_list_for_each_entry(entry, &bridge->dma_ranges)
+               xgene_pcie_setup_ib_reg(port, entry, &ib_reg_mask);
 
-               dev_dbg(dev, "0x%08x 0x%016llx..0x%016llx -> 0x%016llx\n",
-                       range.flags, range.cpu_addr, end, range.pci_addr);
-               xgene_pcie_setup_ib_reg(port, &range, &ib_reg_mask);
-       }
        return 0;
 }