PCI: mvebu: Use for_each_of_range() iterator for parsing "ranges"

The mvebu "ranges" is a bit unusual with its own encoding of addresses,
but it's still just normal "ranges" as far as parsing is concerned.
Convert mvebu_get_tgt_attr() to use the for_each_of_range() iterator
instead of open coding the parsing.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://patch.msgid.link/20241107153255.2740610-1-robh@kernel.org

diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c
index b0e3bce10aa44fd00670bb97dfffe7787f9a5b89..c635b27ccbc210314bdb7a67c2a6afe6a2ce13cc 100644 (file)
--- a/drivers/pci/controller/pci-mvebu.c
+++ b/drivers/pci/controller/pci-mvebu.c
@@ -1179,37 +1179,29 @@ static int mvebu_get_tgt_attr(struct device_node *np, int devfn,
                              unsigned int *tgt,
                              unsigned int *attr)
 {
-       const int na = 3, ns = 2;
-       const __be32 *range;
-       int rlen, nranges, rangesz, pna, i;
+       struct of_range range;
+       struct of_range_parser parser;
 
        *tgt = -1;
        *attr = -1;
 
-       range = of_get_property(np, "ranges", &rlen);
-       if (!range)
+       if (of_pci_range_parser_init(&parser, np))
                return -EINVAL;
 
-       pna = of_n_addr_cells(np);
-       rangesz = pna + na + ns;
-       nranges = rlen / sizeof(__be32) / rangesz;
-
-       for (i = 0; i < nranges; i++, range += rangesz) {
-               u32 flags = of_read_number(range, 1);
-               u32 slot = of_read_number(range + 1, 1);
-               u64 cpuaddr = of_read_number(range + na, pna);
+       for_each_of_range(&parser, &range) {
                unsigned long rtype;
+               u32 slot = upper_32_bits(range.bus_addr);
 
-               if (DT_FLAGS_TO_TYPE(flags) == DT_TYPE_IO)
+               if (DT_FLAGS_TO_TYPE(range.flags) == DT_TYPE_IO)
                        rtype = IORESOURCE_IO;
-               else if (DT_FLAGS_TO_TYPE(flags) == DT_TYPE_MEM32)
+               else if (DT_FLAGS_TO_TYPE(range.flags) == DT_TYPE_MEM32)
                        rtype = IORESOURCE_MEM;
                else
                        continue;
 
                if (slot == PCI_SLOT(devfn) && type == rtype) {
-                       *tgt = DT_CPUADDR_TO_TARGET(cpuaddr);
-                       *attr = DT_CPUADDR_TO_ATTR(cpuaddr);
+                       *tgt = DT_CPUADDR_TO_TARGET(range.cpu_addr);
+                       *attr = DT_CPUADDR_TO_ATTR(range.cpu_addr);
                        return 0;
                }
        }