mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-26 10:49:33 +00:00
Code Issues Releases Wiki Activity

dmaengine: zxdma: Fix data width bug

Browse source 
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>
This commit is contained in:
Jun Nie 2015-08-05 13:23:26 +08:00 committed by Vinod Koul
parent 2f2560e348
commit 2092539b77
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/dma/zx296702_dma.c
View file

@ -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; c->dev_addr = cfg->dst_addr;
/* dst len is calculated from src width, len and dst width. /* dst len is calculated from src width, len and dst width.
* We need make sure dst len not exceed MAX LEN. * 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); dst_width = zx_dma_burst_width(cfg->dst_addr_width);
maxburst = cfg->dst_maxburst * cfg->dst_addr_width maxburst = cfg->dst_maxburst;
/ DMA_SLAVE_BUSWIDTH_8_BYTES;
maxburst = maxburst < ZX_MAX_BURST_LEN ? maxburst = maxburst < ZX_MAX_BURST_LEN ?
maxburst : ZX_MAX_BURST_LEN; maxburst : ZX_MAX_BURST_LEN;
c->ccfg = ZX_DST_FIFO_MODE | ZX_CH_ENABLE c->ccfg = ZX_DST_FIFO_MODE | ZX_CH_ENABLE
| ZX_SRC_BURST_LEN(maxburst - 1) | 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); | ZX_DST_BURST_WIDTH(dst_width);
break; break;
case DMA_DEV_TO_MEM: 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 c->ccfg = ZX_SRC_FIFO_MODE | ZX_CH_ENABLE
| ZX_SRC_BURST_LEN(maxburst - 1) | ZX_SRC_BURST_LEN(maxburst - 1)
| ZX_SRC_BURST_WIDTH(src_width) | ZX_SRC_BURST_WIDTH(src_width)
| ZX_DST_BURST_WIDTH(ZX_DMA_WIDTH_64BIT); | ZX_DST_BURST_WIDTH(src_width);
break; break;
default: default:
return -EINVAL; return -EINVAL;