From mboxrd@z Thu Jan 1 00:00:00 1970 From: daniel.lezcano@linaro.org (Daniel Lezcano) Date: Fri, 04 Apr 2014 11:02:20 +0200 Subject: [PATCH 05/17] ARM: exynos: cpuidle: Move some code inside the idle_finisher In-Reply-To: References: <1396597683-6969-1-git-send-email-daniel.lezcano@linaro.org> <1396597683-6969-6-git-send-email-daniel.lezcano@linaro.org> Message-ID: <533E751C.3000202@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 04/04/2014 10:50 AM, Viresh Kumar wrote: > On 4 April 2014 13:17, Daniel Lezcano wrote: >> Move the code around to differentiate different section of code and prepare it >> to be factored out in the next patches. >> >> Signed-off-by: Daniel Lezcano >> --- >> arch/arm/mach-exynos/cpuidle.c | 17 +++++++++-------- >> 1 file changed, 9 insertions(+), 8 deletions(-) >> >> diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c >> index 18f6aba..9cd1ed9 100644 >> --- a/arch/arm/mach-exynos/cpuidle.c >> +++ b/arch/arm/mach-exynos/cpuidle.c >> @@ -88,7 +88,16 @@ static void restore_cpu_arch_register(void) >> >> static int idle_finisher(unsigned long flags) >> { >> + exynos_set_wakeupmask(); >> + >> + __raw_writel(virt_to_phys(s3c_cpu_resume), REG_DIRECTGO_ADDR); >> + __raw_writel(S5P_CHECK_AFTR, REG_DIRECTGO_FLAG); >> + >> + /* Set value of power down register for aftr mode */ >> + exynos_sys_powerdown_conf(SYS_AFTR); > > Just to highlight this, you have changed the order in which these > things were done earlier.. In case that have any side effects. Yes, that's correct. I changed the order. That doesn't have a side effect because the calls are independent. The important call is cpu_do_idle() which must be done the last. >> cpu_do_idle(); >> + >> return 1; >> } >> >> @@ -98,14 +107,6 @@ static int exynos_enter_core0_aftr(struct cpuidle_device *dev, >> { >> unsigned long tmp; >> >> - exynos_set_wakeupmask(); >> - >> - /* Set value of power down register for aftr mode */ >> - exynos_sys_powerdown_conf(SYS_AFTR); >> - >> - __raw_writel(virt_to_phys(s3c_cpu_resume), REG_DIRECTGO_ADDR); >> - __raw_writel(S5P_CHECK_AFTR, REG_DIRECTGO_FLAG); >> - >> save_cpu_arch_register(); >> >> /* Setting Central Sequence Register for power down mode */ > > Here as well, we do all above (-) things after this sequence now: > > save_cpu_arch_register(); > > /* Setting Central Sequence Register for power down mode */ > tmp = __raw_readl(S5P_CENTRAL_SEQ_CONFIGURATION); > tmp &= ~S5P_CENTRAL_LOWPWR_CFG; > __raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION); > > cpu_pm_enter(); > > Probably mention that in log too, that it doesn't have any side effects? > > Reviewed-by: Viresh Kumar > -- Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog