dmaengine: zxdma: Fix data width bug

Align src and dst width to fix data alignment issue as
trailing single transaction that does not fill a full
burst require identical src/dst data width.
Burst length limitation can be addressed well too.

Signed-off-by: Jun Nie <jun.nie@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --git a/drivers/dma/zx296702_dma.c b/drivers/dma/zx296702_dma.c
index 0d55c8fc49513d242bfdd47a3d6c976b06399ed7..103691c616134bf103ef11bebed64338b77765a2 100644 (file)
--- a/drivers/dma/zx296702_dma.c
+++ b/drivers/dma/zx296702_dma.c
@@ -476,15 +476,16 @@ static int zx_pre_config(struct zx_dma_chan *c, enum dma_transfer_direction dir)
                c->dev_addr = cfg->dst_addr;
                /* dst len is calculated from src width, len and dst width.
                 * We need make sure dst len not exceed MAX LEN.
+                * Trailing single transaction that does not fill a full
+                * burst also require identical src/dst data width.
                 */
                dst_width = zx_dma_burst_width(cfg->dst_addr_width);
-               maxburst = cfg->dst_maxburst * cfg->dst_addr_width
-                               / DMA_SLAVE_BUSWIDTH_8_BYTES;
+               maxburst = cfg->dst_maxburst;
                maxburst = maxburst < ZX_MAX_BURST_LEN ?
                                maxburst : ZX_MAX_BURST_LEN;
                c->ccfg = ZX_DST_FIFO_MODE | ZX_CH_ENABLE
                        | ZX_SRC_BURST_LEN(maxburst - 1)
-                       | ZX_SRC_BURST_WIDTH(ZX_DMA_WIDTH_64BIT)
+                       | ZX_SRC_BURST_WIDTH(dst_width)
                        | ZX_DST_BURST_WIDTH(dst_width);
                break;
        case DMA_DEV_TO_MEM:
@@ -496,7 +497,7 @@ static int zx_pre_config(struct zx_dma_chan *c, enum dma_transfer_direction dir)
                c->ccfg = ZX_SRC_FIFO_MODE | ZX_CH_ENABLE
                        | ZX_SRC_BURST_LEN(maxburst - 1)
                        | ZX_SRC_BURST_WIDTH(src_width)
-                       | ZX_DST_BURST_WIDTH(ZX_DMA_WIDTH_64BIT);
+                       | ZX_DST_BURST_WIDTH(src_width);
                break;
        default:
                return -EINVAL;