[PATCH 1/2] omap: iommu: make iva2 iommu selectable
From: Felipe Contreras felipe.contre...@nokia.com
It seems dsp-link will do this, and tidspbridge too at some point, but
right now it's not possible to select CONFIG_MPU_BRIDGE_IOMMU.
Cc: Fernando Guzman Lugo fernando.l...@ti.com
Cc: Yogesh Marathe yogesh_mara...@ti.com
Signed-off-by: Felipe Contreras felipe.contre...@nokia.com
---
arch/arm/mach-omap2/omap-iommu.c |2 +-
arch/arm/plat-omap/Kconfig |3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
index f5a1aad..adc0904 100644
--- a/arch/arm/mach-omap2/omap-iommu.c
+++ b/arch/arm/mach-omap2/omap-iommu.c
@@ -35,7 +35,7 @@ static struct iommu_device omap3_devices[] = {
.clk_name = cam_ick,
},
},
-#if defined(CONFIG_MPU_BRIDGE_IOMMU)
+#if defined(CONFIG_OMAP_IOMMU_IVA2)
{
.base = 0x5d00,
.irq = 28,
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index e39a417..e0b41b6 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -109,6 +109,9 @@ config OMAP_IOMMU_DEBUG
Say N unless you know you need this.
+config OMAP_IOMMU_IVA2
+ bool
+
choice
prompt System timer
default OMAP_32K_TIMER if !ARCH_OMAP15XX
--
1.7.3.1.2.g7fe2b
--
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 1/2] omap: iommu: make iva2 iommu selectable
From: ext Felipe Contreras felipe.contre...@gmail.com
Subject: [PATCH 1/2] omap: iommu: make iva2 iommu selectable
Date: Mon, 11 Oct 2010 11:53:49 +0200
From: Felipe Contreras felipe.contre...@nokia.com
It seems dsp-link will do this, and tidspbridge too at some point, but
right now it's not possible to select CONFIG_MPU_BRIDGE_IOMMU.
Why does it have to be selectable?
Please Cc: linux-arm-ker...@lists.infradead.org too.
Cc: Fernando Guzman Lugo fernando.l...@ti.com
Cc: Yogesh Marathe yogesh_mara...@ti.com
Signed-off-by: Felipe Contreras felipe.contre...@nokia.com
---
arch/arm/mach-omap2/omap-iommu.c |2 +-
arch/arm/plat-omap/Kconfig |3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/omap-iommu.c
b/arch/arm/mach-omap2/omap-iommu.c
index f5a1aad..adc0904 100644
--- a/arch/arm/mach-omap2/omap-iommu.c
+++ b/arch/arm/mach-omap2/omap-iommu.c
@@ -35,7 +35,7 @@ static struct iommu_device omap3_devices[] = {
.clk_name = cam_ick,
},
},
-#if defined(CONFIG_MPU_BRIDGE_IOMMU)
+#if defined(CONFIG_OMAP_IOMMU_IVA2)
{
.base = 0x5d00,
.irq = 28,
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index e39a417..e0b41b6 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -109,6 +109,9 @@ config OMAP_IOMMU_DEBUG
Say N unless you know you need this.
+config OMAP_IOMMU_IVA2
+ bool
+
choice
prompt System timer
default OMAP_32K_TIMER if !ARCH_OMAP15XX
--
1.7.3.1.2.g7fe2b
--
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 1/2] omap: iommu: make iva2 iommu selectable
On Mon, Oct 11, 2010 at 3:28 PM, Hiroshi DOYU hiroshi.d...@nokia.com wrote: From: ext Felipe Contreras felipe.contre...@gmail.com Subject: [PATCH 1/2] omap: iommu: make iva2 iommu selectable Date: Mon, 11 Oct 2010 11:53:49 +0200 From: Felipe Contreras felipe.contre...@nokia.com It seems dsp-link will do this, and tidspbridge too at some point, but right now it's not possible to select CONFIG_MPU_BRIDGE_IOMMU. Why does it have to be selectable? You mean why is it desirable to turn it off? Right now there's a mess of tidspbridge branches, some work, some don't, some have migrated to iommu, some don't. In mainline all this, plus the status on dsp-link, should be irrelevant, a configuration solves all the issues. Once the iommu migration works (haven't managed to get it working myself), and it has been merged into mainline, then we can think about enabling it unconditionally. In the meantime, enabling unconditionally would break the tidspbridge that is in staging (mainline). Please Cc: linux-arm-ker...@lists.infradead.org too. Will do, after you reply the above. -- Felipe Contreras -- 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 1/2] omap: iommu: make iva2 iommu selectable
-Original Message- From: Felipe Contreras [mailto:felipe.contre...@gmail.com] Sent: Monday, October 11, 2010 8:00 AM To: Hiroshi DOYU Cc: linux-omap@vger.kernel.org; g...@kroah.com; felipe.contre...@nokia.com; Guzman Lugo, Fernando; Marathe, Yogesh; linux-arm-ker...@lists.infradead.org Subject: Re: [PATCH 1/2] omap: iommu: make iva2 iommu selectable On Mon, Oct 11, 2010 at 3:28 PM, Hiroshi DOYU hiroshi.d...@nokia.com wrote: From: ext Felipe Contreras felipe.contre...@gmail.com Subject: [PATCH 1/2] omap: iommu: make iva2 iommu selectable Date: Mon, 11 Oct 2010 11:53:49 +0200 From: Felipe Contreras felipe.contre...@nokia.com It seems dsp-link will do this, and tidspbridge too at some point, but right now it's not possible to select CONFIG_MPU_BRIDGE_IOMMU. Why does it have to be selectable? You mean why is it desirable to turn it off? Right now there's a mess of tidspbridge branches, some work, some don't, some have migrated to iommu, some don't. In mainline all this, plus the status on dsp-link, should be irrelevant, a configuration solves all the issues. Once the iommu migration works (haven't managed to get it working myself), and it has been merged into mainline, then we can think about enabling it unconditionally. In the meantime, enabling unconditionally would break the tidspbridge that is in staging (mainline). What is the problem enabling unconditionally? The iva2 iommu does not start working until you call iommu_get. So if for some reason you are using the dspbridge with custom Iommu implementation it should not cause any collision with Iommu module. Regards, Fernando. Please Cc: linux-arm-ker...@lists.infradead.org too. Will do, after you reply the above. -- Felipe Contreras -- 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 1/2] omap: iommu: make iva2 iommu selectable
On Mon, Oct 11, 2010 at 6:54 PM, Guzman Lugo, Fernando fernando.l...@ti.com wrote: Once the iommu migration works (haven't managed to get it working myself), and it has been merged into mainline, then we can think about enabling it unconditionally. In the meantime, enabling unconditionally would break the tidspbridge that is in staging (mainline). What is the problem enabling unconditionally? The iva2 iommu does not start working until you call iommu_get. So if for some reason you are using the dspbridge with custom Iommu implementation it should not cause any collision with Iommu module. Read the code below (omap_iommu_init), the resources are registered so nobody else can use them. This caused problems multiple times inside Nokia, which is what motivated to write the patch in the first place[1]. [1] http://thread.gmane.org/gmane.linux.ports.arm.kernel/58302/focus=58305 -- Felipe Contreras -- 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
