* [PATCH] ARM: EXYNOS: Use non-secure MDMA1
@ 2012-08-28 11:08 Tomasz Figa
2012-08-28 23:56 ` Kukjin Kim
0 siblings, 1 reply; 4+ messages in thread
From: Tomasz Figa @ 2012-08-28 11:08 UTC (permalink / raw)
To: linux-arm-kernel
Using secure MDMA1 on TrustZone-enabled boards causes early boot crash,
so use non-secure instead.
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
arch/arm/mach-exynos/dma.c | 2 +-
arch/arm/mach-exynos/include/mach/map.h | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-exynos/dma.c b/arch/arm/mach-exynos/dma.c
index f60b66d..8858df5 100644
--- a/arch/arm/mach-exynos/dma.c
+++ b/arch/arm/mach-exynos/dma.c
@@ -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)
{
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-
exynos/include/mach/map.h
index 51943f2..5df5910 100644
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -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
--
1.7.12
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] ARM: EXYNOS: Use non-secure MDMA1
2012-08-28 11:08 [PATCH] ARM: EXYNOS: Use non-secure MDMA1 Tomasz Figa
@ 2012-08-28 23:56 ` Kukjin Kim
2012-08-29 0:06 ` Kyungmin Park
2012-09-17 10:51 ` Kukjin Kim
0 siblings, 2 replies; 4+ messages in thread
From: Kukjin Kim @ 2012-08-28 23:56 UTC (permalink / raw)
To: linux-arm-kernel
On 08/28/12 04:08, Tomasz Figa wrote:
> Using secure MDMA1 on TrustZone-enabled boards causes early boot crash,
> so use non-secure instead.
>
> Signed-off-by: Tomasz Figa<t.figa@samsung.com>
> Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com>
> ---
> arch/arm/mach-exynos/dma.c | 2 +-
> arch/arm/mach-exynos/include/mach/map.h | 3 ++-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/dma.c b/arch/arm/mach-exynos/dma.c
> index f60b66d..8858df5 100644
> --- a/arch/arm/mach-exynos/dma.c
> +++ b/arch/arm/mach-exynos/dma.c
> @@ -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)
> {
> diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-
> exynos/include/mach/map.h
> index 51943f2..5df5910 100644
> --- a/arch/arm/mach-exynos/include/mach/map.h
> +++ b/arch/arm/mach-exynos/include/mach/map.h
> @@ -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...
diff --git a/arch/arm/mach-exynos/include/mach/map.h
b/arch/arm/mach-exynos/include/mach/map.h
index c72b675..c941053 100644
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -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 <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] ARM: EXYNOS: Use non-secure MDMA1
2012-08-28 23:56 ` Kukjin Kim
@ 2012-08-29 0:06 ` Kyungmin Park
2012-09-17 10:51 ` Kukjin Kim
1 sibling, 0 replies; 4+ messages in thread
From: Kyungmin Park @ 2012-08-29 0:06 UTC (permalink / raw)
To: linux-arm-kernel
On 8/29/12, Kukjin Kim <kgene.kim@samsung.com> wrote:
> On 08/28/12 04:08, Tomasz Figa wrote:
>> Using secure MDMA1 on TrustZone-enabled boards causes early boot crash,
>> so use non-secure instead.
>>
>> Signed-off-by: Tomasz Figa<t.figa@samsung.com>
>> Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com>
>> ---
>> arch/arm/mach-exynos/dma.c | 2 +-
>> arch/arm/mach-exynos/include/mach/map.h | 3 ++-
>> 2 files changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/mach-exynos/dma.c b/arch/arm/mach-exynos/dma.c
>> index f60b66d..8858df5 100644
>> --- a/arch/arm/mach-exynos/dma.c
>> +++ b/arch/arm/mach-exynos/dma.c
>> @@ -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)
>> {
>> diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-
>> exynos/include/mach/map.h
>> index 51943f2..5df5910 100644
>> --- a/arch/arm/mach-exynos/include/mach/map.h
>> +++ b/arch/arm/mach-exynos/include/mach/map.h
>> @@ -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...
Did you see the datasheet and your team codes?
>
> diff --git a/arch/arm/mach-exynos/include/mach/map.h
> b/arch/arm/mach-exynos/include/mach/map.h
> index c72b675..c941053 100644
> --- a/arch/arm/mach-exynos/include/mach/map.h
> +++ b/arch/arm/mach-exynos/include/mach/map.h
> @@ -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 <kgene.kim@samsung.com>, 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
>
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH] ARM: EXYNOS: Use non-secure MDMA1
2012-08-28 23:56 ` Kukjin Kim
2012-08-29 0:06 ` Kyungmin Park
@ 2012-09-17 10:51 ` Kukjin Kim
1 sibling, 0 replies; 4+ messages in thread
From: Kukjin Kim @ 2012-09-17 10:51 UTC (permalink / raw)
To: linux-arm-kernel
Kukjin Kim wrote:
>
> On 08/28/12 04:08, Tomasz Figa wrote:
> > Using secure MDMA1 on TrustZone-enabled boards causes early boot crash,
> > so use non-secure instead.
> >
> > Signed-off-by: Tomasz Figa<t.figa@samsung.com>
> > Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com>
> > ---
> > arch/arm/mach-exynos/dma.c | 2 +-
> > arch/arm/mach-exynos/include/mach/map.h | 3 ++-
> > 2 files changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/mach-exynos/dma.c b/arch/arm/mach-exynos/dma.c
> > index f60b66d..8858df5 100644
> > --- a/arch/arm/mach-exynos/dma.c
> > +++ b/arch/arm/mach-exynos/dma.c
> > @@ -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)
> > {
> > diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-
> > exynos/include/mach/map.h
> > index 51943f2..5df5910 100644
> > --- a/arch/arm/mach-exynos/include/mach/map.h
> > +++ b/arch/arm/mach-exynos/include/mach/map.h
> > @@ -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...
>
> diff --git a/arch/arm/mach-exynos/include/mach/map.h
> b/arch/arm/mach-exynos/include/mach/map.h
> index c72b675..c941053 100644
> --- a/arch/arm/mach-exynos/include/mach/map.h
> +++ b/arch/arm/mach-exynos/include/mach/map.h
> @@ -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 <kgene.kim@samsung.com>
Subject: [PATCH] ARM: EXYNOS: fix address for EXYNOS4 MDMA1
use non-secure mdma1 address.
Reported-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
---
arch/arm/mach-exynos/include/mach/map.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-exynos/include/mach/map.h
b/arch/arm/mach-exynos/include/mach/map.h
index c72b675..c941053 100644
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -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
--
1.7.4.1
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-09-17 10:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-28 11:08 [PATCH] ARM: EXYNOS: Use non-secure MDMA1 Tomasz Figa
2012-08-28 23:56 ` Kukjin Kim
2012-08-29 0:06 ` Kyungmin Park
2012-09-17 10:51 ` Kukjin Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox