Merge tag 'linux-kselftest-next-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kerne...

[linux-2.6-microblaze.git] / drivers / of / address.c

diff --git a/drivers/of/address.c b/drivers/of/address.c
index da4f734..eb9ab4f 100644 (file)
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -13,6 +13,7 @@
 #include <linux/sizes.h>
 #include <linux/slab.h>
 #include <linux/string.h>
+#include <linux/dma-direct.h> /* for bus_dma_region */
 
 #include "of_private.h"
 
@@ -937,33 +938,33 @@ void __iomem *of_io_request_and_map(struct device_node *np, int index,
 }
 EXPORT_SYMBOL(of_io_request_and_map);
 
+#ifdef CONFIG_HAS_DMA
 /**
- * of_dma_get_range - Get DMA range info
+ * of_dma_get_range - Get DMA range info and put it into a map array
  * @np:                device node to get DMA range info
- * @dma_addr:  pointer to store initial DMA address of DMA range
- * @paddr:     pointer to store initial CPU address of DMA range
- * @size:      pointer to store size of DMA range
+ * @map:       dma range structure to return
  *
  * Look in bottom up direction for the first "dma-ranges" property
- * and parse it.
- *  dma-ranges format:
+ * and parse it.  Put the information into a DMA offset map array.
+ *
+ * dma-ranges format:
  *     DMA addr (dma_addr)     : naddr cells
  *     CPU addr (phys_addr_t)  : pna cells
  *     size                    : nsize cells
  *
- * It returns -ENODEV if "dma-ranges" property was not found
- * for this device in DT.
+ * It returns -ENODEV if "dma-ranges" property was not found for this
+ * device in the DT.
  */
-int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *size)
+int of_dma_get_range(struct device_node *np, const struct bus_dma_region **map)
 {
        struct device_node *node = of_node_get(np);
        const __be32 *ranges = NULL;
-       int len;
-       int ret = 0;
        bool found_dma_ranges = false;
        struct of_range_parser parser;
        struct of_range range;
-       u64 dma_start = U64_MAX, dma_end = 0, dma_offset = 0;
+       struct bus_dma_region *r;
+       int len, num_ranges = 0;
+       int ret = 0;
 
        while (node) {
                ranges = of_get_property(node, "dma-ranges", &len);
@@ -989,49 +990,39 @@ int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *siz
        }
 
        of_dma_range_parser_init(&parser, node);
+       for_each_of_range(&parser, &range)
+               num_ranges++;
+
+       r = kcalloc(num_ranges + 1, sizeof(*r), GFP_KERNEL);
+       if (!r) {
+               ret = -ENOMEM;
+               goto out;
+       }
 
+       /*
+        * Record all info in the generic DMA ranges array for struct device.
+        */
+       *map = r;
+       of_dma_range_parser_init(&parser, node);
        for_each_of_range(&parser, &range) {
                pr_debug("dma_addr(%llx) cpu_addr(%llx) size(%llx)\n",
                         range.bus_addr, range.cpu_addr, range.size);
-
-               if (dma_offset && range.cpu_addr - range.bus_addr != dma_offset) {
-                       pr_warn("Can't handle multiple dma-ranges with different offsets on node(%pOF)\n", node);
-                       /* Don't error out as we'd break some existing DTs */
-                       continue;
-               }
                if (range.cpu_addr == OF_BAD_ADDR) {
                        pr_err("translation of DMA address(%llx) to CPU address failed node(%pOF)\n",
                               range.bus_addr, node);
                        continue;
                }
-               dma_offset = range.cpu_addr - range.bus_addr;
-
-               /* Take lower and upper limits */
-               if (range.bus_addr < dma_start)
-                       dma_start = range.bus_addr;
-               if (range.bus_addr + range.size > dma_end)
-                       dma_end = range.bus_addr + range.size;
-       }
-
-       if (dma_start >= dma_end) {
-               ret = -EINVAL;
-               pr_debug("Invalid DMA ranges configuration on node(%pOF)\n",
-                        node);
-               goto out;
+               r->cpu_start = range.cpu_addr;
+               r->dma_start = range.bus_addr;
+               r->size = range.size;
+               r->offset = range.cpu_addr - range.bus_addr;
+               r++;
        }
-
-       *dma_addr = dma_start;
-       *size = dma_end - dma_start;
-       *paddr = dma_start + dma_offset;
-
-       pr_debug("final: dma_addr(%llx) cpu_addr(%llx) size(%llx)\n",
-                *dma_addr, *paddr, *size);
-
 out:
        of_node_put(node);
-
        return ret;
 }
+#endif /* CONFIG_HAS_DMA */
 
 /**
  * of_dma_is_coherent - Check if device is coherent