of/address: Move range parser code out of CONFIG_PCI

In preparation to make the range parsing code work for non-PCI buses,
move the parsing functions out from the CONFIG_PCI #ifdef.

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

diff --git a/drivers/of/address.c b/drivers/of/address.c
index e8a39c3ec4d4f75e49f73f18e2e71852c02433c1..846045a483953d208ce04e717a61739e5a5c8eef 100644 (file)
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -100,6 +100,28 @@ static unsigned int of_bus_default_get_flags(const __be32 *addr)
        return IORESOURCE_MEM;
 }
 
+static unsigned int of_bus_pci_get_flags(const __be32 *addr)
+{
+       unsigned int flags = 0;
+       u32 w = be32_to_cpup(addr);
+
+       if (!IS_ENABLED(CONFIG_PCI))
+               return 0;
+
+       switch((w >> 24) & 0x03) {
+       case 0x01:
+               flags |= IORESOURCE_IO;
+               break;
+       case 0x02: /* 32 bits */
+       case 0x03: /* 64 bits */
+               flags |= IORESOURCE_MEM;
+               break;
+       }
+       if (w & 0x40000000)
+               flags |= IORESOURCE_PREFETCH;
+       return flags;
+}
+
 #ifdef CONFIG_PCI
 /*
  * PCI bus specific translator
@@ -125,25 +147,6 @@ static void of_bus_pci_count_cells(struct device_node *np,
                *sizec = 2;
 }
 
-static unsigned int of_bus_pci_get_flags(const __be32 *addr)
-{
-       unsigned int flags = 0;
-       u32 w = be32_to_cpup(addr);
-
-       switch((w >> 24) & 0x03) {
-       case 0x01:
-               flags |= IORESOURCE_IO;
-               break;
-       case 0x02: /* 32 bits */
-       case 0x03: /* 64 bits */
-               flags |= IORESOURCE_MEM;
-               break;
-       }
-       if (w & 0x40000000)
-               flags |= IORESOURCE_PREFETCH;
-       return flags;
-}
-
 static u64 of_bus_pci_map(__be32 *addr, const __be32 *range, int na, int ns,
                int pna)
 {
@@ -234,93 +237,6 @@ int of_pci_address_to_resource(struct device_node *dev, int bar,
 }
 EXPORT_SYMBOL_GPL(of_pci_address_to_resource);
 
-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->dma = !strcmp(name, "dma-ranges");
-
-       parser->range = of_get_property(node, name, &rlen);
-       if (parser->range == NULL)
-               return -ENOENT;
-
-       parser->end = parser->range + rlen / sizeof(__be32);
-
-       return 0;
-}
-
-int of_pci_range_parser_init(struct of_pci_range_parser *parser,
-                               struct device_node *node)
-{
-       return parser_init(parser, node, "ranges");
-}
-EXPORT_SYMBOL_GPL(of_pci_range_parser_init);
-
-int of_pci_dma_range_parser_init(struct of_pci_range_parser *parser,
-                               struct device_node *node)
-{
-       return parser_init(parser, node, "dma-ranges");
-}
-EXPORT_SYMBOL_GPL(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;
-
-       if (!range)
-               return NULL;
-
-       if (!parser->range || parser->range + parser->np > parser->end)
-               return NULL;
-
-       range->pci_space = be32_to_cpup(parser->range);
-       range->flags = of_bus_pci_get_flags(parser->range);
-       range->pci_addr = of_read_number(parser->range + 1, ns);
-       if (parser->dma)
-               range->cpu_addr = of_translate_dma_address(parser->node,
-                               parser->range + na);
-       else
-               range->cpu_addr = of_translate_address(parser->node,
-                               parser->range + na);
-       range->size = of_read_number(parser->range + parser->pna + na, ns);
-
-       parser->range += parser->np;
-
-       /* Now consume following elements while they are contiguous */
-       while (parser->range + parser->np <= parser->end) {
-               u32 flags;
-               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->dma)
-                       cpu_addr = of_translate_dma_address(parser->node,
-                                       parser->range + na);
-               else
-                       cpu_addr = of_translate_address(parser->node,
-                                       parser->range + na);
-               size = of_read_number(parser->range + parser->pna + na, ns);
-
-               if (flags != range->flags)
-                       break;
-               if (pci_addr != range->pci_addr + range->size ||
-                   cpu_addr != range->cpu_addr + range->size)
-                       break;
-
-               range->size += size;
-               parser->range += parser->np;
-       }
-
-       return range;
-}
-EXPORT_SYMBOL_GPL(of_pci_range_parser_one);
-
 /*
  * of_pci_range_to_resource - Create a resource from an of_pci_range
  * @range:     the PCI range that describes the resource
@@ -775,6 +691,93 @@ const __be32 *of_get_address(struct device_node *dev, int index, u64 *size,
 }
 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->dma = !strcmp(name, "dma-ranges");
+
+       parser->range = of_get_property(node, name, &rlen);
+       if (parser->range == NULL)
+               return -ENOENT;
+
+       parser->end = parser->range + rlen / sizeof(__be32);
+
+       return 0;
+}
+
+int of_pci_range_parser_init(struct of_pci_range_parser *parser,
+                               struct device_node *node)
+{
+       return parser_init(parser, node, "ranges");
+}
+EXPORT_SYMBOL_GPL(of_pci_range_parser_init);
+
+int of_pci_dma_range_parser_init(struct of_pci_range_parser *parser,
+                               struct device_node *node)
+{
+       return parser_init(parser, node, "dma-ranges");
+}
+EXPORT_SYMBOL_GPL(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;
+
+       if (!range)
+               return NULL;
+
+       if (!parser->range || parser->range + parser->np > parser->end)
+               return NULL;
+
+       range->pci_space = be32_to_cpup(parser->range);
+       range->flags = of_bus_pci_get_flags(parser->range);
+       range->pci_addr = of_read_number(parser->range + 1, ns);
+       if (parser->dma)
+               range->cpu_addr = of_translate_dma_address(parser->node,
+                               parser->range + na);
+       else
+               range->cpu_addr = of_translate_address(parser->node,
+                               parser->range + na);
+       range->size = of_read_number(parser->range + parser->pna + na, ns);
+
+       parser->range += parser->np;
+
+       /* Now consume following elements while they are contiguous */
+       while (parser->range + parser->np <= parser->end) {
+               u32 flags;
+               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->dma)
+                       cpu_addr = of_translate_dma_address(parser->node,
+                                       parser->range + na);
+               else
+                       cpu_addr = of_translate_address(parser->node,
+                                       parser->range + na);
+               size = of_read_number(parser->range + parser->pna + na, ns);
+
+               if (flags != range->flags)
+                       break;
+               if (pci_addr != range->pci_addr + range->size ||
+                   cpu_addr != range->cpu_addr + range->size)
+                       break;
+
+               range->size += size;
+               parser->range += parser->np;
+       }
+
+       return range;
+}
+EXPORT_SYMBOL_GPL(of_pci_range_parser_one);
+
 static u64 of_translate_ioport(struct device_node *dev, const __be32 *in_addr,
                        u64 size)
 {