From patchwork Fri Nov 4 03:39:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Dubey X-Patchwork-Id: 9411791 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 12A6D60585 for ; Fri, 4 Nov 2016 03:36:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0856C2AF1B for ; Fri, 4 Nov 2016 03:36:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F11422AF73; Fri, 4 Nov 2016 03:36:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6049A2AF1B for ; Fri, 4 Nov 2016 03:36:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933216AbcKDDgk (ORCPT ); Thu, 3 Nov 2016 23:36:40 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:59106 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932909AbcKDDgk (ORCPT ); Thu, 3 Nov 2016 23:36:40 -0400 Received: from epcpsbgm1new.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OG301B3OM0UEWB0@mailout1.samsung.com> for linux-samsung-soc@vger.kernel.org; Fri, 04 Nov 2016 12:36:38 +0900 (KST) X-AuditID: cbfee61a-f79916d0000062de-3b-581c02460ca6 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id 79.B5.25310.6420C185; Fri, 4 Nov 2016 12:36:38 +0900 (KST) Received: from pankaj.sisodomain.com ([107.108.83.125]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OG300DA1M0PR660@mmp2.samsung.com>; Fri, 04 Nov 2016 12:36:38 +0900 (KST) From: Pankaj Dubey To: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: krzk@kernel.org, kgene@kernel.org, thomas.ab@samsung.com, Pankaj Dubey Subject: [PATCH 3/4] ARM: EXYNOS: Remove static mapping of SCU SFR Date: Fri, 04 Nov 2016 09:09:23 +0530 Message-id: <1478230764-13748-4-git-send-email-pankaj.dubey@samsung.com> X-Mailer: git-send-email 2.7.4 In-reply-to: <1478230764-13748-1-git-send-email-pankaj.dubey@samsung.com> References: <1478230764-13748-1-git-send-email-pankaj.dubey@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrILMWRmVeSWpSXmKPExsVy+t9jQV03JpkIgzlNQhb9j18zW5w/v4Hd YtPja6wWM87vY7JYtPULu0XHMkYHNo9NqzrZPDYvqffo27KK0ePzJrkAlig3m4zUxJTUIoXU vOT8lMy8dFul0BA3XQslhbzE3FRbpQhd35AgJYWyxJxSIM/IAA04OAe4Byvp2yW4ZdzrWMNY 8NygomFNE1MD4wyNLkZODgkBE4mLry8yQdhiEhfurWfrYuTiEBKYxSgxa8NUFgjnJ6PE75Xf GEGq2AR0JZ68n8sMYosIeEtMPvOXHcRmFkiXmP/pChuILSzgJPFq30qwqSwCqhJvW2+CxXkF PCT+N72B2iYncfNcJ9gcTgFPiXNPe8DiQkA197a+YZvAyLuAkWEVo0RqQXJBcVJ6rmFearle cWJucWleul5yfu4mRnDwPpPawXhwl/shRgEORiUe3h0MMhFCrIllxZW5hxglOJiVRHif/5GO EOJNSaysSi3Kjy8qzUktPsRoCnTYRGYp0eR8YGTllcQbmpibmBsbWJhbWpoYKYnzNs5+Fi4k kJ5YkpqdmlqQWgTTx8TBKdXAaLJJpvTvOr2oD39SDIPTnvyoUP4V+nLXDl/rC4794nq25QFr P8++bM7zc/ePrAc3/+x9cLL+ob6b+Tv75XGB5WXTQ88fUnb+f//mPDaNMz9eJIpt2hYU/Cuh aYvT2tOpi7MvHVnStlYwftkmsYkXztxtWRBz0vTMor+amxwbJgpoup2q8ZjjVqHEUpyRaKjF XFScCABmvRMFdAIAAA== X-MTR: 20000000000000000@CPGS Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Lets remove static mapping of SCU SFR mainly used in CORTEX-A9 SoC based boards. Instead use mapping from device tree node of SCU. Signed-off-by: Pankaj Dubey Reviewed-by: Alim Akhtar --- arch/arm/mach-exynos/exynos.c | 22 ---------------------- arch/arm/mach-exynos/include/mach/map.h | 2 -- arch/arm/mach-exynos/platsmp.c | 18 +++++++++++------- arch/arm/mach-exynos/pm.c | 14 +++++++++++--- arch/arm/mach-exynos/suspend.c | 15 +++++++++++---- arch/arm/plat-samsung/include/plat/map-s5p.h | 4 ---- 6 files changed, 33 insertions(+), 42 deletions(-) diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c index 757fc11..fa08ef9 100644 --- a/arch/arm/mach-exynos/exynos.c +++ b/arch/arm/mach-exynos/exynos.c @@ -28,15 +28,6 @@ #include "common.h" -static struct map_desc exynos4_iodesc[] __initdata = { - { - .virtual = (unsigned long)S5P_VA_COREPERI_BASE, - .pfn = __phys_to_pfn(EXYNOS4_PA_COREPERI), - .length = SZ_8K, - .type = MT_DEVICE, - }, -}; - static struct platform_device exynos_cpuidle = { .name = "exynos_cpuidle", #ifdef CONFIG_ARM_EXYNOS_CPUIDLE @@ -99,17 +90,6 @@ static int __init exynos_fdt_map_chipid(unsigned long node, const char *uname, return 1; } -/* - * exynos_map_io - * - * register the standard cpu IO areas - */ -static void __init exynos_map_io(void) -{ - if (soc_is_exynos4()) - iotable_init(exynos4_iodesc, ARRAY_SIZE(exynos4_iodesc)); -} - static void __init exynos_init_io(void) { debug_ll_io_init(); @@ -118,8 +98,6 @@ static void __init exynos_init_io(void) /* detect cpu id and rev. */ s5p_init_cpu(S5P_VA_CHIPID); - - exynos_map_io(); } /* diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h index 5fb0040..0eef407 100644 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h @@ -18,6 +18,4 @@ #define EXYNOS_PA_CHIPID 0x10000000 -#define EXYNOS4_PA_COREPERI 0x10500000 - #endif /* __ASM_ARCH_MAP_H */ diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c index a5d6841..553d0d9 100644 --- a/arch/arm/mach-exynos/platsmp.c +++ b/arch/arm/mach-exynos/platsmp.c @@ -224,11 +224,6 @@ static void write_pen_release(int val) sync_cache_w(&pen_release); } -static void __iomem *scu_base_addr(void) -{ - return (void __iomem *)(S5P_VA_SCU); -} - static DEFINE_SPINLOCK(boot_lock); static void exynos_secondary_init(unsigned int cpu) @@ -387,14 +382,23 @@ fail: static void __init exynos_smp_prepare_cpus(unsigned int max_cpus) { + struct device_node *np; + void __iomem *scu_base; int i; exynos_sysram_init(); exynos_set_delayed_reset_assertion(true); - if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9) - scu_enable(scu_base_addr()); + if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9) { + np = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu"); + scu_base = of_iomap(np, 0); + if (scu_base) { + scu_enable(scu_base); + iounmap(scu_base); + } + of_node_put(np); + } /* * Write the address of secondary startup into the diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index 487295f..60e6827 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -26,8 +27,6 @@ #include #include -#include - #include "common.h" static inline void __iomem *exynos_boot_vector_addr(void) @@ -158,6 +157,8 @@ static int exynos_aftr_finisher(unsigned long flags) void exynos_enter_aftr(void) { + struct device_node *np; + void __iomem *scu_base; unsigned int cpuid = smp_processor_id(); cpu_pm_enter(); @@ -177,7 +178,14 @@ void exynos_enter_aftr(void) cpu_suspend(0, exynos_aftr_finisher); if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9) { - scu_enable(S5P_VA_SCU); + np = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu"); + scu_base = of_iomap(np, 0); + if (scu_base) { + scu_enable(scu_base); + iounmap(scu_base); + } + of_node_put(np); + if (call_firmware_op(resume) == -ENOSYS) exynos_cpu_restore_register(); } diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c index 06332f6..7ab7e67 100644 --- a/arch/arm/mach-exynos/suspend.c +++ b/arch/arm/mach-exynos/suspend.c @@ -34,8 +34,6 @@ #include #include -#include - #include #include "common.h" @@ -453,6 +451,8 @@ static void exynos_pm_release_retention(void) static void exynos_pm_resume(void) { + struct device_node *np; + void __iomem *scu_base; u32 cpuid = read_cpuid_part(); if (exynos_pm_central_resume()) @@ -461,8 +461,15 @@ static void exynos_pm_resume(void) /* For release retention */ exynos_pm_release_retention(); - if (cpuid == ARM_CPU_PART_CORTEX_A9) - scu_enable(S5P_VA_SCU); + if (cpuid == ARM_CPU_PART_CORTEX_A9) { + np = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu"); + scu_base = of_iomap(np, 0); + if (scu_base) { + scu_enable(scu_base); + iounmap(scu_base); + } + of_node_put(np); + } if (call_firmware_op(resume) == -ENOSYS && cpuid == ARM_CPU_PART_CORTEX_A9) diff --git a/arch/arm/plat-samsung/include/plat/map-s5p.h b/arch/arm/plat-samsung/include/plat/map-s5p.h index 0fe2828..512ed1f 100644 --- a/arch/arm/plat-samsung/include/plat/map-s5p.h +++ b/arch/arm/plat-samsung/include/plat/map-s5p.h @@ -15,10 +15,6 @@ #define S5P_VA_CHIPID S3C_ADDR(0x02000000) -#define S5P_VA_COREPERI_BASE S3C_ADDR(0x02800000) -#define S5P_VA_COREPERI(x) (S5P_VA_COREPERI_BASE + (x)) -#define S5P_VA_SCU S5P_VA_COREPERI(0x0) - #define VA_VIC(x) (S3C_VA_IRQ + ((x) * 0x10000)) #define VA_VIC0 VA_VIC(0) #define VA_VIC1 VA_VIC(1)