Merge tag 'dmaengine-4.14-rc1' of git://git.infradead.org/users/vkoul/slave-dma

Pull dmaengine updates from Vinod Koul:
 "This one features the usual updates to the drivers and one good part
  of removing DA_SG from core as it has no users.

  Summary:

   - Remove DMA_SG support as we have no users for this feature
   - New driver for Altera / Intel mSGDMA IP core
   - Support for memset in dmatest and qcom_hidma driver
   - Update for non cyclic mode in k3dma, bunch of update in bam_dma,
     bcm sba-raid
   - Constify device ids across drivers"

* tag 'dmaengine-4.14-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (52 commits)
  dmaengine: sun6i: support V3s SoC variant
  dmaengine: sun6i: make gate bit in sun8i's DMA engines a common quirk
  dmaengine: rcar-dmac: document R8A77970 bindings
  dmaengine: xilinx_dma: Fix error code format specifier
  dmaengine: altera: Use macros instead of structs to describe the registers
  dmaengine: ti-dma-crossbar: Fix dra7 reserve function
  dmaengine: pl330: constify amba_id
  dmaengine: pl08x: constify amba_id
  dmaengine: bcm-sba-raid: Remove redundant SBA_REQUEST_STATE_COMPLETED
  dmaengine: bcm-sba-raid: Explicitly ACK mailbox message after sending
  dmaengine: bcm-sba-raid: Add debugfs support
  dmaengine: bcm-sba-raid: Remove redundant SBA_REQUEST_STATE_RECEIVED
  dmaengine: bcm-sba-raid: Re-factor sba_process_deferred_requests()
  dmaengine: bcm-sba-raid: Pre-ack async tx descriptor
  dmaengine: bcm-sba-raid: Peek mbox when we have no free requests
  dmaengine: bcm-sba-raid: Alloc resources before registering DMA device
  dmaengine: bcm-sba-raid: Improve sba_issue_pending() run duration
  dmaengine: bcm-sba-raid: Increase number of free sba_request
  dmaengine: bcm-sba-raid: Allow arbitrary number free sba_request
  dmaengine: bcm-sba-raid: Remove reqs_free_count from sba_device
  ...

1 files changed, 4 insertions, 8 deletions

diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c
index 01e25c68dd5a..01d2a750a621 100644
--- a/drivers/dma/k3dma.c
+++ b/drivers/dma/k3dma.c
@@ -223,7 +223,6 @@ static irqreturn_t k3_dma_int_handler(int irq, void *dev_id)
                         if (c && (tc1 & BIT(i))) {
                                 spin_lock_irqsave(&c->vc.lock, flags);
                                 vchan_cookie_complete(&p->ds_run->vd);
-                                WARN_ON_ONCE(p->ds_done);
                                 p->ds_done = p->ds_run;
                                 p->ds_run = NULL;
                                 spin_unlock_irqrestore(&c->vc.lock, flags);
@@ -274,13 +273,14 @@ static int k3_dma_start_txd(struct k3_dma_chan *c)
                  */
                 list_del(&ds->vd.node);
 
-                WARN_ON_ONCE(c->phy->ds_run);
-                WARN_ON_ONCE(c->phy->ds_done);
                 c->phy->ds_run = ds;
+                c->phy->ds_done = NULL;
                 /* start dma */
                 k3_dma_set_desc(c->phy, &ds->desc_hw[0]);
                 return 0;
         }
+        c->phy->ds_run = NULL;
+        c->phy->ds_done = NULL;
         return -EAGAIN;
 }
 
@@ -722,11 +722,7 @@ static int k3_dma_terminate_all(struct dma_chan *chan)
                         k3_dma_free_desc(&p->ds_run->vd);
                         p->ds_run = NULL;
                 }
-                if (p->ds_done) {
-                        k3_dma_free_desc(&p->ds_done->vd);
-                        p->ds_done = NULL;
-                }
-
+                p->ds_done = NULL;
         }
         spin_unlock_irqrestore(&c->vc.lock, flags);
         vchan_dma_desc_free_list(&c->vc, &head);