Merge tag 'of_pci-3.11' of git://git.infradead.org/users/jcooper/linux into next/cleanup

From Jason Cooper, of/pci changes for v3.11.

The patches had Reviewed-by: from Rob Herring on the lists, but seems to
have been missed from the commit messages. These will be required as a base
for some of the other functionality in this merge window, so taking it through
arm-soc.

Signed-off-by: Olof Johansson <olof@lixom.net>

* tag 'of_pci-3.11' of git://git.infradead.org/users/jcooper/linux:
  of/pci: Add of_pci_parse_bus_range() function
  of/pci: Add of_pci_get_devfn() function
  of/pci: Provide support for parsing PCI DT ranges property

2 files changed, 121 insertions, 5 deletions

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 04da786c84d2..fdd0636a987d 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -227,6 +227,73 @@ int of_pci_address_to_resource(struct device_node *dev, int bar,
         return __of_address_to_resource(dev, addrp, size, flags, NULL, r);
 }
 EXPORT_SYMBOL_GPL(of_pci_address_to_resource);
+
+int of_pci_range_parser_init(struct of_pci_range_parser *parser,
+                                struct device_node *node)
+{
+        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->range = of_get_property(node, "ranges", &rlen);
+        if (parser->range == NULL)
+                return -ENOENT;
+
+        parser->end = parser->range + rlen / sizeof(__be32);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(of_pci_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 = parser->range[0];
+        range->flags = of_bus_pci_get_flags(parser->range);
+        range->pci_addr = of_read_number(parser->range + 1, ns);
+        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, pci_space;
+                u64 pci_addr, cpu_addr, size;
+
+                pci_space = be32_to_cpup(parser->range);
+                flags = of_bus_pci_get_flags(parser->range);
+                pci_addr = of_read_number(parser->range + 1, ns);
+                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);
+
 #endif /* CONFIG_PCI */
 
 /*
diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c
index 13e37e2d8ec1..42c687a820ac 100644
--- a/drivers/of/of_pci.c
+++ b/drivers/of/of_pci.c
@@ -5,14 +5,15 @@
 #include <asm/prom.h>
 
 static inline int __of_pci_pci_compare(struct device_node *node,
-                                       unsigned int devfn)
+                                       unsigned int data)
 {
-        unsigned int size;
-        const __be32 *reg = of_get_property(node, "reg", &size);
+        int devfn;
 
-        if (!reg || size < 5 * sizeof(__be32))
+        devfn = of_pci_get_devfn(node);
+        if (devfn < 0)
                 return 0;
-        return ((be32_to_cpup(&reg[0]) >> 8) & 0xff) == devfn;
+
+        return devfn == data;
 }
 
 struct device_node *of_pci_find_child_device(struct device_node *parent,
@@ -40,3 +41,51 @@ struct device_node *of_pci_find_child_device(struct device_node *parent,
         return NULL;
 }
 EXPORT_SYMBOL_GPL(of_pci_find_child_device);
+
+/**
+ * of_pci_get_devfn() - Get device and function numbers for a device node
+ * @np: device node
+ *
+ * Parses a standard 5-cell PCI resource and returns an 8-bit value that can
+ * be passed to the PCI_SLOT() and PCI_FUNC() macros to extract the device
+ * and function numbers respectively. On error a negative error code is
+ * returned.
+ */
+int of_pci_get_devfn(struct device_node *np)
+{
+        unsigned int size;
+        const __be32 *reg;
+
+        reg = of_get_property(np, "reg", &size);
+
+        if (!reg || size < 5 * sizeof(__be32))
+                return -EINVAL;
+
+        return (be32_to_cpup(reg) >> 8) & 0xff;
+}
+EXPORT_SYMBOL_GPL(of_pci_get_devfn);
+
+/**
+ * of_pci_parse_bus_range() - parse the bus-range property of a PCI device
+ * @node: device node
+ * @res: address to a struct resource to return the bus-range
+ *
+ * Returns 0 on success or a negative error-code on failure.
+ */
+int of_pci_parse_bus_range(struct device_node *node, struct resource *res)
+{
+        const __be32 *values;
+        int len;
+
+        values = of_get_property(node, "bus-range", &len);
+        if (!values || len < sizeof(*values) * 2)
+                return -EINVAL;
+
+        res->name = node->name;
+        res->start = be32_to_cpup(values++);
+        res->end = be32_to_cpup(values);
+        res->flags = IORESOURCE_BUS;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(of_pci_parse_bus_range);