summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Graumann <nick.graumann@gmail.com>2019-10-15 20:18:24 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-04 19:12:38 +0100
commitc4986e473435a2b1b5825848e087c1df5be1964a (patch)
tree55f88e2e0f25714318d57ebc3b33546e596ddfed
parent40179e745ff74de306897b2ebbbb1f877880d464 (diff)
downloadlinux-stable-c4986e473435a2b1b5825848e087c1df5be1964a.tar.gz
linux-stable-c4986e473435a2b1b5825848e087c1df5be1964a.tar.bz2
linux-stable-c4986e473435a2b1b5825848e087c1df5be1964a.zip
dmaengine: xilinx_dma: Clear desc_pendingcount in xilinx_dma_reset
[ Upstream commit 8a631a5a0f7d4a4a24dba8587d5d9152be0871cc ] Whenever we reset the channel, we need to clear desc_pendingcount along with desc_submitcount. Otherwise when a new transaction is submitted, the irq coalesce level could be programmed to an incorrect value in the axidma case. This behavior can be observed when terminating pending transactions with xilinx_dma_terminate_all() and then submitting new transactions without releasing and requesting the channel. Signed-off-by: Nicholas Graumann <nick.graumann@gmail.com> Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com> Link: https://lore.kernel.org/r/1571150904-3988-8-git-send-email-radhey.shyam.pandey@xilinx.com Signed-off-by: Vinod Koul <vkoul@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/dma/xilinx/xilinx_dma.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c
index 8aec137b4fca..d56b6b0e22a8 100644
--- a/drivers/dma/xilinx/xilinx_dma.c
+++ b/drivers/dma/xilinx/xilinx_dma.c
@@ -1427,6 +1427,7 @@ static int xilinx_dma_reset(struct xilinx_dma_chan *chan)
chan->err = false;
chan->idle = true;
+ chan->desc_pendingcount = 0;
chan->desc_submitcount = 0;
return err;