diff mbox

[v2,1/2] dmaengine: zxdma: Fix data width bug

Message ID 1438752207-12244-1-git-send-email-jun.nie@linaro.org (mailing list archive)
State Accepted
Headers show

Commit Message

Jun Nie Aug. 5, 2015, 5:23 a.m. UTC 
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>
---
 drivers/dma/zx296702_dma.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Vinod Koul Aug. 5, 2015, 5:33 a.m. UTC | #1 
On Wed, Aug 05, 2015 at 01:23:26PM +0800, Jun Nie wrote:
> 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.

Applied both, thanks
diff mbox

Patch

diff --git a/drivers/dma/zx296702_dma.c b/drivers/dma/zx296702_dma.c
index 0d55c8f..103691c6 100644
--- 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;