| Message ID | 1479099731-28108-3-git-send-email-pankaj.dubey@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Nov 14, 2016 at 10:31:57AM +0530, Pankaj Dubey wrote: > Now as we have of_scu_enable which takes care of mapping > scu base from DT, lets use it. > > This patch also fixes build failure in case !SMP caused > by commit SHA ID: 94210b1abb2 which is already merged in > krzk/for-next branch > > CC: Krzysztof Kozlowski <krzk@kernel.org> > CC: linux-samsung-soc@vger.kernel.org > Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com> > --- > arch/arm/mach-exynos/common.h | 1 - > arch/arm/mach-exynos/platsmp.c | 30 ++++-------------------------- > arch/arm/mach-exynos/pm.c | 4 ++-- > arch/arm/mach-exynos/suspend.c | 14 ++++---------- > 4 files changed, 10 insertions(+), 39 deletions(-) > Looks correct, for reference: Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> However this depends on changes in my next/soc branch (and these changes were the trigger for this patchset). I can either provide a tag with Exynos commits or accept one with common SCU code. Best regards, Krzysztof
Hi Krzysztof, On Wednesday 16 November 2016 12:29 AM, Krzysztof Kozlowski wrote: > On Mon, Nov 14, 2016 at 10:31:57AM +0530, Pankaj Dubey wrote: >> Now as we have of_scu_enable which takes care of mapping >> scu base from DT, lets use it. >> >> This patch also fixes build failure in case !SMP caused >> by commit SHA ID: 94210b1abb2 which is already merged in >> krzk/for-next branch >> >> CC: Krzysztof Kozlowski <krzk@kernel.org> >> CC: linux-samsung-soc@vger.kernel.org >> Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com> >> --- >> arch/arm/mach-exynos/common.h | 1 - >> arch/arm/mach-exynos/platsmp.c | 30 ++++-------------------------- >> arch/arm/mach-exynos/pm.c | 4 ++-- >> arch/arm/mach-exynos/suspend.c | 14 ++++---------- >> 4 files changed, 10 insertions(+), 39 deletions(-) >> > > Looks correct, for reference: > Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> > Thanks for review. > However this depends on changes in my next/soc branch (and these changes > were the trigger for this patchset). I can either provide a tag with > Exynos commits or accept one with common SCU code. > I am not sure through which tree this series need to be taken. I will leave this to you and ARM-SOC maintainers. As there are few comments on few patches of this series, I will address them and soon post v2. Though I don't see any changes will be in v2 for exynos platform. So I will include your review tag. Thanks, Pankaj Dubey > Best regards, > Krzysztof > > >
diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index fb12d11..d19064b 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h @@ -156,7 +156,6 @@ extern void exynos_cpu_restore_register(void); extern void exynos_pm_central_suspend(void); extern int exynos_pm_central_resume(void); extern void exynos_enter_aftr(void); -extern int exynos_scu_enable(void); extern struct cpuidle_exynos_data cpuidle_coupled_exynos_data; diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c index 94405c7..2e5ecc1 100644 --- a/arch/arm/mach-exynos/platsmp.c +++ b/arch/arm/mach-exynos/platsmp.c @@ -168,27 +168,6 @@ int exynos_cluster_power_state(int cluster) S5P_CORE_LOCAL_PWR_EN); } -/** - * exynos_scu_enable : enables SCU for Cortex-A9 based system - * returns 0 on success else non-zero error code - */ -int exynos_scu_enable(void) -{ - struct device_node *np; - void __iomem *scu_base; - - np = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu"); - scu_base = of_iomap(np, 0); - of_node_put(np); - if (!scu_base) { - pr_err("%s failed to map scu_base\n", __func__); - return -ENOMEM; - } - scu_enable(scu_base); - iounmap(scu_base); - return 0; -} - static void __iomem *cpu_boot_reg_base(void) { if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_1_1) @@ -409,11 +388,10 @@ static void __init exynos_smp_prepare_cpus(unsigned int max_cpus) exynos_set_delayed_reset_assertion(true); - if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9) { - /* if exynos_scu_enable fails, return */ - if (exynos_scu_enable()) - return; - } + /* if of_scu_enable fails, return */ + if (scu_a9_has_base() && of_scu_enable()) + return; + /* * Write the address of secondary startup into the * system-wide flags register. The boot monitor waits diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index c0b46c3..9678438 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -174,8 +174,8 @@ void exynos_enter_aftr(void) cpu_suspend(0, exynos_aftr_finisher); - if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9) { - exynos_scu_enable(); + if (scu_a9_has_base()) { + of_scu_enable(); 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 73df9f3..5414282 100644 --- a/arch/arm/mach-exynos/suspend.c +++ b/arch/arm/mach-exynos/suspend.c @@ -451,19 +451,16 @@ static void exynos_pm_release_retention(void) static void exynos_pm_resume(void) { - u32 cpuid = read_cpuid_part(); - if (exynos_pm_central_resume()) goto early_wakeup; /* For release retention */ exynos_pm_release_retention(); - if (cpuid == ARM_CPU_PART_CORTEX_A9) - exynos_scu_enable(); + if (scu_a9_has_base()) + of_scu_enable(); - if (call_firmware_op(resume) == -ENOSYS - && cpuid == ARM_CPU_PART_CORTEX_A9) + if (call_firmware_op(resume) == -ENOSYS && scu_a9_has_base()) exynos_cpu_restore_register(); early_wakeup: @@ -475,8 +472,6 @@ static void exynos_pm_resume(void) static void exynos3250_pm_resume(void) { - u32 cpuid = read_cpuid_part(); - if (exynos_pm_central_resume()) goto early_wakeup; @@ -485,8 +480,7 @@ static void exynos3250_pm_resume(void) pmu_raw_writel(S5P_USE_STANDBY_WFI_ALL, S5P_CENTRAL_SEQ_OPTION); - if (call_firmware_op(resume) == -ENOSYS - && cpuid == ARM_CPU_PART_CORTEX_A9) + if (call_firmware_op(resume) == -ENOSYS && scu_a9_has_base()) exynos_cpu_restore_register(); early_wakeup:
Now as we have of_scu_enable which takes care of mapping scu base from DT, lets use it. This patch also fixes build failure in case !SMP caused by commit SHA ID: 94210b1abb2 which is already merged in krzk/for-next branch CC: Krzysztof Kozlowski <krzk@kernel.org> CC: linux-samsung-soc@vger.kernel.org Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com> --- arch/arm/mach-exynos/common.h | 1 - arch/arm/mach-exynos/platsmp.c | 30 ++++-------------------------- arch/arm/mach-exynos/pm.c | 4 ++-- arch/arm/mach-exynos/suspend.c | 14 ++++---------- 4 files changed, 10 insertions(+), 39 deletions(-)