Skip to contentSkip to conversation

ARM: EXYNOS: Use non-secure MDMA1

PATCH New Tomasz Figa 3 participants 4 messages Aug 28, 2012 – Sep 17, 2012

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm Samsung Exynos
lore
Share & tools
lore

Tomasz Figa

author
#0 lore raw

PATCH 1/1 ARM: EXYNOS: Use non-secure MDMA1

Using secure MDMA1 on TrustZone-enabled boards causes early boot crash, so use non-secure instead.

Signed-off-by Tomasz Figa <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
---
 arch/arm/mach-exynos/dma.c              | 2 +-
 arch/arm/mach-exynos/include/mach/map.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
arch/arm/mach-exynos/dma.c +1 -1
index f60b66d..8858df5 100644
@@ -261,7 +261,7 @@ static struct dma_pl330_platdata exynos_mdma1_pdata = {
 };
 
 static AMBA_AHB_DEVICE(exynos_mdma1,  "dma-pl330.2", 0x00041330,
-	EXYNOS4_PA_MDMA1, {EXYNOS4_IRQ_MDMA1}, &exynos_mdma1_pdata);
+	EXYNOS4_PA_NS_MDMA1, {EXYNOS4_IRQ_MDMA1}, &exynos_mdma1_pdata);
 
 static int __init exynos_dma_init(void)
 {
arch/arm/mach- renamed from arch/arm/mach-exynos/include/mach/map.h +0 -0

exynos/include/mach/map.h
index 51943f2..5df5910 100644

arch/arm/mach-exynos/include/mach/map.h +2 -1
@@ -89,7 +89,8 @@
 #define EXYNOS4_PA_L2CC			0x10502000
 
 #define EXYNOS4_PA_MDMA0		0x10810000
-#define EXYNOS4_PA_MDMA1		0x12840000
+#define EXYNOS4_PA_S_MDMA1		0x12840000
+#define EXYNOS4_PA_NS_MDMA1		0x12850000
 #define EXYNOS4_PA_PDMA0		0x12680000
 #define EXYNOS4_PA_PDMA1		0x12690000
 #define EXYNOS5_PA_MDMA0		0x10800000
Signature · 1 line
1.7.12
#1 lore raw

PATCH 1/1 ARM: EXYNOS: Use non-secure MDMA1

Quoted 29 lines · Tomasz Figa

Using secure MDMA1 on TrustZone-enabled boards causes early boot crash, so use non-secure instead.

Signed-off-by Tomasz Figa<[email protected]>
Signed-off-by Kyungmin Park<[email protected]>
---
  arch/arm/mach-exynos/dma.c              | 2 +-
  arch/arm/mach-exynos/include/mach/map.h | 3 ++-
  2 files changed, 3 insertions(+), 2 deletions(-)
arch/arm/mach-exynos/dma.c +1 -1
index f60b66d..8858df5 100644
@@ -261,7 +261,7 @@ static struct dma_pl330_platdata exynos_mdma1_pdata = {
  };
 
  static AMBA_AHB_DEVICE(exynos_mdma1,  "dma-pl330.2", 0x00041330,
-	EXYNOS4_PA_MDMA1, {EXYNOS4_IRQ_MDMA1},&exynos_mdma1_pdata);
+	EXYNOS4_PA_NS_MDMA1, {EXYNOS4_IRQ_MDMA1},&exynos_mdma1_pdata);
 
  static int __init exynos_dma_init(void)
  {
arch/arm/mach- renamed from arch/arm/mach-exynos/include/mach/map.h +0 -0

exynos/include/mach/map.h
index 51943f2..5df5910 100644

arch/arm/mach-exynos/include/mach/map.h line 96

Quoted 9 lines
arch/arm/mach-exynos/include/mach/map.h +2 -1
@@ -89,7 +89,8 @@
  #define EXYNOS4_PA_L2CC			0x10502000
 
  #define EXYNOS4_PA_MDMA0		0x10810000
-#define EXYNOS4_PA_MDMA1		0x12840000
+#define EXYNOS4_PA_S_MDMA1		0x12840000
+#define EXYNOS4_PA_NS_MDMA1		0x12850000
  #define EXYNOS4_PA_PDMA0		0x12680000
  #define EXYNOS4_PA_PDMA1		0x12690000
  #define EXYNOS5_PA_MDMA0		0x10800000

Cc'ed Boojin Kim.

Well, just fix the address is enough like exynos5 stuff? I don't have any idea why we need secure mdma and non-secure mdma both here...

(quoted diff) +0 -0

b/arch/arm/mach-exynos/include/mach/map.h
index c72b675..c941053 100644

arch/arm/mach-exynos/include/mach/map.h +1 -1
@@ -89,7 +89,7 @@
  #define EXYNOS4_PA_L2CC                        0x10502000
 
  #define EXYNOS4_PA_MDMA0		0x10810000
-#define EXYNOS4_PA_MDMA1		0x12840000
+#define EXYNOS4_PA_MDMA1		0x12850000
  #define EXYNOS4_PA_PDMA0		0x12680000
  #define EXYNOS4_PA_PDMA1		0x12690000
  #define EXYNOS5_PA_MDMA0		0x10800000

--

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

#2 lore raw

PATCH 1/1 ARM: EXYNOS: Use non-secure MDMA1

Quoted 43 lines · Kukjin Kim
Quoted 30 lines · Tomasz Figa

Using secure MDMA1 on TrustZone-enabled boards causes early boot crash, so use non-secure instead.

Signed-off-by Tomasz Figa<[email protected]>
Signed-off-by Kyungmin Park<[email protected]>
---
  arch/arm/mach-exynos/dma.c              | 2 +-
  arch/arm/mach-exynos/include/mach/map.h | 3 ++-
  2 files changed, 3 insertions(+), 2 deletions(-)
arch/arm/mach-exynos/dma.c +1 -1
index f60b66d..8858df5 100644
@@ -261,7 +261,7 @@ static struct dma_pl330_platdata exynos_mdma1_pdata =
 {
  };
 
  static AMBA_AHB_DEVICE(exynos_mdma1,  "dma-pl330.2", 0x00041330,
-	EXYNOS4_PA_MDMA1, {EXYNOS4_IRQ_MDMA1},&exynos_mdma1_pdata);
+	EXYNOS4_PA_NS_MDMA1, {EXYNOS4_IRQ_MDMA1},&exynos_mdma1_pdata);
 
  static int __init exynos_dma_init(void)

  {
arch/arm/mach- renamed from arch/arm/mach-exynos/include/mach/map.h +0 -0

exynos/include/mach/map.h
index 51943f2..5df5910 100644

arch/arm/mach-exynos/include/mach/map.h line 96

Quoted 9 lines
arch/arm/mach-exynos/include/mach/map.h +2 -1
@@ -89,7 +89,8 @@
  #define EXYNOS4_PA_L2CC			0x10502000
 
  #define EXYNOS4_PA_MDMA0		0x10810000
-#define EXYNOS4_PA_MDMA1		0x12840000
+#define EXYNOS4_PA_S_MDMA1		0x12840000
+#define EXYNOS4_PA_NS_MDMA1		0x12850000
  #define EXYNOS4_PA_PDMA0		0x12680000
  #define EXYNOS4_PA_PDMA1		0x12690000
  #define EXYNOS5_PA_MDMA0		0x10800000

Cc'ed Boojin Kim.

Quoted 2 lines

Well, just fix the address is enough like exynos5 stuff? I don't have any idea why we need secure mdma and non-secure mdma both here...

Did you see the datasheet and your team codes?

Quoted 30 lines
arch/arm/mach-exynos/include/mach/map.h +1 -2
index c72b675..c941053 100644
@@ -89,7 +89,7 @@
  #define EXYNOS4_PA_L2CC                        0x10502000
 
  #define EXYNOS4_PA_MDMA0		0x10810000
-#define EXYNOS4_PA_MDMA1		0x12840000
+#define EXYNOS4_PA_MDMA1		0x12850000
  #define EXYNOS4_PA_PDMA0		0x12680000
  #define EXYNOS4_PA_PDMA1		0x12690000
  #define EXYNOS5_PA_MDMA0		0x10800000
--

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#3 lore raw

PATCH 1/1 ARM: EXYNOS: Use non-secure MDMA1

In reply to Kukjin Kim
Quoted 53 lines · Kukjin Kim

arch/arm/mach-exynos/dma.c static struct dma_pl330_platdata exynos_mdma1_pdata

Quoted 15 lines · Tomasz Figa

Using secure MDMA1 on TrustZone-enabled boards causes early boot crash, so use non-secure instead.

Signed-off-by Tomasz Figa<[email protected]>
Signed-off-by Kyungmin Park<[email protected]>
---
  arch/arm/mach-exynos/dma.c              | 2 +-
  arch/arm/mach-exynos/include/mach/map.h | 3 ++-
  2 files changed, 3 insertions(+), 2 deletions(-)
arch/arm/mach-exynos/dma.c +0 -0
index f60b66d..8858df5 100644
@@ -261,7 +261,7 @@ static struct dma_pl330_platdata exynos_mdma1_pdata

= {

Quoted 14 lines
arch/arm/mach-exynos/dma.c +1 -1
  };
 
  static AMBA_AHB_DEVICE(exynos_mdma1,  "dma-pl330.2", 0x00041330,
-	EXYNOS4_PA_MDMA1, {EXYNOS4_IRQ_MDMA1},&exynos_mdma1_pdata);
+	EXYNOS4_PA_NS_MDMA1, {EXYNOS4_IRQ_MDMA1},&exynos_mdma1_pdata);
 
  static int __init exynos_dma_init(void)
  {
arch/arm/mach- renamed from arch/arm/mach-exynos/include/mach/map.h +0 -0

exynos/include/mach/map.h
index 51943f2..5df5910 100644

arch/arm/mach-exynos/include/mach/map.h line 96

Quoted 9 lines
arch/arm/mach-exynos/include/mach/map.h +2 -1
@@ -89,7 +89,8 @@
  #define EXYNOS4_PA_L2CC			0x10502000
 
  #define EXYNOS4_PA_MDMA0		0x10810000
-#define EXYNOS4_PA_MDMA1		0x12840000
+#define EXYNOS4_PA_S_MDMA1		0x12840000
+#define EXYNOS4_PA_NS_MDMA1		0x12850000
  #define EXYNOS4_PA_PDMA0		0x12680000
  #define EXYNOS4_PA_PDMA1		0x12690000
  #define EXYNOS5_PA_MDMA0		0x10800000

Cc'ed Boojin Kim.

Well, just fix the address is enough like exynos5 stuff? I don't have any idea why we need secure mdma and non-secure mdma both here...

arch/arm/mach-exynos/include/mach/map.h +0 -0
index c72b675..c941053 100644

arch/arm/mach-exynos/include/mach/map.h

Quoted 9 lines
arch/arm/mach-exynos/include/mach/map.h +1 -2
@@ -89,7 +89,7 @@
  #define EXYNOS4_PA_L2CC                        0x10502000
 
  #define EXYNOS4_PA_MDMA0		0x10810000
-#define EXYNOS4_PA_MDMA1		0x12840000
+#define EXYNOS4_PA_MDMA1		0x12850000
  #define EXYNOS4_PA_PDMA0		0x12680000
  #define EXYNOS4_PA_PDMA1		0x12690000
  #define EXYNOS5_PA_MDMA0		0x10800000
--

From: Kukjin Kim <[email protected]>
Subject: [PATCH] ARM: EXYNOS: fix address for EXYNOS4 MDMA1

use non-secure mdma1 address.

Reported-by Tomasz Figa <[email protected]>
Signed-off-by Kukjin Kim <[email protected]>
---
 arch/arm/mach-exynos/include/mach/map.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
(quoted diff) +0 -0

b/arch/arm/mach-exynos/include/mach/map.h index c72b675..c941053 100644

arch/arm/mach-exynos/include/mach/map.h +1 -1
@@ -89,7 +89,7 @@
 #define EXYNOS4_PA_L2CC			0x10502000
 
 #define EXYNOS4_PA_MDMA0		0x10810000
-#define EXYNOS4_PA_MDMA1		0x12840000
+#define EXYNOS4_PA_MDMA1		0x12850000
 #define EXYNOS4_PA_PDMA0		0x12680000
 #define EXYNOS4_PA_PDMA1		0x12690000
 #define EXYNOS5_PA_MDMA0		0x10800000
Signature · 9 lines
1.7.4.1

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.