[PATCH 00/02] Git pull request for 2.6.26 for two omap fixes

[PATCH 00/02] Git pull request for 2.6.26 for two omap fixes

[Tony Lindgren]

Hi Russell,

Can you please pull following two omap fixes from:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-fixes

Regards,

Tony


-------------------------------------------------------------------
List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php

[PATCH 00/02] Git pull request for 2.6.26 for two omap fixes

[Tony Lindgren]

Hi Russell,

Can you please pull following two omap fixes from:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-fixes

Regards,

Tony


-------------------------------------------------------------------
List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php

[PATCH 01/02] ARM: OMAP: DMA: Don't mark channel active in omap_enable_channel_irq

[Tony Lindgren]

From: Jarkko Nikula <jarkko.nikula@nokia.com>

Channel should be marked active only when DMA is really started. Otherwise
just omap_request_dma, omap_dma_link_lch and omap_dma_unlink_lch will cause
incorrect dump_stack().

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index c00eda5..39c637b 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -501,8 +501,6 @@ static inline void omap_enable_channel_irq(int lch)
 
 	/* Enable some nice interrupts. */
 	OMAP_DMA_CICR_REG(lch) = dma_chan[lch].enabled_irqs;
-
-	dma_chan[lch].flags |= OMAP_DMA_ACTIVE;
 }
 
 static void omap_disable_channel_irq(int lch)

-------------------------------------------------------------------
List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php

[PATCH 01/02] ARM: OMAP: DMA: Don't mark channel active in omap_enable_channel_irq

[Tony Lindgren]

From: Jarkko Nikula <jarkko.nikula@nokia.com>

Channel should be marked active only when DMA is really started. Otherwise
just omap_request_dma, omap_dma_link_lch and omap_dma_unlink_lch will cause
incorrect dump_stack().

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index c00eda5..39c637b 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -501,8 +501,6 @@ static inline void omap_enable_channel_irq(int lch)
 
 	/* Enable some nice interrupts. */
 	OMAP_DMA_CICR_REG(lch) = dma_chan[lch].enabled_irqs;
-
-	dma_chan[lch].flags |= OMAP_DMA_ACTIVE;
 }
 
 static void omap_disable_channel_irq(int lch)

-------------------------------------------------------------------
List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php

[PATCH 02/02] ARM: OMAP: Correcting the gpmc prefetch control register address

[Tony Lindgren]

From: Thara Gopinath <thara@ti.com>

Correcting the GPMC_PREFETCH_CONTROL register address

Signed-off-by: Thara Gopinath <thara@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index 02cede2..dbf68dc 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -42,7 +42,7 @@
 #define GPMC_STATUS		0x54
 #define GPMC_PREFETCH_CONFIG1	0x1e0
 #define GPMC_PREFETCH_CONFIG2	0x1e4
-#define GPMC_PREFETCH_CONTROL	0x1e8
+#define GPMC_PREFETCH_CONTROL	0x1ec
 #define GPMC_PREFETCH_STATUS	0x1f0
 #define GPMC_ECC_CONFIG		0x1f4
 #define GPMC_ECC_CONTROL	0x1f8

-------------------------------------------------------------------
List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php

[PATCH 02/02] ARM: OMAP: Correcting the gpmc prefetch control register address

[Tony Lindgren]

From: Thara Gopinath <thara@ti.com>

Correcting the GPMC_PREFETCH_CONTROL register address

Signed-off-by: Thara Gopinath <thara@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index 02cede2..dbf68dc 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -42,7 +42,7 @@
 #define GPMC_STATUS		0x54
 #define GPMC_PREFETCH_CONFIG1	0x1e0
 #define GPMC_PREFETCH_CONFIG2	0x1e4
-#define GPMC_PREFETCH_CONTROL	0x1e8
+#define GPMC_PREFETCH_CONTROL	0x1ec
 #define GPMC_PREFETCH_STATUS	0x1f0
 #define GPMC_ECC_CONFIG		0x1f4
 #define GPMC_ECC_CONTROL	0x1f8

-------------------------------------------------------------------
List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php

Re: [PATCH 02/02] ARM: OMAP: Correcting the gpmc prefetch control register address

[Russell King - ARM Linux]

On Fri, Jun 06, 2008 at 06:21:48PM -0700, Tony Lindgren wrote:
> From: Thara Gopinath <thara@ti.com>
> 
> Correcting the GPMC_PREFETCH_CONTROL register address
> 
> Signed-off-by: Thara Gopinath <thara@ti.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>

Ok.

Re: [PATCH 02/02] ARM: OMAP: Correcting the gpmc prefetch control register address

[Russell King - ARM Linux]

On Fri, Jun 06, 2008 at 06:21:48PM -0700, Tony Lindgren wrote:
> From: Thara Gopinath <thara@ti.com>
> 
> Correcting the GPMC_PREFETCH_CONTROL register address
> 
> Signed-off-by: Thara Gopinath <thara@ti.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>

This looks like something for -rc.

Re: [PATCH 01/02] ARM: OMAP: DMA: Don't mark channel active in omap_enable_channel_irq

[Russell King - ARM Linux]

On Fri, Jun 06, 2008 at 06:21:47PM -0700, Tony Lindgren wrote:
> From: Jarkko Nikula <jarkko.nikula@nokia.com>
> 
> Channel should be marked active only when DMA is really started. Otherwise
> just omap_request_dma, omap_dma_link_lch and omap_dma_unlink_lch will cause
> incorrect dump_stack().
> 
> Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>

Ok.

Re: [PATCH 01/02] ARM: OMAP: DMA: Don't mark channel active in omap_enable_channel_irq

[Russell King - ARM Linux]

On Fri, Jun 06, 2008 at 06:21:47PM -0700, Tony Lindgren wrote:
> From: Jarkko Nikula <jarkko.nikula@nokia.com>
> 
> Channel should be marked active only when DMA is really started. Otherwise
> just omap_request_dma, omap_dma_link_lch and omap_dma_unlink_lch will cause
> incorrect dump_stack().
> 
> Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>

BTW, this looks like something for -rc kernels.

Re: [PATCH 01/02] ARM: OMAP: DMA: Don't mark channel active in omap_enable_channel_irq

[Tony Lindgren]

* Russell King - ARM Linux <linux@arm.linux.org.uk> [080614 11:02]:
> On Fri, Jun 06, 2008 at 06:21:47PM -0700, Tony Lindgren wrote:
> > From: Jarkko Nikula <jarkko.nikula@nokia.com>
> > 
> > Channel should be marked active only when DMA is really started. Otherwise
> > just omap_request_dma, omap_dma_link_lch and omap_dma_unlink_lch will cause
> > incorrect dump_stack().
> > 
> > Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
> > Signed-off-by: Tony Lindgren <tony@atomide.com>
> 
> BTW, this looks like something for -rc kernels.

Yes these two are intended for the -rc kernel. The 0/2 header email got
separated as specifying git-send-email Reply-to option did not quite work..

Can you please pull these two patches from omap-fixes branch:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-fixes

Thanks,

Tony

Re: [PATCH 01/02] ARM: OMAP: DMA: Don't mark channel active in omap_enable_channel_irq

[Russell King - ARM Linux]

On Mon, Jun 16, 2008 at 12:59:41PM +0300, Tony Lindgren wrote:
> * Russell King - ARM Linux <linux@arm.linux.org.uk> [080614 11:02]:
> > On Fri, Jun 06, 2008 at 06:21:47PM -0700, Tony Lindgren wrote:
> > > From: Jarkko Nikula <jarkko.nikula@nokia.com>
> > > 
> > > Channel should be marked active only when DMA is really started. Otherwise
> > > just omap_request_dma, omap_dma_link_lch and omap_dma_unlink_lch will cause
> > > incorrect dump_stack().
> > > 
> > > Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
> > > Signed-off-by: Tony Lindgren <tony@atomide.com>
> > 
> > BTW, this looks like something for -rc kernels.
> 
> Yes these two are intended for the -rc kernel. The 0/2 header email got
> separated as specifying git-send-email Reply-to option did not quite work..
> 
> Can you please pull these two patches from omap-fixes branch:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-fixes

Pulled.