From: kgene.kim@samsung.com (Kukjin Kim)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: EXYNOS: Use non-secure MDMA1
Date: Mon, 17 Sep 2012 19:51:26 +0900 [thread overview]
Message-ID: <050101cd94c2$62febb80$28fc3280$%kim@samsung.com> (raw)
In-Reply-To: <503D5ABD.9040801@samsung.com>
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.
prev parent reply other threads:[~2012-09-17 10:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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='050101cd94c2$62febb80$28fc3280$%kim@samsung.com' \
--to=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox