dmaengine: rcar-dmac: Allocate hardware descriptors with DMAC device

When wired to an IOMMU to access data, the DMAC accesses the hardware
descriptors through the IOMMU as well. We're using the DMA mapping API
to allocate the descriptors, but with a NULL device at the moment, which
prevents IOMMU mappings from being created. Fix this by passing the DMAC
device instead.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c
index 2eb65e1bf938b92235d62e45efc05feaf8c8e074..bb93038c48b9aab3f37cc3f16831f3fe68e44652 100644 (file)
--- a/drivers/dma/sh/rcar-dmac.c
+++ b/drivers/dma/sh/rcar-dmac.c
@@ -655,8 +655,8 @@ static void rcar_dmac_realloc_hwdesc(struct rcar_dmac_chan *chan,
                return;
 
        if (desc->hwdescs.mem) {
-               dma_free_coherent(NULL, desc->hwdescs.size, desc->hwdescs.mem,
-                                  desc->hwdescs.dma);
+               dma_free_coherent(chan->chan.device->dev, desc->hwdescs.size,
+                                 desc->hwdescs.mem, desc->hwdescs.dma);
                desc->hwdescs.mem = NULL;
                desc->hwdescs.size = 0;
        }
@@ -664,8 +664,8 @@ static void rcar_dmac_realloc_hwdesc(struct rcar_dmac_chan *chan,
        if (!size)
                return;
 
-       desc->hwdescs.mem = dma_alloc_coherent(NULL, size, &desc->hwdescs.dma,
-                                              GFP_NOWAIT);
+       desc->hwdescs.mem = dma_alloc_coherent(chan->chan.device->dev, size,
+                                              &desc->hwdescs.dma, GFP_NOWAIT);
        if (!desc->hwdescs.mem)
                return;