[PATCH 10/10] dma: imx-sdma: clear channel0 interrupt bit in irq routine

From: Jiada Wang <jiada_wang@mentor.com>
To: <vinod.koul@intel.com>, <dan.j.williams@intel.com>
Cc: <dmaengine@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<shawnguo@kernel.com>, <kernel@pengutronix.de>,
	<george_davis@mentor.com>, <jiada_wang@mentor.com>
Subject: [PATCH 10/10] dma: imx-sdma: clear channel0 interrupt bit in irq routine
Date: Tue, 17 May 2016 12:47:56 +0900	[thread overview]
Message-ID: <1463456876-10580-11-git-send-email-jiada_wang@mentor.com> (raw)
In-Reply-To: <1463456876-10580-1-git-send-email-jiada_wang@mentor.com>

When SDMA channel0 timeouts, even it's disabled in error path,
but sometimes we still see its interrupt bit be asserted,
which causes irq routine be triggered continuously because
no one else clears this bit.

This commit clears channel0 interrupt as well in irq routine,
so that even channel0 timeouts, it won't cause irq storm,
also adds lock to prevent irq routine to clear this bit when
sdma_run_channel0() is busy checking it.

Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
---
 drivers/dma/imx-sdma.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 8b20bf4..ca1c984 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -768,12 +768,16 @@ static void sdma_tasklet(unsigned long data)
 static irqreturn_t sdma_int_handler(int irq, void *dev_id)
 {
 	struct sdma_engine *sdma = dev_id;
-	unsigned long stat;
+	unsigned long stat, flags;
+
+	spin_lock_irqsave(&sdma->channel_0_lock, flags);
 
 	stat = readl_relaxed(sdma->regs + SDMA_H_INTR);
+	writel_relaxed(stat, sdma->regs + SDMA_H_INTR);
 	/* not interested in channel 0 interrupts */
 	stat &= ~1;
-	writel_relaxed(stat, sdma->regs + SDMA_H_INTR);
+
+	spin_unlock_irqrestore(&sdma->channel_0_lock, flags);
 
 	while (stat) {
 		int channel = fls(stat) - 1;
-- 
2.4.5
