mm: concentrate modification of totalram_pages into the mm core

[firefly-linux-kernel-4.4.55.git] / drivers / of / of_pci.c

diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c
index 13e37e2d8ec16ba8b4179198cfbf759015628da9..42c687a820ac3bedcb0eae90b64e8c4911509d09 100644 (file)
--- 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);