From patchwork Fri Sep 26 10:43:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonyoung Shim X-Patchwork-Id: 4981501 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E3F24BEEA6 for ; Fri, 26 Sep 2014 10:43:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E048020204 for ; Fri, 26 Sep 2014 10:43:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 62D84201ED for ; Fri, 26 Sep 2014 10:43:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753915AbaIZKnz (ORCPT ); Fri, 26 Sep 2014 06:43:55 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:31775 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751418AbaIZKny (ORCPT ); Fri, 26 Sep 2014 06:43:54 -0400 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NCI000BV8H47ID0@mailout2.samsung.com> for linux-samsung-soc@vger.kernel.org; Fri, 26 Sep 2014 19:43:52 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.112]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id AB.29.11124.86345245; Fri, 26 Sep 2014 19:43:52 +0900 (KST) X-AuditID: cbfee68e-f79b46d000002b74-1d-54254368b1dc Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 93.2C.20081.86345245; Fri, 26 Sep 2014 19:43:52 +0900 (KST) Received: from localhost.localdomain ([10.88.100.151]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NCI00B5O8H4CQ40@mmp2.samsung.com>; Fri, 26 Sep 2014 19:43:52 +0900 (KST) From: Joonyoung Shim To: linux-samsung-soc@vger.kernel.org Cc: cw00.choi@samsung.com, kgene.kim@samsung.com, m.szyprowski@samsung.com, linux-arm-kernel@lists.infradead.org, tomasz.figa@gmail.com Subject: [PATCH] ARM: exynos: fix UART address selection for DEBUG_LL Date: Fri, 26 Sep 2014 19:43:54 +0900 Message-id: <1411728234-29705-1-git-send-email-jy0922.shim@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrJLMWRmVeSWpSXmKPExsWyRsSkQDfDWTXEYNpRZYvrX56zWvQuuMpm senxNVaLGef3MVmsPXKX3WLVrj+MDmweO2fdZffYvKTeo2/LKkaPz5vkAliiuGxSUnMyy1KL 9O0SuDI6X3SxFZxhrzhz8R1TA2MXWxcjJ4eEgIlE7/FzrBC2mMSFe+uB4lwcQgJLGSU2T3vJ AlN0Ydk9VojEdEaJs02/oaramCRO7b0OVsUmoCdxZ9txJhBbREBV4nPbAnaQImaBTkaJK3uO gu0TFnCVOLv+FdAoDg4WoKLJnWUgYV4Bd4n9n88wQ2yTkzh5bDLYNgmB92wS15/0gd3HIiAg 8W3yIRaQXgkBWYlNB6DqJSUOrrjBMoFRcAEjwypG0dSC5ILipPQiI73ixNzi0rx0veT83E2M wBA9/e9Z3w7GmwesDzEKcDAq8fDeWKcSIsSaWFZcmXuI0RRow0RmKdHkfGAk5JXEGxqbGVmY mpgaG5lbmimJ8yZI/QwWEkhPLEnNTk0tSC2KLyrNSS0+xMjEwSnVwJh6a6WSs9dUA8sX+b87 ejhu8HvavTreov5CxevfbXsD7WjF95zz9XWDFL4sXpHsfvlYzA+H7ULfXYLj9EO0xaRkJ2m/ sLe4NaX7Eu+n6c8En5w65+Yg3O1ymn/xlFrOym86YS/C6jefvtfyJ2y/paunRHDMQr+a1ED5 qxpFSd/rCtJsy63/KrEUZyQaajEXFScCAGFMYaZMAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmkeLIzCtJLcpLzFFi42I5/e+xoG6Gs2qIwfRtMhbXvzxntehdcJXN YtPja6wWM87vY7JYe+Quu8WqXX8YHdg8ds66y+6xeUm9R9+WVYwenzfJBbBENTDaZKQmpqQW KaTmJeenZOal2yp5B8c7x5uaGRjqGlpamCsp5CXmptoqufgE6Lpl5gAtV1IoS8wpBQoFJBYX K+nbYZoQGuKmawHTGKHrGxIE12NkgAYS1jBmdL7oYis4w15x5uI7pgbGLrYuRk4OCQETiQvL 7rFC2GISF+6tB4pzcQgJTGeUONv0G8ppY5I4tfc6C0gVm4CexJ1tx5lAbBEBVYnPbQvYQYqY BToZJa7sOQo2VljAVeLs+ldAYzk4WICKJneWgYR5Bdwl9n8+wwyxTU7i5LHJrBMYuRcwMqxi FE0tSC4oTkrPNdQrTswtLs1L10vOz93ECI6AZ1I7GFc2WBxiFOBgVOLhvbFOJUSINbGsuDL3 EKMEB7OSCO8dI9UQId6UxMqq1KL8+KLSnNTiQ4ymQMsnMkuJJucDozOvJN7Q2MTMyNLI3NDC yNhcSZz3QKt1oJBAemJJanZqakFqEUwfEwenVAPjhYvvfjZwKZszebv3K6TzNt74ZSsxU3dx ONtS5bM8KrNLf6nO673e7dRQfD1p793WJQFH11u62Pd8D7udLV3TVcHMNm3jvwdPUo77C87W ljJZef3d83V+t9m+2ubKnPG1Zu51CecrTVd+m7BrPu+PVWu1ImJcLdc8OfBiqZrbx7jTt58E Lt+jxFKckWioxVxUnAgATBBBzJYCAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The exynos5 SoCs using A15+A7 can boot to A15 or A7. If it boots using A7, it can't detect right UART physical address only the part number of CP15. It's possible to solve as checking Cluster ID additionally. Signed-off-by: Joonyoung Shim --- arch/arm/include/debug/exynos.S | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/debug/exynos.S b/arch/arm/include/debug/exynos.S index b17fdb7..60bf3c2 100644 --- a/arch/arm/include/debug/exynos.S +++ b/arch/arm/include/debug/exynos.S @@ -24,7 +24,11 @@ mrc p15, 0, \tmp, c0, c0, 0 and \tmp, \tmp, #0xf0 teq \tmp, #0xf0 @@ A15 - ldreq \rp, =EXYNOS5_PA_UART + beq 100f + mrc p15, 0, \tmp, c0, c0, 5 + and \tmp, \tmp, #0xf00 + teq \tmp, #0x100 @@ A15 + A7 but boot to A7 +100: ldreq \rp, =EXYNOS5_PA_UART movne \rp, #EXYNOS4_PA_UART @@ EXYNOS4 ldr \rv, =S3C_VA_UART #if CONFIG_DEBUG_S3C_UART != 0