Commit c434e377 authored by Eric Long's avatar Eric Long Committed by Vinod Koul
Browse files

dmaengine: sprd: Fix the right place to configure 2-stage transfer 



Move the 2-stage configuration before configuring the link-list mode,
since we will use some 2-stage configuration to fill the link-list
configuration.

Signed-off-by: default avatarEric Long <eric.long@unisoc.com>
Signed-off-by: default avatarBaolin Wang <baolin.wang@linaro.org>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 89d03b3c

drivers/dma/sprd-dma.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -911,6 +911,12 @@ sprd_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, 
		schan->linklist.virt_addr = 0;

		schan->linklist.virt_addr = 0;

	}

	}





	/* Set channel mode and trigger mode for 2-stage transfer */

	schan->chn_mode =

		(flags >> SPRD_DMA_CHN_MODE_SHIFT) & SPRD_DMA_CHN_MODE_MASK;

	schan->trg_mode =

		(flags >> SPRD_DMA_TRG_MODE_SHIFT) & SPRD_DMA_TRG_MODE_MASK;



	sdesc = kzalloc(sizeof(*sdesc), GFP_NOWAIT);

	sdesc = kzalloc(sizeof(*sdesc), GFP_NOWAIT);

	if (!sdesc)

	if (!sdesc)

		return NULL;

		return NULL;
@@ -944,12 +950,6 @@ sprd_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, 
		}

		}

	}

	}





	/* Set channel mode and trigger mode for 2-stage transfer */

	schan->chn_mode =

		(flags >> SPRD_DMA_CHN_MODE_SHIFT) & SPRD_DMA_CHN_MODE_MASK;

	schan->trg_mode =

		(flags >> SPRD_DMA_TRG_MODE_SHIFT) & SPRD_DMA_TRG_MODE_MASK;



	ret = sprd_dma_fill_desc(chan, &sdesc->chn_hw, 0, 0, src, dst, len,

	ret = sprd_dma_fill_desc(chan, &sdesc->chn_hw, 0, 0, src, dst, len,

				 dir, flags, slave_cfg);

				 dir, flags, slave_cfg);

	if (ret) {

	if (ret) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE