OMAP: DMA: Fix omapfb/lcdc on OMAP1510 broken when PM set
Subsystems (3)
PATCH v3 1/1 OMAP: DMA: Fix omapfb/lcdc on OMAP1510 broken when PM set
With CONFIG_PM=y, the omapfb/lcdc device on Amstrad Delta, after initially starting correctly, breaks with the following error messages:
omapfb omapfb: resetting (status 0xffffff96,reset count 1)
...
omapfb omapfb: resetting (status 0xffffff96,reset count 100) omapfb omapfb: too many reset attempts, giving up.
Looking closer at this I have found that it had been broken almost 2 years ago with commit 2418996e3b100114edb2ae110d5d4acb928909d2, PM fixes for OMAP1.
The definite reason for broken omapfb/lcdc behavoiur in PM mode appeared to be ARM_IDLECT1:IDLIF_ARM (bit 6) put into idle regardless of LCD DMA possibly running. The bit were set based on return value of the omap_dma_running() function that did not check for dedicated LCD DMA channel status. The patch below fixes this.
Created against linux-2.6.32-rc6
Tested on Amstrad Delta
---
Quoted 9 lines · Tuesday 03 November 2009 21:10:48 Tony Lindgren wrote:
Quoted 4 lines · Janusz Krzysztofik
Sorry, I've not checked for new mail before posting this one and missed your acceptance for my idea of fixing all omap1510, not only
ams_delta. If there are no more comments, I'll submit v3 withcpu_is_omap1510()replacingmachine_is_ams_delta().Sounds good to me.
Tony
arch/arm/plat-omap/dma.c renamed from arch/arm/plat-omap/dma.c.orig +8 -0
@@ -1108,6 +1108,14 @@ int omap_dma_running(void) {int lch; +/* +* On OMAP1510, internal LCD controller will start the transfer +* when it gets enabled, so assume DMA running if LCD enabled. +*/ +if (cpu_is_omap1510 ()) +if (omap_readw (0xfffec000 +0x00 ) & (1 <<0 )) +return 1 ; +/* Check if LCD DMA is running */ if (cpu_is_omap16xx ())if (omap_readw (OMAP1610_DMA_LCD_CCR ) &OMAP_DMA_CCR_EN )
Quoted 42 lines · Janusz Krzysztofik
With
CONFIG_PM=y, the omapfb/lcdc device on Amstrad Delta, after initially starting correctly, breaks with the following error messages:omapfb omapfb: resetting (status 0xffffff96,reset count 1)
...
omapfb omapfb: resetting (status 0xffffff96,reset count 100) omapfb omapfb: too many reset attempts, giving up.Looking closer at this I have found that it had been broken almost 2 years ago with commit
2418996e3b100114edb2ae110d5d4acb928909d2, PM fixes for OMAP1.The definite reason for broken omapfb/lcdc behavoiur in PM mode appeared to be ARM_IDLECT1:IDLIF_ARM (bit 6) put into idle regardless of LCD DMA possibly running. The bit were set based on return value of the
omap_dma_running()function that did not check for dedicated LCD DMA channel status. The patch below fixes this.Created against linux-2.6.32-rc6
Tested on Amstrad Delta
Signed-off-by Janusz Krzysztofik <[email protected]>---
Quoted 9 lines · Tuesday 03 November 2009 21:10:48 Tony Lindgren wrote:
Quoted 4 lines · Janusz Krzysztofik
Sorry, I've not checked for new mail before posting this one and missed your acceptance for my idea of fixing all omap1510, not only
ams_delta. If there are no more comments, I'll submit v3 withcpu_is_omap1510()replacingmachine_is_ams_delta().Sounds good to me.
Tony
arch/arm/plat-omap/dma.c renamed from arch/arm/plat-omap/dma.c.orig +1
-0@@ -1108,6 +1108,14 @@ int omap_dma_running(void) {int lch; +/*
arch/arm/plat-omap/dma.c int omap_dma_running(void) · line 1121
Quoted 10 lines
arch/arm/plat-omap/dma.c renamed from arch/arm/plat-omap/dma.c.orig +7
-0+* On OMAP1510, internal LCD controller will start the transfer +* when it gets enabled, so assume DMA running if LCD enabled. +*/ +if (cpu_is_omap1510 ()) +if (omap_readw (0xfffec000 +0x00 ) & (1 <<0 )) +return 1 ; +/* Check if LCD DMA is running */ if (cpu_is_omap16xx ())if (omap_readw (OMAP1610_DMA_LCD_CCR ) &OMAP_DMA_CCR_EN )
Can you please use some define rather than the 0xfffec000 register above?
Regards,
Tony
Monday 09 November 2009 22:14:24 Tony Lindgren napisa?(a):
Quoted 44 lines · Janusz Krzysztofik
Quoted 43 lines
With
CONFIG_PM=y, the omapfb/lcdc device on Amstrad Delta, after initially starting correctly, breaks with the following error messages:omapfb omapfb: resetting (status 0xffffff96,reset count 1)
...
omapfb omapfb: resetting (status 0xffffff96,reset count 100) omapfb omapfb: too many reset attempts, giving up.Looking closer at this I have found that it had been broken almost 2 years ago with commit
2418996e3b100114edb2ae110d5d4acb928909d2, PM fixes for OMAP1.The definite reason for broken omapfb/lcdc behavoiur in PM mode appeared to be ARM_IDLECT1:IDLIF_ARM (bit 6) put into idle regardless of LCD DMA possibly running. The bit were set based on return value of the
omap_dma_running()function that did not check for dedicated LCD DMA channel status. The patch below fixes this.Created against linux-2.6.32-rc6
Tested on Amstrad Delta
Signed-off-by Janusz Krzysztofik <[email protected]>---
Quoted 9 lines · Tuesday 03 November 2009 21:10:48 Tony Lindgren wrote:
Quoted 4 lines · Janusz Krzysztofik
Sorry, I've not checked for new mail before posting this one and missed your acceptance for my idea of fixing all omap1510, not only
ams_delta. If there are no more comments, I'll submit v3 withcpu_is_omap1510()replacingmachine_is_ams_delta().Sounds good to me.
Tony
arch/arm/plat-omap/dma.c renamed from arch/arm/plat-omap/dma.c.orig +0
-0@@ -1108,6 +1108,14 @@ int omap_dma_running(void) {int lch;
Quoted 14 lines
arch/arm/plat-omap/dma.c int omap_dma_running(void) · line 1121
Quoted 11 lines
arch/arm/plat-omap/dma.c renamed from arch/arm/plat-omap/dma.c.orig +8
-0+/* +* On OMAP1510, internal LCD controller will start the transfer +* when it gets enabled, so assume DMA running if LCD enabled. +*/ +if (cpu_is_omap1510 ()) +if (omap_readw (0xfffec000 +0x00 ) & (1 <<0 )) +return 1 ; +/* Check if LCD DMA is running */ if (cpu_is_omap16xx ())if (omap_readw (OMAP1610_DMA_LCD_CCR ) &OMAP_DMA_CCR_EN )Can you please use some define rather than the
0xfffec000register above?
Tony,
Sure. Expect a follow up very soon.
Thanks,
Janusz
PATCH v3 1/1 OMAP: DMA: Fix omapfb/lcdc on OMAP1510 broken when PM set
In reply to Janusz KrzysztofikThis patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: omap-fixes
Initial commit ID (Likely to change): 0b4dfc750f4bb1b4888939f206161080d5d27c5a
PatchWorks
http://patchwork.kernel.org/patch/57922/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=0b4dfc750f4bb1b4888939f206161080d5d27c5a