From e970dcc4bd8e0a1376e794fc81d41d0fc98262dd Mon Sep 17 00:00:00 2001

From: Gustavo Pimentel <Gustavo.Pimentel@synopsys.com>

Date: Thu, 18 Feb 2021 20:04:06 +0100

Subject: [PATCH] dmaengine: dw-edma: Fix crash on loading/unloading driver

Git-commit: e970dcc4bd8e0a1376e794fc81d41d0fc98262dd

Patch-mainline: v5.13-rc1

References: git-fixes

When the driver is compiled as a module and loaded if we try to unload

it, the Kernel shows a crash log. This Kernel crash is due to the

dma_async_device_unregister() call done after deleting the channels,

this patch fixes this issue.

Signed-off-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com>

Link: https://lore.kernel.org/r/4aa850c035cf7ee488f1d3fb6dee0e37be0dce0a.1613674948.git.gustavo.pimentel@synopsys.com

Signed-off-by: Vinod Koul <vkoul@kernel.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/dma/dw-edma/dw-edma-core.c |   11 +++++------

 1 file changed, 5 insertions(+), 6 deletions(-)

--- a/drivers/dma/dw-edma/dw-edma-core.c

+++ b/drivers/dma/dw-edma/dw-edma-core.c

@@ -910,22 +910,21 @@ int dw_edma_remove(struct dw_edma_chip *

 	/* Power management */

 	pm_runtime_disable(dev);

+	/* Deregister eDMA device */

+	dma_async_device_unregister(&dw->wr_edma);

 	list_for_each_entry_safe(chan, _chan, &dw->wr_edma.channels,

 				 vc.chan.device_node) {

-		list_del(&chan->vc.chan.device_node);

 		tasklet_kill(&chan->vc.task);

+		list_del(&chan->vc.chan.device_node);

 	}

+	dma_async_device_unregister(&dw->rd_edma);

 	list_for_each_entry_safe(chan, _chan, &dw->rd_edma.channels,

 				 vc.chan.device_node) {

-		list_del(&chan->vc.chan.device_node);

 		tasklet_kill(&chan->vc.task);

+		list_del(&chan->vc.chan.device_node);

 	}

-	/* Deregister eDMA device */

-	dma_async_device_unregister(&dw->wr_edma);

-	dma_async_device_unregister(&dw->rd_edma);

-

 	/* Turn debugfs off */

 	dw_edma_v0_core_debugfs_off();