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

Pull dmaengine updates from Vinod Koul:
 "Main features this time are:

   - BAM v1.3.0 support form qcom bam dma
   - support for Allwinner sun8i dma
   - atmels eXtended DMA Controller driver
   - chancnt cleanup by Maxime
   - fixes spread over drivers"

* 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (56 commits)
  dmaenegine: Delete a check before free_percpu()
  dmaengine: ioatdma: fix dma mapping errors
  dma: cppi41: add a delay while setting the TD bit
  dma: cppi41: wait longer for the HW to return the descriptor
  dmaengine: fsl-edma: fixup reg offset and hw S/G support in big-endian model
  dmaengine: fsl-edma: fix calculation of remaining bytes
  drivers/dma/pch_dma: declare pch_dma_id_table as static
  dmaengine: ste_dma40: fix error return code
  dma: imx-sdma: clarify about firmware not found error
  Documentation: devicetree: Fix Xilinx VDMA specification
  dmaengine: pl330: update author info
  dmaengine: clarify the issue_pending expectations
  dmaengine: at_xdmac: Add DMA_PRIVATE
  ARM: dts: at_xdmac: fix bad value of dma-cells in documentation
  dmaengine: at_xdmac: fix missing spin_unlock
  dmaengine: at_xdmac: fix a bug in transfer residue computation
  dmaengine: at_xdmac: fix software lockup at_xdmac_tx_status()
  dmaengine: at_xdmac: remove chancnt affectation
  dmaengine: at_xdmac: prefer usage of readl/writel_relaxed
  dmaengine: xdmac: fix print warning on dma_addr_t variable
  ...

1 files changed, 9 insertions, 4 deletions

diff --git a/drivers/dma/xilinx/xilinx_vdma.c b/drivers/dma/xilinx/xilinx_vdma.c
index a6e64767186e..4a3a8f3137b3 100644
--- a/drivers/dma/xilinx/xilinx_vdma.c
+++ b/drivers/dma/xilinx/xilinx_vdma.c
@@ -942,6 +942,9 @@ xilinx_vdma_dma_prep_interleaved(struct dma_chan *dchan,
         if (!xt->numf || !xt->sgl[0].size)
                 return NULL;
 
+        if (xt->frame_size != 1)
+                return NULL;
+
         /* Allocate a transaction descriptor. */
         desc = xilinx_vdma_alloc_tx_descriptor(chan);
         if (!desc)
@@ -960,7 +963,7 @@ xilinx_vdma_dma_prep_interleaved(struct dma_chan *dchan,
         hw = &segment->hw;
         hw->vsize = xt->numf;
         hw->hsize = xt->sgl[0].size;
-        hw->stride = xt->sgl[0].icg <<
+        hw->stride = (xt->sgl[0].icg + xt->sgl[0].size) <<
                         XILINX_VDMA_FRMDLY_STRIDE_STRIDE_SHIFT;
         hw->stride |= chan->config.frm_dly <<
                         XILINX_VDMA_FRMDLY_STRIDE_FRMDLY_SHIFT;
@@ -971,9 +974,11 @@ xilinx_vdma_dma_prep_interleaved(struct dma_chan *dchan,
                 hw->buf_addr = xt->src_start;
 
         /* Link the previous next descriptor to current */
-        prev = list_last_entry(&desc->segments,
-                                struct xilinx_vdma_tx_segment, node);
-        prev->hw.next_desc = segment->phys;
+        if (!list_empty(&desc->segments)) {
+                prev = list_last_entry(&desc->segments,
+                                       struct xilinx_vdma_tx_segment, node);
+                prev->hw.next_desc = segment->phys;
+        }
 
         /* Insert the segment into the descriptor segments list. */
         list_add_tail(&segment->node, &desc->segments);