* [PATCH] OMAP: DMA: clear interrupt status correctly [not found] ` <87mxnfz2f4.fsf@ti.com> @ 2011-01-19 10:24 ` Adrian Hunter 2011-01-19 22:23 ` Tony Lindgren 0 siblings, 1 reply; 5+ messages in thread From: Adrian Hunter @ 2011-01-19 10:24 UTC (permalink / raw) To: linux-arm-kernel From fffa19df17d73c1ed2e8c65c0b6604ee1dddff84 Mon Sep 17 00:00:00 2001 From: Adrian Hunter <adrian.hunter@nokia.com> Date: Wed, 24 Nov 2010 13:23:21 +0200 Subject: [PATCH] OMAP: DMA: clear interrupt status correctly When clearing the DMA channel, clear all status bits. When handling a DMA interrupt, clear only the interrupt status bits that have been read and are passed to the channel's interrupt handler, not every status bit. Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com> --- arch/arm/plat-omap/dma.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index c4b2b47..8536308 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c @@ -53,7 +53,7 @@ enum { DMA_CHAIN_STARTED, DMA_CHAIN_NOTSTARTED }; #endif #define OMAP_DMA_ACTIVE 0x01 -#define OMAP2_DMA_CSR_CLEAR_MASK 0xffe +#define OMAP2_DMA_CSR_CLEAR_MASK 0xffffffff #define OMAP_FUNC_MUX_ARM_BASE (0xfffe1000 + 0xec) @@ -1873,7 +1873,7 @@ static int omap2_dma_handle_ch(int ch) printk(KERN_INFO "DMA misaligned error with device %d\n", dma_chan[ch].dev_id); - p->dma_write(OMAP2_DMA_CSR_CLEAR_MASK, CSR, ch); + p->dma_write(status, CSR, ch); p->dma_write(1 << ch, IRQSTATUS_L0, ch); /* read back the register to flush the write */ p->dma_read(IRQSTATUS_L0, ch); @@ -1893,10 +1893,9 @@ static int omap2_dma_handle_ch(int ch) OMAP_DMA_CHAIN_INCQHEAD(chain_id); status = p->dma_read(CSR, ch); + p->dma_write(status, CSR, ch); } - p->dma_write(status, CSR, ch); - if (likely(dma_chan[ch].callback != NULL)) dma_chan[ch].callback(ch, status, dma_chan[ch].data); -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] OMAP: DMA: clear interrupt status correctly 2011-01-19 10:24 ` [PATCH] OMAP: DMA: clear interrupt status correctly Adrian Hunter @ 2011-01-19 22:23 ` Tony Lindgren 2011-01-19 22:44 ` Tony Lindgren 0 siblings, 1 reply; 5+ messages in thread From: Tony Lindgren @ 2011-01-19 22:23 UTC (permalink / raw) To: linux-arm-kernel * Adrian Hunter <adrian.hunter@nokia.com> [110119 02:23]: > > From fffa19df17d73c1ed2e8c65c0b6604ee1dddff84 Mon Sep 17 00:00:00 2001 > From: Adrian Hunter <adrian.hunter@nokia.com> > Date: Wed, 24 Nov 2010 13:23:21 +0200 > Subject: [PATCH] OMAP: DMA: clear interrupt status correctly > > When clearing the DMA channel, clear all status bits. > > When handling a DMA interrupt, clear only the interrupt > status bits that have been read and are passed to the > channel's interrupt handler, not every status bit. > > Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com> Thanks, will queue as a fix. Tony ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] OMAP: DMA: clear interrupt status correctly 2011-01-19 22:23 ` Tony Lindgren @ 2011-01-19 22:44 ` Tony Lindgren 2011-01-20 3:44 ` G, Manjunath Kondaiah 2011-01-20 11:10 ` Adrian Hunter 0 siblings, 2 replies; 5+ messages in thread From: Tony Lindgren @ 2011-01-19 22:44 UTC (permalink / raw) To: linux-arm-kernel * Tony Lindgren <tony@atomide.com> [110119 14:23]: > * Adrian Hunter <adrian.hunter@nokia.com> [110119 02:23]: > > > > From fffa19df17d73c1ed2e8c65c0b6604ee1dddff84 Mon Sep 17 00:00:00 2001 > > From: Adrian Hunter <adrian.hunter@nokia.com> > > Date: Wed, 24 Nov 2010 13:23:21 +0200 > > Subject: [PATCH] OMAP: DMA: clear interrupt status correctly > > > > When clearing the DMA channel, clear all status bits. > > > > When handling a DMA interrupt, clear only the interrupt > > status bits that have been read and are passed to the > > channel's interrupt handler, not every status bit. > > > > Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com> > > Thanks, will queue as a fix. This did not apply for some reason, I've applied it manually. Please check that I got it right in omap-fixes branch soonish. Let me know if it needs updating. Tony ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] OMAP: DMA: clear interrupt status correctly 2011-01-19 22:44 ` Tony Lindgren @ 2011-01-20 3:44 ` G, Manjunath Kondaiah 2011-01-20 11:10 ` Adrian Hunter 1 sibling, 0 replies; 5+ messages in thread From: G, Manjunath Kondaiah @ 2011-01-20 3:44 UTC (permalink / raw) To: linux-arm-kernel On Wed, Jan 19, 2011 at 02:44:07PM -0800, Tony Lindgren wrote: > * Tony Lindgren <tony@atomide.com> [110119 14:23]: > > * Adrian Hunter <adrian.hunter@nokia.com> [110119 02:23]: > > > > > > From fffa19df17d73c1ed2e8c65c0b6604ee1dddff84 Mon Sep 17 00:00:00 2001 > > > From: Adrian Hunter <adrian.hunter@nokia.com> > > > Date: Wed, 24 Nov 2010 13:23:21 +0200 > > > Subject: [PATCH] OMAP: DMA: clear interrupt status correctly > > > > > > When clearing the DMA channel, clear all status bits. > > > > > > When handling a DMA interrupt, clear only the interrupt > > > status bits that have been read and are passed to the > > > channel's interrupt handler, not every status bit. > > > > > > Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com> > > > > Thanks, will queue as a fix. > > This did not apply for some reason, I've applied it manually. > Please check that I got it right in omap-fixes branch soonish. > Let me know if it needs updating. Looks like the commit message is missing: Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> you can also add: Acked-by: G, Manjunath Kondaiah <manjugk@ti.com> -Manjunath ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] OMAP: DMA: clear interrupt status correctly 2011-01-19 22:44 ` Tony Lindgren 2011-01-20 3:44 ` G, Manjunath Kondaiah @ 2011-01-20 11:10 ` Adrian Hunter 1 sibling, 0 replies; 5+ messages in thread From: Adrian Hunter @ 2011-01-20 11:10 UTC (permalink / raw) To: linux-arm-kernel On 20/01/11 00:44, Tony Lindgren wrote: > * Tony Lindgren<tony@atomide.com> [110119 14:23]: >> * Adrian Hunter<adrian.hunter@nokia.com> [110119 02:23]: >>> >>> From fffa19df17d73c1ed2e8c65c0b6604ee1dddff84 Mon Sep 17 00:00:00 2001 >>> From: Adrian Hunter<adrian.hunter@nokia.com> >>> Date: Wed, 24 Nov 2010 13:23:21 +0200 >>> Subject: [PATCH] OMAP: DMA: clear interrupt status correctly >>> >>> When clearing the DMA channel, clear all status bits. >>> >>> When handling a DMA interrupt, clear only the interrupt >>> status bits that have been read and are passed to the >>> channel's interrupt handler, not every status bit. >>> >>> Signed-off-by: Adrian Hunter<adrian.hunter@nokia.com> >> >> Thanks, will queue as a fix. > > This did not apply for some reason, I've applied it manually. > Please check that I got it right in omap-fixes branch soonish. > Let me know if it needs updating. Looks fine > > Tony > ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-01-20 11:10 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20101130132341.13286.25157.sendpatchset@ahunter-work.research.nokia.com>
[not found] ` <20101130132355.13286.77389.sendpatchset@ahunter-work.research.nokia.com>
[not found] ` <541b3a50479779f3e814aa93d506cbdd@mail.gmail.com>
[not found] ` <20101221202914.GK5829@atomide.com>
[not found] ` <4D2440E0.7040008@nokia.com>
[not found] ` <87mxnfz2f4.fsf@ti.com>
2011-01-19 10:24 ` [PATCH] OMAP: DMA: clear interrupt status correctly Adrian Hunter
2011-01-19 22:23 ` Tony Lindgren
2011-01-19 22:44 ` Tony Lindgren
2011-01-20 3:44 ` G, Manjunath Kondaiah
2011-01-20 11:10 ` Adrian Hunter
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).