Commit 5f2cc08e authored by Olivier Dautricourt's avatar Olivier Dautricourt Committed by Wen Zhiwei
Browse files

dmaengine: altera-msgdma: properly free descriptor in msgdma_free_descriptor 

stable inclusion
from stable-v6.6.50
commit 20bf2920a869f9dbda0ef8c94c87d1901a64a716
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=20bf2920a869f9dbda0ef8c94c87d1901a64a716



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

[ Upstream commit 54e4ada1a4206f878e345ae01cf37347d803d1b1 ]

Remove list_del call in msgdma_chan_desc_cleanup, this should be the role
of msgdma_free_descriptor. In consequence replace list_add_tail with
list_move_tail in msgdma_free_descriptor.

This fixes the path:
   msgdma_free_chan_resources -> msgdma_free_descriptors ->
   msgdma_free_desc_list -> msgdma_free_descriptor

which does not correctly free the descriptors as first nodes were not
removed from the list.

Signed-off-by: default avatarOlivier Dautricourt <olivierdautricourt@gmail.com>
Tested-by: default avatarOlivier Dautricourt <olivierdautricourt@gmail.com>
Link: https://lore.kernel.org/r/20240608213216.25087-3-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 5416a2f9

drivers/dma/altera-msgdma.c

+1 −3
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static void msgdma_free_descriptor(struct msgdma_device *mdev, 
	struct msgdma_sw_desc *child, *next;



	mdev->desc_free_cnt++;

	list_add_tail(&desc->node, &mdev->free_list);

	list_move_tail(&desc->node, &mdev->free_list);

	list_for_each_entry_safe(child, next, &desc->tx_list, node) {

		mdev->desc_free_cnt++;

		list_move_tail(&child->node, &mdev->free_list);
@@ -588,8 +588,6 @@ static void msgdma_chan_desc_cleanup(struct msgdma_device *mdev) 
	list_for_each_entry_safe(desc, next, &mdev->done_list, node) {

		struct dmaengine_desc_callback cb;



		list_del(&desc->node);



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

		if (dmaengine_desc_callback_valid(&cb)) {

			spin_unlock_irqrestore(&mdev->lock, irqflags);