@@ -25,6 +25,7 @@
#include <linux/interrupt.h>
#include <linux/list.h>
#include <linux/module.h>
+#include <linux/of_address.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/io.h>
@@ -37,6 +38,12 @@
#define BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED 14
#define BCM2835_DMA_CHAN_NAME_SIZE 8
+struct bcm2835_bus_dma_region {
+ phys_addr_t cpu_start;
+ dma_addr_t dma_start;
+ u64 size;
+};
+
/**
* struct bcm2835_dmadev - BCM2835 DMA controller
* @ddev: DMA device
@@ -48,6 +55,8 @@ struct bcm2835_dmadev {
struct dma_device ddev;
void __iomem *base;
dma_addr_t zero_page;
+ bool ranges_initialised;
+ struct bcm2835_bus_dma_region *ranges_map;
};
struct bcm2835_dma_cb {
@@ -71,6 +80,7 @@ struct bcm2835_dma_chan_map {
phys_addr_t slave_addr;
unsigned int xfer_size;
+ bool ranges;
};
struct bcm2835_chan {
@@ -279,6 +289,114 @@ static inline bool need_dst_incr(enum dma_transfer_direction direction)
return false;
};
+static int bcm2835_dma_init_ranges(struct dma_chan *chan)
+{
+ struct bcm2835_dmadev *od = to_bcm2835_dma_dev(chan->device);
+ struct device *dev = chan->device->dev;
+ struct device_node *node = of_node_get(dev->of_node);
+ const __be32 *ranges = NULL;
+ bool found_ranges = false;
+ struct of_range_parser parser;
+ struct of_range range;
+ struct bcm2835_bus_dma_region *r;
+ int len, num_ranges = 0;
+ int ret = 0;
+
+ while (node) {
+ ranges = of_get_property(node, "ranges", &len);
+
+ /* Ignore empty ranges, they imply no translation required */
+ if (ranges && len > 0)
+ break;
+
+ /* Once we find 'dma-ranges', then a missing one is an error */
+ if (found_ranges && !ranges) {
+ ret = -ENODEV;
+ goto out;
+ }
+ found_ranges = true;
+
+ node = of_get_next_parent(node);
+ }
+
+ if (!node || !ranges) {
+ pr_debug("no ranges found for node(%pOF)\n", dev->of_node);
+ ret = -ENODEV;
+ goto out;
+ }
+
+ of_pci_range_parser_init(&parser, node);
+ for_each_of_range(&parser, &range) {
+ 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;
+ }
+ num_ranges++;
+ }
+
+ if (!num_ranges) {
+ ret = -EINVAL;
+ goto out;
+ }
+
+ 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,
+ * returning an error if we don't find any parsable ranges.
+ */
+ od->ranges_map = r;
+ of_pci_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 (range.cpu_addr == OF_BAD_ADDR)
+ continue;
+ r->cpu_start = range.cpu_addr;
+ r->dma_start = range.bus_addr;
+ r->size = range.size;
+ r++;
+ }
+out:
+ of_node_put(node);
+ return ret;
+}
+
+static dma_addr_t bcm2835_translate_phys_to_dma(struct bcm2835_dmadev *od,
+ phys_addr_t paddr)
+{
+ const struct bcm2835_bus_dma_region *m;
+
+ for (m = od->ranges_map; m && m->size; m++) {
+ u64 offset = paddr - m->cpu_start;
+
+ if (paddr >= m->cpu_start && offset < m->size)
+ return m->dma_start + offset;
+ }
+
+ /* make sure dma_capable fails when no translation is available */
+ return DMA_MAPPING_ERROR;
+}
+
+static dma_addr_t
+bcm2835_dma_map_using_range(struct dma_chan *chan, phys_addr_t phys_addr,
+ size_t size, enum dma_data_direction dir)
+{
+ struct bcm2835_dmadev *od = to_bcm2835_dma_dev(chan->device);
+
+ if (!od->ranges_initialised) {
+ bcm2835_dma_init_ranges(chan);
+ od->ranges_initialised = true;
+ }
+
+ return bcm2835_translate_phys_to_dma(od, phys_addr);
+}
+
static int bcm2835_dma_map_slave_addr(struct dma_chan *chan,
phys_addr_t dev_addr,
size_t dev_size,
@@ -307,8 +425,11 @@ static int bcm2835_dma_map_slave_addr(struct dma_chan *chan,
dev_dir == map->dir)
return 0;
- /* Remove old mapping if present. */
- if (map->xfer_size) {
+ /*
+ * Remove old mapping if present and we haven't used our own "ranges"
+ * mapping (which has no unmap)
+ */
+ if (map->xfer_size && !map->ranges) {
dev_dbg(chan->device->dev, "chan: unmap %zx@%pap to %pad dir: %s\n",
dev_size, &dev_addr, &map->addr,
dev_dir == DMA_TO_DEVICE ? "DMA_TO_DEVICE" : "DMA_FROM_DEVICE");
@@ -322,9 +443,17 @@ static int bcm2835_dma_map_slave_addr(struct dma_chan *chan,
dev_dir, 0);
if (dma_mapping_error(chan->device->dev, map->addr)) {
- dev_err(chan->device->dev, "chan: failed to map %zx@%pap",
- dev_size, &dev_addr);
- return -EIO;
+ map->addr = bcm2835_dma_map_using_range(chan, dev_addr, dev_size,
+ dev_dir);
+ if (dma_mapping_error(chan->device->dev, map->addr)) {
+ dev_err(chan->device->dev, "chan: failed to map %zx@%pap",
+ dev_size, &dev_addr);
+
+ return -EIO;
+ }
+ map->ranges = true;
+ } else {
+ map->ranges = false;
}
dev_dbg(chan->device->dev, "chan: map %zx@%pap to %pad dir: %s\n",
We have a historical error in the DT files that don't define the dma-ranges fully, and DMA users have been passing in DMA addresses instead of CPU physical addresses. As DT is ABI, we have to be able to work with old DT but new kernel, which means handling this missing dma-range mapping somehow. The "ranges" property has always been defined correctly, so abuse that in the event that dma-ranges are missing. There appears to be no easy route to access "ranges", so duplicate the functions for handling "dma-ranges" here to keep the hack contained. Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> --- drivers/dma/bcm2835-dma.c | 139 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 134 insertions(+), 5 deletions(-)