Commit 5416a2f9 authored by Olivier Dautricourt's avatar Olivier Dautricourt Committed by Wen Zhiwei
Browse files

dmaengine: altera-msgdma: use irq variant of spin_lock/unlock while invoking callbacks 

stable inclusion
from stable-v6.6.50
commit cd3851ef3f7d58259bab7c4ebcb4742040694625
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAYKL6

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=cd3851ef3f7d58259bab7c4ebcb4742040694625



--------------------------------

[ Upstream commit 261d3a85d959841821ca0d69f9d7b0d4087661c4 ]

As we first take the lock with spin_lock_irqsave in msgdma_tasklet, Lockdep
might complain about this. Inspired by commit 9558cf4a
("dmaengine: zynqmp_dma: fix lockdep warning in tasklet")

Signed-off-by: default avatarOlivier Dautricourt <olivierdautricourt@gmail.com>
Tested-by: default avatarOlivier Dautricourt <olivierdautricourt@gmail.com>
Suggested-by: default avatarEric Schwarz <eas@sw-optimization.com>
Link: https://lore.kernel.org/r/20240608213216.25087-1-olivierdautricourt@gmail.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 1ac7bdee

drivers/dma/altera-msgdma.c

+3 −2
Original line number Diff line number Diff line
@@ -583,6 +583,7 @@ static void msgdma_issue_pending(struct dma_chan *chan) 
static void msgdma_chan_desc_cleanup(struct msgdma_device *mdev)

{

	struct msgdma_sw_desc *desc, *next;

	unsigned long irqflags;



	list_for_each_entry_safe(desc, next, &mdev->done_list, node) {

		struct dmaengine_desc_callback cb;
@@ -591,9 +592,9 @@ static void msgdma_chan_desc_cleanup(struct msgdma_device *mdev) 


		dmaengine_desc_get_callback(&desc->async_tx, &cb);

		if (dmaengine_desc_callback_valid(&cb)) {

			spin_unlock(&mdev->lock);

			spin_unlock_irqrestore(&mdev->lock, irqflags);

			dmaengine_desc_callback_invoke(&cb, NULL);

			spin_lock(&mdev->lock);

			spin_lock_irqsave(&mdev->lock, irqflags);

		}



		/* Run any dependencies, then free the descriptor */