dmaengine: xilinx_dma: in axidma slave_sg and dma_cyclic mode align split descriptors

Whenever a single or cyclic transaction is prepared, the driver
could eventually split it over several SG descriptors in order
to deal with the HW maximum transfer length.

This could end up in DMA operations starting from a misaligned
address. This seems fatal for the HW if DRE (Data Realignment Engine)
is not enabled.

This patch eventually adjusts the transfer size in order to make sure
all operations start from an aligned address.

Cc: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
Signed-off-by: Andrea Merello <andrea.merello@gmail.com>
Reviewed-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c
index fd9f37bafab0f74bee62f6a6ad381a6fc4389e8f..93435f7002ab67f36d0fe20dde16908957c5a30d 100644 (file)
--- a/drivers/dma/xilinx/xilinx_dma.c
+++ b/drivers/dma/xilinx/xilinx_dma.c
@@ -977,6 +977,15 @@ static int xilinx_dma_calc_copysize(struct xilinx_dma_chan *chan,
        copy = min_t(size_t, size - done,
                     chan->xdev->max_buffer_len);
 
+       if ((copy + done < size) &&
+           chan->xdev->common.copy_align) {
+               /*
+                * If this is not the last descriptor, make sure
+                * the next one will be properly aligned
+                */
+               copy = rounddown(copy,
+                                (1 << chan->xdev->common.copy_align));
+       }
        return copy;
 }