Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6eb9d3c1 authored by Ludovic Desroches's avatar Ludovic Desroches Committed by Vinod Koul
Browse files

dmaengine: at_xdmac: fix for chan conf simplification 



When simplificating the channel configuration, the cyclic case has been
forgotten. It leads to use bad configuration causing many bugs.

Signed-off-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 94b3eed7

drivers/dma/at_xdmac.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -664,7 +664,6 @@ at_xdmac_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr, 
	struct at_xdmac_desc	*first = NULL, *prev = NULL;

	struct at_xdmac_desc	*first = NULL, *prev = NULL;

	unsigned int		periods = buf_len / period_len;

	unsigned int		periods = buf_len / period_len;

	int			i;

	int			i;

	u32			cfg;





	dev_dbg(chan2dev(chan), "%s: buf_addr=%pad, buf_len=%zd, period_len=%zd, dir=%s, flags=0x%lx\n",

	dev_dbg(chan2dev(chan), "%s: buf_addr=%pad, buf_len=%zd, period_len=%zd, dir=%s, flags=0x%lx\n",

		__func__, &buf_addr, buf_len, period_len,

		__func__, &buf_addr, buf_len, period_len,
@@ -700,17 +699,17 @@ at_xdmac_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr, 
		if (direction == DMA_DEV_TO_MEM) {

		if (direction == DMA_DEV_TO_MEM) {

			desc->lld.mbr_sa = atchan->per_src_addr;

			desc->lld.mbr_sa = atchan->per_src_addr;

			desc->lld.mbr_da = buf_addr + i * period_len;

			desc->lld.mbr_da = buf_addr + i * period_len;

			cfg = atchan->cfg[AT_XDMAC_DEV_TO_MEM_CFG];

			desc->lld.mbr_cfg = atchan->cfg[AT_XDMAC_DEV_TO_MEM_CFG];

		} else {

		} else {

			desc->lld.mbr_sa = buf_addr + i * period_len;

			desc->lld.mbr_sa = buf_addr + i * period_len;

			desc->lld.mbr_da = atchan->per_dst_addr;

			desc->lld.mbr_da = atchan->per_dst_addr;

			cfg = atchan->cfg[AT_XDMAC_MEM_TO_DEV_CFG];

			desc->lld.mbr_cfg = atchan->cfg[AT_XDMAC_MEM_TO_DEV_CFG];

		}

		}

		desc->lld.mbr_ubc = AT_XDMAC_MBR_UBC_NDV1

		desc->lld.mbr_ubc = AT_XDMAC_MBR_UBC_NDV1

			| AT_XDMAC_MBR_UBC_NDEN

			| AT_XDMAC_MBR_UBC_NDEN

			| AT_XDMAC_MBR_UBC_NSEN

			| AT_XDMAC_MBR_UBC_NSEN

			| AT_XDMAC_MBR_UBC_NDE

			| AT_XDMAC_MBR_UBC_NDE

			| period_len >> at_xdmac_get_dwidth(cfg);

			| period_len >> at_xdmac_get_dwidth(desc->lld.mbr_cfg);





		dev_dbg(chan2dev(chan),

		dev_dbg(chan2dev(chan),

			 "%s: lld: mbr_sa=%pad, mbr_da=%pad, mbr_ubc=0x%08x\n",

			 "%s: lld: mbr_sa=%pad, mbr_da=%pad, mbr_ubc=0x%08x\n",