All of lore.kernel.org
 help / color / mirror / Atom feed
From: Santosh Shilimkar <santosh.shilimkar@ti.com>
To: tony@atomide.com
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	Santosh Shilimkar <santosh.shilimkar@ti.com>,
	Kalle Jokiniemi <kalle.jokiniemi@digia.com>,
	Kevin Hilman <khilman@deeprootsystems.com>
Subject: [PATCH 4/9] omap: sdma: Limit the secure reserve channel fix for omap3
Date: Thu, 18 Feb 2010 14:29:09 +0530	[thread overview]
Message-ID: <1266483554-15044-4-git-send-email-santosh.shilimkar@ti.com> (raw)
In-Reply-To: <1266483554-15044-3-git-send-email-santosh.shilimkar@ti.com>

The commit 'ba50ea7e' reserves DMA channels 0 and 1 on high
security devices, in order to avoid collision between kernel
dma transfers and ROM code dma transfers.

This fix is applicable only for OMAP3 so add an appropriate
check.

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
CC: Kalle Jokiniemi <kalle.jokiniemi@digia.com>
CC: Kevin Hilman <khilman@deeprootsystems.com>
---
 arch/arm/plat-omap/dma.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 5ec96db..049165c 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -2149,7 +2149,8 @@ static int __init omap_init_dma(void)
 			DMA_SYSCONFIG_AUTOIDLE);
 		dma_write(v , OCP_SYSCONFIG);
 		/* reserve dma channels 0 and 1 in high security devices */
-		if (omap_type() != OMAP2_DEVICE_TYPE_GP) {
+		if (cpu_is_omap34xx() &&
+			(omap_type() != OMAP2_DEVICE_TYPE_GP)) {
 			printk(KERN_INFO "Reserving DMA channels 0 and 1 for "
 					"HS ROM code\n");
 			dma_chan[0].dev_id = 0;
-- 
1.6.0.4


WARNING: multiple messages have this Message-ID (diff)
From: santosh.shilimkar@ti.com (Santosh Shilimkar)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/9] omap: sdma: Limit the secure reserve channel fix for omap3
Date: Thu, 18 Feb 2010 14:29:09 +0530	[thread overview]
Message-ID: <1266483554-15044-4-git-send-email-santosh.shilimkar@ti.com> (raw)
In-Reply-To: <1266483554-15044-3-git-send-email-santosh.shilimkar@ti.com>

The commit 'ba50ea7e' reserves DMA channels 0 and 1 on high
security devices, in order to avoid collision between kernel
dma transfers and ROM code dma transfers.

This fix is applicable only for OMAP3 so add an appropriate
check.

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
CC: Kalle Jokiniemi <kalle.jokiniemi@digia.com>
CC: Kevin Hilman <khilman@deeprootsystems.com>
---
 arch/arm/plat-omap/dma.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 5ec96db..049165c 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -2149,7 +2149,8 @@ static int __init omap_init_dma(void)
 			DMA_SYSCONFIG_AUTOIDLE);
 		dma_write(v , OCP_SYSCONFIG);
 		/* reserve dma channels 0 and 1 in high security devices */
-		if (omap_type() != OMAP2_DEVICE_TYPE_GP) {
+		if (cpu_is_omap34xx() &&
+			(omap_type() != OMAP2_DEVICE_TYPE_GP)) {
 			printk(KERN_INFO "Reserving DMA channels 0 and 1 for "
 					"HS ROM code\n");
 			dma_chan[0].dev_id = 0;
-- 
1.6.0.4

  reply	other threads:[~2010-02-18  8:59 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-18  8:59 [PATCH 1/9] omap3/4: uart: fix full-fifo write abort Santosh Shilimkar
2010-02-18  8:59 ` Santosh Shilimkar
2010-02-18  8:59 ` [PATCH 2/9] omap2/3/4: ioremap omap_globals module Santosh Shilimkar
2010-02-18  8:59   ` Santosh Shilimkar
2010-02-18  8:59   ` [PATCH 3/9] omap4: sdma: Enable the idle modes on omap4 Santosh Shilimkar
2010-02-18  8:59     ` Santosh Shilimkar
2010-02-18  8:59     ` Santosh Shilimkar [this message]
2010-02-18  8:59       ` [PATCH 4/9] omap: sdma: Limit the secure reserve channel fix for omap3 Santosh Shilimkar
2010-02-18  8:59       ` [PATCH 5/9] omap4: Fix omap_type() for omap4 Santosh Shilimkar
2010-02-18  8:59         ` Santosh Shilimkar
2010-02-18  8:59         ` [PATCH 6/9] omap3/4: Remove overlapping mapping of L4_WKUP io space Santosh Shilimkar
2010-02-18  8:59           ` Santosh Shilimkar
2010-02-18  8:59           ` [PATCH 7/9] omap4: Add auto-generated irq and dma headers Santosh Shilimkar
2010-02-18  8:59             ` Santosh Shilimkar
2010-02-18  8:59             ` [PATCH 8/9] omap4: Use dma line defines from dma-44xx.h Santosh Shilimkar
2010-02-18  8:59               ` Santosh Shilimkar
2010-02-18  8:59               ` [PATCH 9/9] omap4: Use irq line defines from irq-44xx.h Santosh Shilimkar
2010-02-18  8:59                 ` Santosh Shilimkar
2010-02-22 22:13               ` [PATCH 8/9] omap4: Use dma line defines from dma-44xx.h Tony Lindgren
2010-02-22 22:13                 ` Tony Lindgren
2010-02-18 17:23             ` [PATCH 7/9] omap4: Add auto-generated irq and dma headers Paul Walmsley
2010-02-18 17:23               ` Paul Walmsley
2010-02-18 17:33               ` Shilimkar, Santosh
2010-02-18 17:33                 ` Shilimkar, Santosh
2010-02-19  5:10               ` Shilimkar, Santosh
2010-02-19  5:10                 ` Shilimkar, Santosh
2010-02-18 17:35   ` [PATCH 2/9] omap2/3/4: ioremap omap_globals module Paul Walmsley
2010-02-18 17:35     ` Paul Walmsley
2010-02-18 22:24   ` Kevin Hilman
2010-02-18 22:24     ` Kevin Hilman
2010-02-19  5:13     ` Shilimkar, Santosh
2010-02-19  5:13       ` Shilimkar, Santosh
2010-02-19  5:25 ` [PATCH 1/9] omap3/4: uart: fix full-fifo write abort Shilimkar, Santosh
2010-02-19  5:25   ` Shilimkar, Santosh
2010-02-22 21:39   ` Tony Lindgren
2010-02-22 21:39     ` Tony Lindgren
2010-02-22 23:07     ` Tony Lindgren
2010-02-22 23:07       ` Tony Lindgren
2010-02-23  5:42       ` Shilimkar, Santosh
2010-02-23  5:42         ` Shilimkar, Santosh
2010-02-23  7:19       ` Shilimkar, Santosh
2010-02-23  7:19         ` Shilimkar, Santosh
2010-02-23 23:12         ` Tony Lindgren
2010-02-23 23:12           ` Tony Lindgren
2010-02-24  4:09           ` Shilimkar, Santosh
2010-02-24  4:09             ` Shilimkar, Santosh
2010-02-23 16:17     ` Shilimkar, Santosh
2010-02-23 16:17       ` Shilimkar, Santosh
2010-02-23 18:54       ` Tony Lindgren
2010-02-23 18:54         ` Tony Lindgren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1266483554-15044-4-git-send-email-santosh.shilimkar@ti.com \
    --to=santosh.shilimkar@ti.com \
    --cc=kalle.jokiniemi@digia.com \
    --cc=khilman@deeprootsystems.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.