From patchwork Mon Sep 17 10:51:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 1466521 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 0BF2EDF2D8 for ; Mon, 17 Sep 2012 10:54:52 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TDYvO-0003Is-B2; Mon, 17 Sep 2012 10:51:34 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TDYvK-0003Hl-9T for linux-arm-kernel@lists.infradead.org; Mon, 17 Sep 2012 10:51:31 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MAH007SXQ5MQYW0@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 17 Sep 2012 19:51:27 +0900 (KST) X-AuditID: cbfee61a-b7f726d000000ec7-2d-505700af8fa7 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 81.84.03783.FA007505; Mon, 17 Sep 2012 19:51:27 +0900 (KST) Received: from DOKGENEKIM03 ([12.23.120.199]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MAH00EULQ5R7HB0@mmp2.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 17 Sep 2012 19:51:27 +0900 (KST) From: Kukjin Kim To: 'Kukjin Kim' , 'Tomasz Figa' References: <5886686.Vz6SVkoRWm@amdc1227> <503D5ABD.9040801@samsung.com> In-reply-to: <503D5ABD.9040801@samsung.com> Subject: RE: [PATCH] ARM: EXYNOS: Use non-secure MDMA1 Date: Mon, 17 Sep 2012 19:51:26 +0900 Message-id: <050101cd94c2$62febb80$28fc3280$%kim@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac2FeMwTrX9UIpzXTJueLd/ivXUDpAPSMerg Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrJLMWRmVeSWpSXmKPExsVy+t9jQd31DOEBBrtnGllsenyN1YHRY/OS +gDGKC6blNSczLLUIn27BK6MHx/3sRa8kar4MmUxUwPjVLEuRk4OCQETiRNNe5khbDGJC/fW s4HYQgLTGSVuflXtYuQCspcxSaz+fZ0dJMEmoCFx+P0zMFtEwEfiz/OFjCBFzAILGSWev7nM DtHtITHp0FqgBAcHp4C2xNOFgiCmsICZxKp9TiAVLAKqEjc3P2YBCfMK2EqcfFoOEuYVEJT4 MfkeC4jNLKAlsX7ncSYIW15i85q3zCDlEgLqEo/+6oKYIgJGEtsf60FUiEjse/GOcQKj0Cwk g2YhGTQLyaBZSFoWMLKsYhRNLUguKE5KzzXUK07MLS7NS9dLzs/dxAgO4GdSOxhXNlgcYhTg YFTi4TWcFBYgxJpYVlyZe4hRgoNZSYT3wRugEG9KYmVValF+fFFpTmrxIUZpDhYlcV7hT4EB QgLpiSWp2ampBalFMFkmDk6pBkYBroprn50F+y+UryoqfCTtmzHLSCz0ve8Zvsq/t2/7ffL/ U1R48p9q54Mz7mFW8ba3b5kl9BbPs39XOVdkieIJ3+evvXuNAtsY5JZwabLPVZ2W8rf1BcPq VynhZzYtPXjvgy7Pq7+9DybYzoiY5MihM022gmH5t5euq7b3a8cc2+r59leDQb0SS3FGoqEW c1FxIgBFkzzgXAIAAA== X-Spam-Note: CRM114 invocation failed X-Spam-Score: -7.4 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.33 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.5 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: 'linux-samsung-soc' , 'linux-arm-kernel' , 'Boojin Kim' X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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 > > Signed-off-by: Kyungmin Park > > --- > > 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 Subject: [PATCH] ARM: EXYNOS: fix address for EXYNOS4 MDMA1 use non-secure mdma1 address. Reported-by: Tomasz Figa Signed-off-by: Kukjin Kim --- 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