diff mbox

dmaengine: fsl-edma: clear pending interrupts on initialization

Message ID 1433706370-3867-1-git-send-email-stefan@agner.ch (mailing list archive)
State Accepted
Headers show

Commit Message

Stefan Agner June 7, 2015, 7:46 p.m. UTC 
Clear pending interrupts before requesting interrupts and move
interrupt initialization after channels have been initialized.
This avoids a NULL pointer dereference panic when using kexec
while DMA requests were running.

Signed-off-by: Stefan Agner <stefan@agner.ch>
---
 drivers/dma/fsl-edma.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Vinod Koul June 12, 2015, 1:01 p.m. UTC | #1 
On Sun, Jun 07, 2015 at 09:46:10PM +0200, Stefan Agner wrote:
> Clear pending interrupts before requesting interrupts and move
> interrupt initialization after channels have been initialized.
> This avoids a NULL pointer dereference panic when using kexec
> while DMA requests were running.

Applied, thanks
diff mbox

Patch

diff --git a/drivers/dma/fsl-edma.c b/drivers/dma/fsl-edma.c
index 09e2842..915eec3 100644
--- a/drivers/dma/fsl-edma.c
+++ b/drivers/dma/fsl-edma.c
@@ -881,10 +881,6 @@  static int fsl_edma_probe(struct platform_device *pdev)
 
 	}
 
-	ret = fsl_edma_irq_init(pdev, fsl_edma);
-	if (ret)
-		return ret;
-
 	fsl_edma->big_endian = of_property_read_bool(np, "big-endian");
 
 	INIT_LIST_HEAD(&fsl_edma->dma_dev.channels);
@@ -900,6 +896,11 @@  static int fsl_edma_probe(struct platform_device *pdev)
 		fsl_edma_chan_mux(fsl_chan, 0, false);
 	}
 
+	edma_writel(fsl_edma, ~0, fsl_edma->membase + EDMA_INTR);
+	ret = fsl_edma_irq_init(pdev, fsl_edma);
+	if (ret)
+		return ret;
+
 	dma_cap_set(DMA_PRIVATE, fsl_edma->dma_dev.cap_mask);
 	dma_cap_set(DMA_SLAVE, fsl_edma->dma_dev.cap_mask);
 	dma_cap_set(DMA_CYCLIC, fsl_edma->dma_dev.cap_mask);