]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
dmaengine: fsl-edma: free irq correctly in remove path
authorPeng Fan <peng.fan@nxp.com>
Fri, 28 Feb 2025 07:17:20 +0000 (15:17 +0800)
committerVinod Koul <vkoul@kernel.org>
Mon, 10 Mar 2025 20:53:37 +0000 (02:23 +0530)
Add fsl_edma->txirq/errirq check to avoid below warning because no
errirq at i.MX9 platform. Otherwise there will be kernel dump:
WARNING: CPU: 0 PID: 11 at kernel/irq/devres.c:144 devm_free_irq+0x74/0x80
Modules linked in:
CPU: 0 UID: 0 PID: 11 Comm: kworker/u8:0 Not tainted 6.12.0-rc7#18
Hardware name: NXP i.MX93 11X11 EVK board (DT)
Workqueue: events_unbound deferred_probe_work_func
pstate: 60400009 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
pc : devm_free_irq+0x74/0x80
lr : devm_free_irq+0x48/0x80
Call trace:
 devm_free_irq+0x74/0x80 (P)
 devm_free_irq+0x48/0x80 (L)
 fsl_edma_remove+0xc4/0xc8
 platform_remove+0x28/0x44
 device_remove+0x4c/0x80

Fixes: 44eb827264de ("dmaengine: fsl-edma: request per-channel IRQ only when channel is allocated")
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Link: https://lore.kernel.org/r/20250228071720.3780479-2-peng.fan@oss.nxp.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/fsl-edma-main.c

index 7eb4d898434b019f98ec60935d4cecc85ac04316..756d67325db5268c082e23bd4997a2f656f945a3 100644 (file)
@@ -401,6 +401,7 @@ fsl_edma2_irq_init(struct platform_device *pdev,
 
                /* The last IRQ is for eDMA err */
                if (i == count - 1) {
+                       fsl_edma->errirq = irq;
                        ret = devm_request_irq(&pdev->dev, irq,
                                                fsl_edma_err_handler,
                                                0, "eDMA2-ERR", fsl_edma);
@@ -420,10 +421,13 @@ static void fsl_edma_irq_exit(
                struct platform_device *pdev, struct fsl_edma_engine *fsl_edma)
 {
        if (fsl_edma->txirq == fsl_edma->errirq) {
-               devm_free_irq(&pdev->dev, fsl_edma->txirq, fsl_edma);
+               if (fsl_edma->txirq >= 0)
+                       devm_free_irq(&pdev->dev, fsl_edma->txirq, fsl_edma);
        } else {
-               devm_free_irq(&pdev->dev, fsl_edma->txirq, fsl_edma);
-               devm_free_irq(&pdev->dev, fsl_edma->errirq, fsl_edma);
+               if (fsl_edma->txirq >= 0)
+                       devm_free_irq(&pdev->dev, fsl_edma->txirq, fsl_edma);
+               if (fsl_edma->errirq >= 0)
+                       devm_free_irq(&pdev->dev, fsl_edma->errirq, fsl_edma);
        }
 }
 
@@ -620,6 +624,8 @@ static int fsl_edma_probe(struct platform_device *pdev)
        if (!fsl_edma)
                return -ENOMEM;
 
+       fsl_edma->errirq = -EINVAL;
+       fsl_edma->txirq = -EINVAL;
        fsl_edma->drvdata = drvdata;
        fsl_edma->n_chans = chans;
        mutex_init(&fsl_edma->fsl_edma_mutex);