of/address: Rework of_pci_range parsing for non-PCI buses

The only PCI specific part of of_pci_range_parser_one() is the handling
of the 3rd address cell. Rework it to work on regular 1 and 2 cell
addresses.

Use defines and a union to avoid a treewide renaming of the parsing
helpers and struct.

Signed-off-by: Rob Herring <robh@kernel.org>

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 5d608d7c10d653dac94ed244f12545a2f9783443..6d33f849f114407f5ecbc4bc12dd5f097f31ce8d 100644 (file)
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -694,12 +694,12 @@ EXPORT_SYMBOL(of_get_address);
 static int parser_init(struct of_pci_range_parser *parser,
                        struct device_node *node, const char *name)
 {
-       const int na = 3, ns = 2;
        int rlen;
 
        parser->node = node;
        parser->pna = of_n_addr_cells(node);
-       parser->np = parser->pna + na + ns;
+       parser->na = of_bus_n_addr_cells(node);
+       parser->ns = of_bus_n_size_cells(node);
        parser->dma = !strcmp(name, "dma-ranges");
 
        parser->range = of_get_property(node, name, &rlen);
@@ -724,20 +724,28 @@ int of_pci_dma_range_parser_init(struct of_pci_range_parser *parser,
        return parser_init(parser, node, "dma-ranges");
 }
 EXPORT_SYMBOL_GPL(of_pci_dma_range_parser_init);
+#define of_dma_range_parser_init of_pci_dma_range_parser_init
 
 struct of_pci_range *of_pci_range_parser_one(struct of_pci_range_parser *parser,
                                                struct of_pci_range *range)
 {
-       const int na = 3, ns = 2;
+       int na = parser->na;
+       int ns = parser->ns;
+       int np = parser->pna + na + ns;
 
        if (!range)
                return NULL;
 
-       if (!parser->range || parser->range + parser->np > parser->end)
+       if (!parser->range || parser->range + np > parser->end)
                return NULL;
 
-       range->flags = of_bus_pci_get_flags(parser->range);
-       range->pci_addr = of_read_number(parser->range + 1, ns);
+       if (parser->na == 3)
+               range->flags = of_bus_pci_get_flags(parser->range);
+       else
+               range->flags = 0;
+
+       range->pci_addr = of_read_number(parser->range, na);
+
        if (parser->dma)
                range->cpu_addr = of_translate_dma_address(parser->node,
                                parser->range + na);
@@ -746,15 +754,16 @@ struct of_pci_range *of_pci_range_parser_one(struct of_pci_range_parser *parser,
                                parser->range + na);
        range->size = of_read_number(parser->range + parser->pna + na, ns);
 
-       parser->range += parser->np;
+       parser->range += np;
 
        /* Now consume following elements while they are contiguous */
-       while (parser->range + parser->np <= parser->end) {
-               u32 flags;
+       while (parser->range + np <= parser->end) {
+               u32 flags = 0;
                u64 pci_addr, cpu_addr, size;
 
-               flags = of_bus_pci_get_flags(parser->range);
-               pci_addr = of_read_number(parser->range + 1, ns);
+               if (parser->na == 3)
+                       flags = of_bus_pci_get_flags(parser->range);
+               pci_addr = of_read_number(parser->range, na);
                if (parser->dma)
                        cpu_addr = of_translate_dma_address(parser->node,
                                        parser->range + na);
@@ -770,7 +779,7 @@ struct of_pci_range *of_pci_range_parser_one(struct of_pci_range_parser *parser,
                        break;
 
                range->size += size;
-               parser->range += parser->np;
+               parser->range += np;
        }
 
        return range;

diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index 8d12bf18e80baa1c5739bb4427313d2be2a0a76c..763022ed34564c41fe7652a7e707b0c082fda5bb 100644 (file)
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -10,20 +10,27 @@ struct of_pci_range_parser {
        struct device_node *node;
        const __be32 *range;
        const __be32 *end;
-       int np;
+       int na;
+       int ns;
        int pna;
        bool dma;
 };
+#define of_range_parser of_pci_range_parser
 
 struct of_pci_range {
-       u64 pci_addr;
+       union {
+               u64 pci_addr;
+               u64 bus_addr;
+       };
        u64 cpu_addr;
        u64 size;
        u32 flags;
 };
+#define of_range of_pci_range
 
 #define for_each_of_pci_range(parser, range) \
        for (; of_pci_range_parser_one(parser, range);)
+#define for_each_of_range for_each_of_pci_range
 
 /* Translate a DMA address from device space to CPU space */
 extern u64 of_translate_dma_address(struct device_node *dev,
@@ -142,4 +149,3 @@ static inline int of_pci_range_to_resource(struct of_pci_range *range,
 #endif /* CONFIG_OF_ADDRESS && CONFIG_PCI */
 
 #endif /* __OF_ADDRESS_H */
-