summaryrefslogtreecommitdiffstats
path: root/arch/arm/common
diff options
context:
space:
mode:
authorJohn Ogness <john.ogness@linutronix.de>2015-04-27 13:52:15 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-06 22:27:01 +0200
commitc2d4bb9d9387231f5e265d59600aeb6409be8e7a (patch)
tree48b7137424eda535a60d9e528649e0c7329cdeb5 /arch/arm/common
parentserial: SERIAL_IFX6X60 should depend on HAS_DMA (diff)
downloadlinux-c2d4bb9d9387231f5e265d59600aeb6409be8e7a.tar.xz
linux-c2d4bb9d9387231f5e265d59600aeb6409be8e7a.zip
ARM: common: edma: clear completion interrupts on stop
When stopping a DMA transfer with interrupts disabled it is possible that the DMA transfer completes before the events are cleared. In this case the completion interrupt will be pending, causing a completion callback after the transfer was stopped. By clearing the completion interrupt for the stopping channel it is ensured that no completion event will be generated after the stop. Signed-off-by: John Ogness <john.ogness@linutronix.de> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/common')
-rw-r--r--arch/arm/common/edma.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
index 5662a872689b..873dbfcc7dc9 100644
--- a/arch/arm/common/edma.c
+++ b/arch/arm/common/edma.c
@@ -1350,6 +1350,9 @@ void edma_stop(unsigned channel)
edma_shadow0_write_array(ctlr, SH_SECR, j, mask);
edma_write_array(ctlr, EDMA_EMCR, j, mask);
+ /* clear possibly pending completion interrupt */
+ edma_shadow0_write_array(ctlr, SH_ICR, j, mask);
+
pr_debug("EDMA: EER%d %08x\n", j,
edma_shadow0_read_array(ctlr, SH_EER, j));