diff options
| author | Eric Long <eric.long@unisoc.com> | 2019-05-06 15:28:32 +0800 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2019-05-21 19:23:54 +0530 |
| commit | c434e377dad1dec05cad1870ce21bc539e1e024f (patch) | |
| tree | 0a5aa004b759ad8f5b347d56942306fdff6f9919 /drivers/dma | |
| parent | 89d03b3c126d683f7b2cd5b07178493993d12448 (diff) | |
| download | linux-stable-c434e377dad1dec05cad1870ce21bc539e1e024f.tar.gz linux-stable-c434e377dad1dec05cad1870ce21bc539e1e024f.tar.bz2 linux-stable-c434e377dad1dec05cad1870ce21bc539e1e024f.zip | |
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: Eric Long <eric.long@unisoc.com>
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/sprd-dma.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/dma/sprd-dma.c b/drivers/dma/sprd-dma.c index a01c23246632..01abed5cde49 100644 --- a/drivers/dma/sprd-dma.c +++ b/drivers/dma/sprd-dma.c @@ -911,6 +911,12 @@ sprd_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, 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); if (!sdesc) 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, dir, flags, slave_cfg); if (ret) { |