Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dmaengine changes from Vinod Koul:
 "This brings for slave dmaengine:

   - Change dma notification flag to DMA_COMPLETE from DMA_SUCCESS as
     dmaengine can only transfer and not verify validaty of dma
     transfers

   - Bunch of fixes across drivers:

      - cppi41 driver fixes from Daniel

      - 8 channel freescale dma engine support and updated bindings from
        Hongbo

      - msx-dma fixes and cleanup by Markus

   - DMAengine updates from Dan:

      - Bartlomiej and Dan finalized a rework of the dma address unmap
        implementation.

      - In the course of testing 1/ a collection of enhancements to
        dmatest fell out.  Notably basic performance statistics, and
        fixed / enhanced test control through new module parameters
        'run', 'wait', 'noverify', and 'verbose'.  Thanks to Andriy and
        Linus [Walleij] for their review.

      - Testing the raid related corner cases of 1/ triggered bugs in
        the recently added 16-source operation support in the ioatdma
        driver.

      - Some minor fixes / cleanups to mv_xor and ioatdma"

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (99 commits)
  dma: mv_xor: Fix mis-usage of mmio 'base' and 'high_base' registers
  dma: mv_xor: Remove unneeded NULL address check
  ioat: fix ioat3_irq_reinit
  ioat: kill msix_single_vector support
  raid6test: add new corner case for ioatdma driver
  ioatdma: clean up sed pool kmem_cache
  ioatdma: fix selection of 16 vs 8 source path
  ioatdma: fix sed pool selection
  ioatdma: Fix bug in selftest after removal of DMA_MEMSET.
  dmatest: verbose mode
  dmatest: convert to dmaengine_unmap_data
  dmatest: add a 'wait' parameter
  dmatest: add basic performance metrics
  dmatest: add support for skipping verification and random data setup
  dmatest: use pseudo random numbers
  dmatest: support xor-only, or pq-only channels in tests
  dmatest: restore ability to start test at module load and init
  dmatest: cleanup redundant "dmatest: " prefixes
  dmatest: replace stored results mechanism, with uniform messages
  Revert "dmatest: append verify result to results"
  ...

1 files changed, 16 insertions, 16 deletions

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index df8b10fd1726..cdf0483b8f2d 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -2268,6 +2268,8 @@ static void pl330_tasklet(unsigned long data)
                         list_move_tail(&desc->node, &pch->dmac->desc_pool);
                 }
 
+                dma_descriptor_unmap(&desc->txd);
+
                 if (callback) {
                         spin_unlock_irqrestore(&pch->lock, flags);
                         callback(callback_param);
@@ -2314,7 +2316,7 @@ bool pl330_filter(struct dma_chan *chan, void *param)
                 return false;
 
         peri_id = chan->private;
-        return *peri_id == (unsigned)param;
+        return *peri_id == (unsigned long)param;
 }
 EXPORT_SYMBOL(pl330_filter);
 
@@ -2926,16 +2928,23 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
 
         amba_set_drvdata(adev, pdmac);
 
-        irq = adev->irq[0];
-        ret = request_irq(irq, pl330_irq_handler, 0,
-                        dev_name(&adev->dev), pi);
-        if (ret)
-                return ret;
+        for (i = 0; i < AMBA_NR_IRQS; i++) {
+                irq = adev->irq[i];
+                if (irq) {
+                        ret = devm_request_irq(&adev->dev, irq,
+                                               pl330_irq_handler, 0,
+                                               dev_name(&adev->dev), pi);
+                        if (ret)
+                                return ret;
+                } else {
+                        break;
+                }
+        }
 
         pi->pcfg.periph_id = adev->periphid;
         ret = pl330_add(pi);
         if (ret)
-                goto probe_err1;
+                return ret;
 
         INIT_LIST_HEAD(&pdmac->desc_pool);
         spin_lock_init(&pdmac->pool_lock);
@@ -3033,8 +3042,6 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
 
         return 0;
 probe_err3:
-        amba_set_drvdata(adev, NULL);
-
         /* Idle the DMAC */
         list_for_each_entry_safe(pch, _p, &pdmac->ddma.channels,
                         chan.device_node) {
@@ -3048,8 +3055,6 @@ probe_err3:
         }
 probe_err2:
         pl330_del(pi);
-probe_err1:
-        free_irq(irq, pi);
 
         return ret;
 }
@@ -3059,7 +3064,6 @@ static int pl330_remove(struct amba_device *adev)
         struct dma_pl330_dmac *pdmac = amba_get_drvdata(adev);
         struct dma_pl330_chan *pch, *_p;
         struct pl330_info *pi;
-        int irq;
 
         if (!pdmac)
                 return 0;
@@ -3068,7 +3072,6 @@ static int pl330_remove(struct amba_device *adev)
                 of_dma_controller_free(adev->dev.of_node);
 
         dma_async_device_unregister(&pdmac->ddma);
-        amba_set_drvdata(adev, NULL);
 
         /* Idle the DMAC */
         list_for_each_entry_safe(pch, _p, &pdmac->ddma.channels,
@@ -3086,9 +3089,6 @@ static int pl330_remove(struct amba_device *adev)
 
         pl330_del(pi);
 
-        irq = adev->irq[0];
-        free_irq(irq, pi);
-
         return 0;
 }