blob: 42f151f3f75419a7b29cd3458511617f8b0693ef (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
From 7021361c27946c60885b3f031ddde342f9a5432f Mon Sep 17 00:00:00 2001
From: Robin Gong <yibin.gong@nxp.com>
Date: Tue, 5 Nov 2019 21:32:22 +0800
Subject: [PATCH] MLK-22909 dmaengine: fsl-edma-v3: clear interrupt coming
after channel terminated
Clear EDMA_CH_INT in case dma done interrupt comes after channel terminated
instead of channel free-ed, otherwise, RCU maybe caught because it's
ignored without interrupt status cleared as Android team report in Monkey
test.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Acked-by: Fugang Duan <fugang.duan@nxp.com>
(cherry picked from commit ef91ff6ed465cebe2fe6483a480351abba36e237)
(cherry picked from commit 56ee55c71c5f3ef254acb4dee581e68f79ef13a5)
---
drivers/dma/fsl-edma-v3.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- a/drivers/dma/fsl-edma-v3.c
+++ b/drivers/dma/fsl-edma-v3.c
@@ -710,8 +710,8 @@ static irqreturn_t fsl_edma3_tx_handler(
spin_lock(&fsl_chan->vchan.lock);
- /* Ignore this interrupt since channel has been disabled already */
- if (!fsl_chan->edesc)
+ /* Ignore this interrupt since channel has been freeed with power off */
+ if (!fsl_chan->edesc && !fsl_chan->tcd_pool)
goto irq_handled;
base_addr = fsl_chan->membase;
@@ -722,6 +722,10 @@ static irqreturn_t fsl_edma3_tx_handler(
writel(1, base_addr + EDMA_CH_INT);
+ /* Ignore this interrupt since channel has been disabled already */
+ if (!fsl_chan->edesc)
+ goto irq_handled;
+
if (!fsl_chan->edesc->iscyclic) {
fsl_edma3_get_realcnt(fsl_chan);
list_del(&fsl_chan->edesc->vdesc.node);
|
