From: Daniel Lezcano <daniel.lezcano@linaro.org> To: kgene.kim@samsung.com Cc: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, t.figa@samsung.com, linaro-kernel@lists.linaro.org, rjw@rjwysocki.net Subject: [PATCH 04/17] ARM: exynos: cpuidle: encapsulate register access inside a function Date: Fri, 4 Apr 2014 09:47:50 +0200 [thread overview] Message-ID: <1396597683-6969-5-git-send-email-daniel.lezcano@linaro.org> (raw) In-Reply-To: <1396597683-6969-1-git-send-email-daniel.lezcano@linaro.org> That makes the code cleaner and encapsulted. The function will be reused in the next patch. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- arch/arm/mach-exynos/pm.c | 65 ++++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 24 deletions(-) diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index e00025b..2326c67 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -102,6 +102,42 @@ static struct sleep_save exynos_core_save[] = { /* For Cortex-A9 Diagnostic and Power control register */ static unsigned int save_arm_register[2]; +static void exynos_cpu_save_register(void) +{ + unsigned long tmp; + + /* Save Power control register */ + asm ("mrc p15, 0, %0, c15, c0, 0" + : "=r" (tmp) : : "cc"); + + save_arm_register[0] = tmp; + + /* Save Diagnostic register */ + asm ("mrc p15, 0, %0, c15, c0, 1" + : "=r" (tmp) : : "cc"); + + save_arm_register[1] = tmp; +} + +static void exynos_cpu_restore_register(void) +{ + unsigned long tmp; + + /* Restore Power control register */ + tmp = save_arm_register[0]; + + asm volatile ("mcr p15, 0, %0, c15, c0, 0" + : : "r" (tmp) + : "cc"); + + /* Restore Diagnostic register */ + tmp = save_arm_register[1]; + + asm volatile ("mcr p15, 0, %0, c15, c0, 1" + : : "r" (tmp) + : "cc"); +} + static int exynos_cpu_suspend(unsigned long arg) { #ifdef CONFIG_CACHE_L2X0 @@ -279,17 +315,8 @@ static int exynos_pm_suspend(void) tmp = (S5P_USE_STANDBY_WFI0 | S5P_USE_STANDBY_WFE0); __raw_writel(tmp, S5P_CENTRAL_SEQ_OPTION); - if (!soc_is_exynos5250()) { - /* Save Power control register */ - asm ("mrc p15, 0, %0, c15, c0, 0" - : "=r" (tmp) : : "cc"); - save_arm_register[0] = tmp; - - /* Save Diagnostic register */ - asm ("mrc p15, 0, %0, c15, c0, 1" - : "=r" (tmp) : : "cc"); - save_arm_register[1] = tmp; - } + if (!soc_is_exynos5250()) + exynos_cpu_save_register(); return 0; } @@ -313,19 +340,9 @@ static void exynos_pm_resume(void) /* No need to perform below restore code */ goto early_wakeup; } - if (!soc_is_exynos5250()) { - /* Restore Power control register */ - tmp = save_arm_register[0]; - asm volatile ("mcr p15, 0, %0, c15, c0, 0" - : : "r" (tmp) - : "cc"); - - /* Restore Diagnostic register */ - tmp = save_arm_register[1]; - asm volatile ("mcr p15, 0, %0, c15, c0, 1" - : : "r" (tmp) - : "cc"); - } + + if (!soc_is_exynos5250()) + exynos_cpu_restore_register(); /* For release retention */ -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: daniel.lezcano@linaro.org (Daniel Lezcano) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 04/17] ARM: exynos: cpuidle: encapsulate register access inside a function Date: Fri, 4 Apr 2014 09:47:50 +0200 [thread overview] Message-ID: <1396597683-6969-5-git-send-email-daniel.lezcano@linaro.org> (raw) In-Reply-To: <1396597683-6969-1-git-send-email-daniel.lezcano@linaro.org> That makes the code cleaner and encapsulted. The function will be reused in the next patch. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- arch/arm/mach-exynos/pm.c | 65 ++++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 24 deletions(-) diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index e00025b..2326c67 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -102,6 +102,42 @@ static struct sleep_save exynos_core_save[] = { /* For Cortex-A9 Diagnostic and Power control register */ static unsigned int save_arm_register[2]; +static void exynos_cpu_save_register(void) +{ + unsigned long tmp; + + /* Save Power control register */ + asm ("mrc p15, 0, %0, c15, c0, 0" + : "=r" (tmp) : : "cc"); + + save_arm_register[0] = tmp; + + /* Save Diagnostic register */ + asm ("mrc p15, 0, %0, c15, c0, 1" + : "=r" (tmp) : : "cc"); + + save_arm_register[1] = tmp; +} + +static void exynos_cpu_restore_register(void) +{ + unsigned long tmp; + + /* Restore Power control register */ + tmp = save_arm_register[0]; + + asm volatile ("mcr p15, 0, %0, c15, c0, 0" + : : "r" (tmp) + : "cc"); + + /* Restore Diagnostic register */ + tmp = save_arm_register[1]; + + asm volatile ("mcr p15, 0, %0, c15, c0, 1" + : : "r" (tmp) + : "cc"); +} + static int exynos_cpu_suspend(unsigned long arg) { #ifdef CONFIG_CACHE_L2X0 @@ -279,17 +315,8 @@ static int exynos_pm_suspend(void) tmp = (S5P_USE_STANDBY_WFI0 | S5P_USE_STANDBY_WFE0); __raw_writel(tmp, S5P_CENTRAL_SEQ_OPTION); - if (!soc_is_exynos5250()) { - /* Save Power control register */ - asm ("mrc p15, 0, %0, c15, c0, 0" - : "=r" (tmp) : : "cc"); - save_arm_register[0] = tmp; - - /* Save Diagnostic register */ - asm ("mrc p15, 0, %0, c15, c0, 1" - : "=r" (tmp) : : "cc"); - save_arm_register[1] = tmp; - } + if (!soc_is_exynos5250()) + exynos_cpu_save_register(); return 0; } @@ -313,19 +340,9 @@ static void exynos_pm_resume(void) /* No need to perform below restore code */ goto early_wakeup; } - if (!soc_is_exynos5250()) { - /* Restore Power control register */ - tmp = save_arm_register[0]; - asm volatile ("mcr p15, 0, %0, c15, c0, 0" - : : "r" (tmp) - : "cc"); - - /* Restore Diagnostic register */ - tmp = save_arm_register[1]; - asm volatile ("mcr p15, 0, %0, c15, c0, 1" - : : "r" (tmp) - : "cc"); - } + + if (!soc_is_exynos5250()) + exynos_cpu_restore_register(); /* For release retention */ -- 1.7.9.5
next prev parent reply other threads:[~2014-04-04 7:47 UTC|newest] Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-04-04 7:47 [PATCH 00/17] ARM: exynos: cpuidle: Move the driver to drivers/cpuidle Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 7:47 ` [PATCH 01/17] ARM: exynos: cpuidle: Prevent forward declaration Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 8:42 ` Viresh Kumar 2014-04-04 8:42 ` Viresh Kumar 2014-04-04 7:47 ` [PATCH 02/17] ARM: exynos: cpuidle: use cpuidle_register Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 8:44 ` Viresh Kumar 2014-04-04 8:44 ` Viresh Kumar 2014-04-04 7:47 ` [PATCH 03/17] ARM: exynos: cpuidle: change function name prefix Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 8:45 ` Viresh Kumar 2014-04-04 8:45 ` Viresh Kumar 2014-04-04 7:47 ` Daniel Lezcano [this message] 2014-04-04 7:47 ` [PATCH 04/17] ARM: exynos: cpuidle: encapsulate register access inside a function Daniel Lezcano 2014-04-04 8:46 ` Viresh Kumar 2014-04-04 8:46 ` Viresh Kumar 2014-04-04 7:47 ` [PATCH 05/17] ARM: exynos: cpuidle: Move some code inside the idle_finisher Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 8:50 ` Viresh Kumar 2014-04-04 8:50 ` Viresh Kumar 2014-04-04 9:02 ` Daniel Lezcano 2014-04-04 9:02 ` Daniel Lezcano 2014-04-04 7:47 ` [PATCH 06/17] ARM: exynos: cpuidle: Fix S5P_WAKEUP_STAT call Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 8:53 ` Viresh Kumar 2014-04-04 8:53 ` Viresh Kumar 2014-04-04 7:47 ` [PATCH 07/17] ARM: exynos: cpuidle: Use the cpu_pm notifier Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 7:47 ` [PATCH 08/17] ARM: exynos: cpuidle: Move scu_enable in " Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 8:57 ` Viresh Kumar 2014-04-04 8:57 ` Viresh Kumar 2014-04-04 9:03 ` Daniel Lezcano 2014-04-04 9:03 ` Daniel Lezcano 2014-04-04 7:47 ` [PATCH 09/17] ARM: exynos: cpuidle: Remove ifdef for scu_enable Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 8:58 ` Viresh Kumar 2014-04-04 8:58 ` Viresh Kumar 2014-04-04 7:47 ` [PATCH 10/17] ARM: exynos: cpuidle: Move exynos_set_wakeupmask in the cpu_pm notifier Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 8:59 ` Viresh Kumar 2014-04-04 8:59 ` Viresh Kumar 2014-04-04 7:47 ` [PATCH 11/17] ARM: exynos: cpuidle: Move the power sequence call " Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 9:02 ` Viresh Kumar 2014-04-04 9:02 ` Viresh Kumar 2014-04-04 7:47 ` [PATCH 12/17] ARM: exynos: cpuidle: Move S5P_CHECK_AFTR in a header Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 9:03 ` Viresh Kumar 2014-04-04 9:03 ` Viresh Kumar 2014-04-04 7:47 ` [PATCH 13/17] ARM: exynos: cpuidle: Move clock setup to pm.c Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 9:05 ` Viresh Kumar 2014-04-04 9:05 ` Viresh Kumar 2014-04-04 7:48 ` [PATCH 14/17] ARM: exynos: cpuidle: Move the boot vector in pm.c Daniel Lezcano 2014-04-04 7:48 ` Daniel Lezcano 2014-04-04 9:05 ` Viresh Kumar 2014-04-04 9:05 ` Viresh Kumar 2014-04-04 7:48 ` [PATCH 15/17] ARM: exynos: cpuidle: Pass the AFTR callback to the platform_data Daniel Lezcano 2014-04-04 7:48 ` Daniel Lezcano 2014-04-04 9:09 ` Viresh Kumar 2014-04-04 9:09 ` Viresh Kumar 2014-04-04 7:48 ` [PATCH 16/17] ARM: exynos: cpuidle: Move the driver to drivers/cpuidle directory Daniel Lezcano 2014-04-04 7:48 ` Daniel Lezcano 2014-04-04 9:07 ` Viresh Kumar 2014-04-04 9:07 ` Viresh Kumar 2014-04-04 7:48 ` [PATCH 17/17] ARM: exynos: config: Enable cpuidle Daniel Lezcano 2014-04-04 7:48 ` Daniel Lezcano 2014-04-04 9:10 ` Viresh Kumar 2014-04-04 9:10 ` Viresh Kumar 2014-04-04 9:16 ` Daniel Lezcano 2014-04-04 9:16 ` Daniel Lezcano 2014-04-04 9:00 ` [PATCH 00/17] ARM: exynos: cpuidle: Move the driver to drivers/cpuidle Sachin Kamat 2014-04-04 9:00 ` Sachin Kamat 2014-04-04 9:55 ` Daniel Lezcano 2014-04-04 9:55 ` Daniel Lezcano
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1396597683-6969-5-git-send-email-daniel.lezcano@linaro.org \ --to=daniel.lezcano@linaro.org \ --cc=kgene.kim@samsung.com \ --cc=linaro-kernel@lists.linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=rjw@rjwysocki.net \ --cc=t.figa@samsung.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.