| Message ID | 1405512467-27269-1-git-send-email-k.kozlowski@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Krzysztof, On 16.07.2014 14:07, Krzysztof Kozlowski wrote: [snip] > +#ifdef CONFIG_SMP > +extern void exynos_clear_delayed_reset_assertion(u32 core_id); > +#endif Is the ifdef really needed? The only difference it makes if the function is used but not compiled in is that with it the compilation will fail, while without it the kernel won't link. > + > extern void exynos_cpu_resume(void); > > extern struct smp_operations exynos_smp_ops; [snip] > +/* > + * Clear the USE_DELAYED_RESET_ASSERTION option, set on Exynos4 SoCs > + * during hot-unplugging CPUx. > + * > + * It won't harm if this is called during first boot of secondary CPU. > + * > + * Exynos4 SoCs require setting USE_DELAYED_RESET_ASSERTION so the CPU idle > + * clock down feature could properly detect global idle state when > + * CPUx is off. > + */ > +void exynos_clear_delayed_reset_assertion(u32 core_id) > +{ > + if (soc_is_exynos4()) { > + unsigned int tmp; > + > + tmp = __raw_readl(EXYNOS_ARM_CORE_OPTION(core_id)); > + tmp &= ~(S5P_USE_DELAYED_RESET_ASSERTION); > + __raw_writel(tmp, EXYNOS_ARM_CORE_OPTION(core_id)); > + } > +} The idea to make this a helper function is quite nice, but maybe it could be extended into exynos_set_delayed_reset_assertion() and disable or enable delayed assertion depending on another argument? Best regards, Tomasz -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On ?ro, 2014-07-16 at 15:05 +0200, Tomasz Figa wrote: > Hi Krzysztof, > > On 16.07.2014 14:07, Krzysztof Kozlowski wrote: > > [snip] > > > +#ifdef CONFIG_SMP > > +extern void exynos_clear_delayed_reset_assertion(u32 core_id); > > +#endif > > Is the ifdef really needed? The only difference it makes if the function > is used but not compiled in is that with it the compilation will fail, > while without it the kernel won't link. Hmmm... I'll take another approach - just merge hotplug.c into platsmp.c. > > > + > > extern void exynos_cpu_resume(void); > > > > extern struct smp_operations exynos_smp_ops; > > [snip] > > > +/* > > + * Clear the USE_DELAYED_RESET_ASSERTION option, set on Exynos4 SoCs > > + * during hot-unplugging CPUx. > > + * > > + * It won't harm if this is called during first boot of secondary CPU. > > + * > > + * Exynos4 SoCs require setting USE_DELAYED_RESET_ASSERTION so the CPU idle > > + * clock down feature could properly detect global idle state when > > + * CPUx is off. > > + */ > > +void exynos_clear_delayed_reset_assertion(u32 core_id) > > +{ > > + if (soc_is_exynos4()) { > > + unsigned int tmp; > > + > > + tmp = __raw_readl(EXYNOS_ARM_CORE_OPTION(core_id)); > > + tmp &= ~(S5P_USE_DELAYED_RESET_ASSERTION); > > + __raw_writel(tmp, EXYNOS_ARM_CORE_OPTION(core_id)); > > + } > > +} > > The idea to make this a helper function is quite nice, but maybe it > could be extended into exynos_set_delayed_reset_assertion() and disable > or enable delayed assertion depending on another argument? Sure, I'll change it. Best regards, Krzysztof > > Best regards, > Tomasz -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index 1ee91763fa7c..2e08fa793aff 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h @@ -137,6 +137,10 @@ extern void __init exynos_pm_init(void); static inline void exynos_pm_init(void) {} #endif +#ifdef CONFIG_SMP +extern void exynos_clear_delayed_reset_assertion(u32 core_id); +#endif + extern void exynos_cpu_resume(void); extern struct smp_operations exynos_smp_ops; diff --git a/arch/arm/mach-exynos/hotplug.c b/arch/arm/mach-exynos/hotplug.c index 920a4baa53cd..c58aa0f161bf 100644 --- a/arch/arm/mach-exynos/hotplug.c +++ b/arch/arm/mach-exynos/hotplug.c @@ -22,7 +22,7 @@ #include "common.h" #include "regs-pmu.h" -static inline void cpu_leave_lowpower(void) +static inline void cpu_leave_lowpower(u32 core_id) { unsigned int v; @@ -36,6 +36,8 @@ static inline void cpu_leave_lowpower(void) : "=&r" (v) : "Ir" (CR_C), "Ir" (0x40) : "cc"); + + exynos_clear_delayed_reset_assertion(core_id); } static inline void platform_do_lowpower(unsigned int cpu, int *spurious) @@ -47,6 +49,19 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious) /* Turn the CPU off on next WFI instruction. */ exynos_cpu_power_down(core_id); + if (soc_is_exynos4()) { + unsigned int tmp; + + /* + * Exynos 4 SoCs require setting + * USE_DELAYED_RESET_ASSERTION so the CPU idle + * clock down feature could properly detect + * global idle state when CPUx is off. + */ + tmp = __raw_readl(EXYNOS_ARM_CORE_OPTION(core_id)); + tmp |= S5P_USE_DELAYED_RESET_ASSERTION; + __raw_writel(tmp, EXYNOS_ARM_CORE_OPTION(core_id)); + } wfi(); @@ -76,6 +91,8 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious) void __ref exynos_cpu_die(unsigned int cpu) { int spurious = 0; + u32 mpidr = cpu_logical_map(cpu); + u32 core_id = MPIDR_AFFINITY_LEVEL(mpidr, 0); v7_exit_coherency_flush(louis); @@ -85,7 +102,7 @@ void __ref exynos_cpu_die(unsigned int cpu) * bring this CPU back into the world of cache * coherency, and then restore interrupts */ - cpu_leave_lowpower(); + cpu_leave_lowpower(core_id); if (spurious) pr_warn("CPU%u: %u spurious wakeup calls\n", cpu, spurious); diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c index 50b9aad5e27b..9ce0567fbe87 100644 --- a/arch/arm/mach-exynos/platsmp.c +++ b/arch/arm/mach-exynos/platsmp.c @@ -32,6 +32,27 @@ extern void exynos4_secondary_startup(void); +/* + * Clear the USE_DELAYED_RESET_ASSERTION option, set on Exynos4 SoCs + * during hot-unplugging CPUx. + * + * It won't harm if this is called during first boot of secondary CPU. + * + * Exynos4 SoCs require setting USE_DELAYED_RESET_ASSERTION so the CPU idle + * clock down feature could properly detect global idle state when + * CPUx is off. + */ +void exynos_clear_delayed_reset_assertion(u32 core_id) +{ + if (soc_is_exynos4()) { + unsigned int tmp; + + tmp = __raw_readl(EXYNOS_ARM_CORE_OPTION(core_id)); + tmp &= ~(S5P_USE_DELAYED_RESET_ASSERTION); + __raw_writel(tmp, EXYNOS_ARM_CORE_OPTION(core_id)); + } +} + static inline void __iomem *cpu_boot_reg_base(void) { if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_1_1) @@ -170,6 +191,9 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) udelay(10); } + /* No harm if this is called during first boot of secondary CPU */ + exynos_clear_delayed_reset_assertion(core_id); + /* * now the secondary core is starting up let it run its * calibrations, then wait for it to finish diff --git a/arch/arm/mach-exynos/regs-pmu.h b/arch/arm/mach-exynos/regs-pmu.h index 1d13b08708f0..59bd92112842 100644 --- a/arch/arm/mach-exynos/regs-pmu.h +++ b/arch/arm/mach-exynos/regs-pmu.h @@ -25,6 +25,7 @@ #define S5P_USE_STANDBY_WFI0 (1 << 16) #define S5P_USE_STANDBY_WFE0 (1 << 24) +#define S5P_USE_DELAYED_RESET_ASSERTION BIT(12) #define EXYNOS_SWRESET S5P_PMUREG(0x0400) #define EXYNOS5440_SWRESET S5P_PMUREG(0x00C4) @@ -111,6 +112,8 @@ (EXYNOS_ARM_CORE0_CONFIGURATION + (0x80 * (_nr))) #define EXYNOS_ARM_CORE_STATUS(_nr) \ (EXYNOS_ARM_CORE_CONFIGURATION(_nr) + 0x4) +#define EXYNOS_ARM_CORE_OPTION(_nr) \ + (EXYNOS_ARM_CORE_CONFIGURATION(_nr) + 0x8) #define EXYNOS_ARM_COMMON_CONFIGURATION S5P_PMUREG(0x2500) #define EXYNOS_COMMON_CONFIGURATION(_nr) \
On Exynos4 USE_DELAYED_RESET_ASSERTION must be set in ARM_COREx_OPTION register during CPU power down. This is the proper way of powering down CPU on Exynos4. Additionally on Exynos4212 without this the CPU clock down feature won't work after powering down some CPU and the online CPUs will work at full frequency chosen by CPUfreq governor. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> --- Changes since v2: 1. Add missing disable of the "use delayed reset assertion" feature when starting secondary CPU (suggested by Tomasz Figa). Changes since v1: 1. Use delayed reset assertion on all Exynos4 family and all cores, not only on core 1 of Exynos4212. 2. Rebase on Tomasz Figa's patch: ARM: EXYNOS: Fix core ID used by platsmp and hotplug code http://www.spinics.net/lists/linux-samsung-soc/msg31604.html Tomasz's patch is currently applied to Kukjin's v3.16-samsung-fixes-4 --- arch/arm/mach-exynos/common.h | 4 ++++ arch/arm/mach-exynos/hotplug.c | 21 +++++++++++++++++++-- arch/arm/mach-exynos/platsmp.c | 24 ++++++++++++++++++++++++ arch/arm/mach-exynos/regs-pmu.h | 3 +++ 4 files changed, 50 insertions(+), 2 deletions(-)