RE: [PATCH v4 1/4] omap: dma: Fix buffering disable bit setting for omap24xx
> -Original Message- > From: linux-omap-ow...@vger.kernel.org > [mailto:linux-omap-ow...@vger.kernel.org] On Behalf Of Peter Ujfalusi > Sent: Monday, October 04, 2010 1:48 PM > To: Tony Lindgren > Cc: linux-omap@vger.kernel.org; Jarkko Nikula; > linux-arm-ker...@lists.infradead.org > Subject: [PATCH v4 1/4] omap: dma: Fix buffering disable bit > setting for omap24xx > > From: ext Jarkko Nikula > > An errata workaround for omap24xx is not setting the > buffering disable bit > 25 what is the purpose but channel enable bit 7 instead. ... > diff --git a/arch/arm/plat-omap/dma.c > b/arch/arm/plat-omap/dma.c index ec7eddf..6914ccf 100644 > --- a/arch/arm/plat-omap/dma.c > +++ b/arch/arm/plat-omap/dma.c > @@ -999,8 +999,9 @@ void omap_start_dma(int lch) >* Errata: On ES2.0 BUFFERING disable must be set. >* This will always fail on ES1.0 >*/ Sorry, I didn't catch this with earlier patch. Looks like wrong comment. only on 2430ES1.0 and for all omap2420, buffer disable should be set. I feel below description will be useful to the reader: "Errata: Inter Frame DMA buffering issue(All OMAP2420 and OMAP2430ES1.0): DMA will wrongly buffer elements if packing and bursting is enabled. This might result in data gets stalled in FIFO at the end of the block. Workaround: DMA channels must have BUFFERING_DISABLED bit set to guarantee no data will stay in the DMA FIFO in case inter frame buffering occurs. -Manjunath-- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v4 1/4] omap: dma: Fix buffering disable bit setting for omap24xx
From: ext Jarkko Nikula An errata workaround for omap24xx is not setting the buffering disable bit 25 what is the purpose but channel enable bit 7 instead. Background for this fix is the DMA stalling issue with ASoC omap-mcbsp driver. Peter Ujfalusi has found an issue in recording that the DMA stall could happen if there were a buffer overrun detected by ALSA and the DMA was stopped and restarted due that. This problem is known to occur on both OMAP2420 and OMAP3. It can recover on OMAP3 after dma free, dma request and reconfiguration cycle. However, on OMAP2420 it seems that only way to recover is a reset. Problem was not visible before the commit c12abc0. That commit changed that the McBSP transmitter/receiver is released from reset only when needed. That is, only enabled McBSP transmitter without transmission was able to prevent this DMA stall problem in receiving side and underlying problem did not show up until now. McBSP transmitter itself seems to no be reason since DMA stall does not recover by enabling the transmission after stall. Debugging showed that there were a DMA write active during DMA stop time and it never completed even when restarting the DMA. Experimenting showed that the DMA buffering disable bit could be used to avoid stalling when using source synchronized transfers. However that could have performance hit and OMAP3 TRM states that buffering disable is not allowed for destination synchronized transfers so subsequent patch will implement a method to complete DMA writes when stopping. This patch is based on assumtion that complete lock-up on OMAP2420 is different but related problem. I don't have access to OMAP2420 errata but I believe this old workaround here is put for a reason but unfortunately a wrong bit was typed and problem showed up only now. v2: Issue is applicaple only to OMAP2420 and ES1.0 of OMAP2430. Thanks to G, Manjunath Kondaiah for noticing. Signed-off-by: Jarkko Nikula Signed-off-by: Peter Ujfalusi --- arch/arm/plat-omap/dma.c |5 +++-- arch/arm/plat-omap/include/plat/dma.h |1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index ec7eddf..6914ccf 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c @@ -999,8 +999,9 @@ void omap_start_dma(int lch) * Errata: On ES2.0 BUFFERING disable must be set. * This will always fail on ES1.0 */ - if (cpu_is_omap24xx()) - l |= OMAP_DMA_CCR_EN; + if (cpu_is_omap2420() || + (cpu_is_omap2430() && (omap_type() == OMAP2430_REV_ES1_0))) + l |= OMAP_DMA_CCR_BUFFERING_DISABLE; l |= OMAP_DMA_CCR_EN; dma_write(l, CCR(lch)); diff --git a/arch/arm/plat-omap/include/plat/dma.h b/arch/arm/plat-omap/include/plat/dma.h index af3a039..776ba44 100644 --- a/arch/arm/plat-omap/include/plat/dma.h +++ b/arch/arm/plat-omap/include/plat/dma.h @@ -335,6 +335,7 @@ #define OMAP2_DMA_MISALIGNED_ERR_IRQ (1 << 11) #define OMAP_DMA_CCR_EN(1 << 7) +#define OMAP_DMA_CCR_BUFFERING_DISABLE (1 << 25) #define OMAP_DMA_DATA_TYPE_S8 0x00 #define OMAP_DMA_DATA_TYPE_S16 0x01 -- 1.7.3 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v4 1/4] omap: dma: Fix buffering disable bit setting for omap24xx
On Mon, 4 Oct 2010 14:44:28 +0530 "G, Manjunath Kondaiah" wrote: > > > > -Original Message- > > From: linux-omap-ow...@vger.kernel.org > > [mailto:linux-omap-ow...@vger.kernel.org] On Behalf Of Peter Ujfalusi > > Sent: Monday, October 04, 2010 1:48 PM > > To: Tony Lindgren > > Cc: linux-omap@vger.kernel.org; Jarkko Nikula; > > linux-arm-ker...@lists.infradead.org > > Subject: [PATCH v4 1/4] omap: dma: Fix buffering disable bit > > setting for omap24xx > > > > From: ext Jarkko Nikula > > > > An errata workaround for omap24xx is not setting the > > buffering disable bit > > 25 what is the purpose but channel enable bit 7 instead. > > ... > > > diff --git a/arch/arm/plat-omap/dma.c > > b/arch/arm/plat-omap/dma.c index ec7eddf..6914ccf 100644 > > --- a/arch/arm/plat-omap/dma.c > > +++ b/arch/arm/plat-omap/dma.c > > @@ -999,8 +999,9 @@ void omap_start_dma(int lch) > > * Errata: On ES2.0 BUFFERING disable must be set. > > * This will always fail on ES1.0 > > */ > > Sorry, I didn't catch this with earlier patch. > > Looks like wrong comment. only on 2430ES1.0 and for all omap2420, > buffer disable should be set. > I feel below description will be useful to the reader: > "Errata: Inter Frame DMA buffering issue(All OMAP2420 and OMAP2430ES1.0): > DMA will wrongly buffer elements if packing and bursting is enabled. > This might result in data gets stalled in FIFO at the end of the block. > Workaround: DMA channels must have BUFFERING_DISABLED bit set to guarantee > no data will stay in the DMA FIFO in case inter frame buffering occurs. > Ok, no problem. I'll add this to the next version. This is good to get documented. -- Jarkko -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
