From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933021AbbCRNL0 (ORCPT ); Wed, 18 Mar 2015 09:11:26 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:25023 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932813AbbCRNLU (ORCPT ); Wed, 18 Mar 2015 09:11:20 -0400 X-AuditID: cbfee61b-f79d76d0000024d6-ce-550979750e7d From: Bartlomiej Zolnierkiewicz To: Kukjin Kim Cc: Kukjin Kim , Daniel Lezcano , Tomasz Figa , Colin Cross , Krzysztof Kozlowski , Kyungmin Park , Marek Szyprowski , linux-samsung-soc@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, b.zolnierkie@samsung.com Subject: [PATCH v2 3/5] ARM: EXYNOS: add exynos_set_boot_addr() helper Date: Wed, 18 Mar 2015 14:09:55 +0100 Message-id: <1426684197-22281-4-git-send-email-b.zolnierkie@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1426684197-22281-1-git-send-email-b.zolnierkie@samsung.com> References: <1426684197-22281-1-git-send-email-b.zolnierkie@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrHLMWRmVeSWpSXmKPExsVy+t9jAd2ySs5Qg4UrmS02zljParFgRjuz xbzPshavXxha9C64ymbR//g1s8XZpjfsFpd3zWGz+Nx7hNFixvl9TBZrj9xlt1i16w+jA4/H zll32T0WbCr12LSqk83jzrU9bB59W1YxenzeJBfAFsVlk5Kak1mWWqRvl8CV8f/3WsaCHtGK OVsjGxi/CXQxcnJICJhIdD/4ywxhi0lcuLeerYuRi0NIYBGjxKnlrUwQTheTxOGVd1hAqtgE rCQmtq9iBLFFBNQkehZvZQQpYhaYzSxx+fgudpCEsICbxLyVi5hAbBYBVYnJXYfAGngFPCTO rH7ABLFOUaL72QQ2EJtTwFNi7pL3QAs4gLZ5SGxqZJzAyLuAkWEVo2hqQXJBcVJ6rpFecWJu cWleul5yfu4mRnAoPpPewbiqweIQowAHoxIPr8RVjlAh1sSy4srcQ4wSHMxKIrzcWZyhQrwp iZVVqUX58UWlOanFhxilOViUxHmV7NtChATSE0tSs1NTC1KLYLJMHJxSDYw9f1r7LkxO8Xpx om0NT/DxDKcpVvbT537ZlXLqUkrpu+inLm1HDs+ZmZCy1mTp15PLKx27Hvf9/q/KmyPIaOyl PC9IYodG4/3TuS9vtDydNVXR7335KUNXR0tz4dzZLNrzJyzQmSXLz3v70SqJzScubDe7U/yK N2uVqoay3pevyXNmy2VX8wsqsRRnJBpqMRcVJwIAc9Met0ECAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add exynos_set_boot_addr() helper and covert existing code (exynos_boot_secondary() and exynos_smp_prepare_cpus()) to use it. There should be no functional changes caused by this patch. Cc: Daniel Lezcano Signed-off-by: Bartlomiej Zolnierkiewicz --- arch/arm/mach-exynos/platsmp.c | 53 +++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c index 6f7a1c7..b7cfcdc 100644 --- a/arch/arm/mach-exynos/platsmp.c +++ b/arch/arm/mach-exynos/platsmp.c @@ -247,6 +247,31 @@ static void exynos_secondary_init(unsigned int cpu) spin_unlock(&boot_lock); } +static int exynos_set_boot_addr(u32 core_id, unsigned long boot_addr) +{ + int ret; + + /* + * Try to set boot address using firmware first + * and fall back to boot register if it fails. + */ + ret = call_firmware_op(set_cpu_boot_addr, core_id, boot_addr); + if (ret && ret != -ENOSYS) + goto fail; + if (ret == -ENOSYS) { + void __iomem *boot_reg = cpu_boot_reg(core_id); + + if (IS_ERR(boot_reg)) { + ret = PTR_ERR(boot_reg); + goto fail; + } + __raw_writel(boot_addr, boot_reg); + ret = 0; + } +fail: + return ret; +} + static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) { unsigned long timeout; @@ -306,22 +331,9 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) boot_addr = virt_to_phys(exynos4_secondary_startup); - /* - * Try to set boot address using firmware first - * and fall back to boot register if it fails. - */ - ret = call_firmware_op(set_cpu_boot_addr, core_id, boot_addr); - if (ret && ret != -ENOSYS) + ret = exynos_set_boot_addr(core_id, boot_addr); + if (ret) goto fail; - if (ret == -ENOSYS) { - void __iomem *boot_reg = cpu_boot_reg(core_id); - - if (IS_ERR(boot_reg)) { - ret = PTR_ERR(boot_reg); - goto fail; - } - __raw_writel(boot_addr, boot_reg); - } call_firmware_op(cpu_boot, core_id); @@ -409,16 +421,9 @@ static void __init exynos_smp_prepare_cpus(unsigned int max_cpus) core_id = MPIDR_AFFINITY_LEVEL(mpidr, 0); boot_addr = virt_to_phys(exynos4_secondary_startup); - ret = call_firmware_op(set_cpu_boot_addr, core_id, boot_addr); - if (ret && ret != -ENOSYS) + ret = exynos_set_boot_addr(core_id, boot_addr); + if (ret) break; - if (ret == -ENOSYS) { - void __iomem *boot_reg = cpu_boot_reg(core_id); - - if (IS_ERR(boot_reg)) - break; - __raw_writel(boot_addr, boot_reg); - } } } -- 1.8.2.3