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 11/17] ARM: exynos: cpuidle: Move the power sequence call in the cpu_pm notifier Date: Fri, 4 Apr 2014 09:47:57 +0200 [thread overview] Message-ID: <1396597683-6969-12-git-send-email-daniel.lezcano@linaro.org> (raw) In-Reply-To: <1396597683-6969-1-git-send-email-daniel.lezcano@linaro.org> The code to initiate and exit the powerdown sequence is the same in pm.c and cpuidle.c. Let's split the common part in the pm.c and reuse it from the cpu_pm notifier. That is one more step forward to make the cpuidle driver arch indenpendant. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- arch/arm/mach-exynos/cpuidle.c | 21 --------------------- arch/arm/mach-exynos/pm.c | 22 ++++++++++++++++++---- 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index 7014654..635b09c 100644 --- a/arch/arm/mach-exynos/cpuidle.c +++ b/arch/arm/mach-exynos/cpuidle.c @@ -77,31 +77,10 @@ static int exynos_enter_core0_aftr(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) { - unsigned long tmp; - - /* 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(); cpu_suspend(0, idle_finisher); cpu_pm_exit(); - /* - * If PMU failed while entering sleep mode, WFI will be - * ignored by PMU and then exiting cpu_do_idle(). - * S5P_CENTRAL_LOWPWR_CFG bit will not be set automatically - * in this situation. - */ - tmp = __raw_readl(S5P_CENTRAL_SEQ_CONFIGURATION); - if (!(tmp & S5P_CENTRAL_LOWPWR_CFG)) { - tmp |= S5P_CENTRAL_LOWPWR_CFG; - __raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION); - /* Clear wakeup state register */ - __raw_writel(0x0, S5P_WAKEUP_STAT); - } - return index; } diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index 3f2ddef..b364212 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -301,15 +301,19 @@ static __init int exynos_pm_drvinit(void) } arch_initcall(exynos_pm_drvinit); -static int exynos_pm_suspend(void) +static void exynos_pm_central_suspend(void) { unsigned long tmp; /* 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); +} + +static int exynos_pm_suspend(void) +{ + unsigned long tmp; /* Setting SEQ_OPTION register */ @@ -322,7 +326,7 @@ static int exynos_pm_suspend(void) return 0; } -static void exynos_pm_resume(void) +static int exynos_pm_central_resume(void) { unsigned long tmp; @@ -339,9 +343,17 @@ static void exynos_pm_resume(void) /* clear the wakeup state register */ __raw_writel(0x0, S5P_WAKEUP_STAT); /* No need to perform below restore code */ - goto early_wakeup; + return -1; } + return 0; +} + +static void exynos_pm_resume(void) +{ + if (exynos_pm_central_resume()) + goto early_wakeup; + if (!soc_is_exynos5250()) exynos_cpu_restore_register(); @@ -385,6 +397,7 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self, { switch (cmd) { case CPU_PM_ENTER: + exynos_pm_central_suspend(); exynos_cpu_save_register(); exynos_set_wakeupmask(); break; @@ -392,6 +405,7 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self, case CPU_PM_EXIT: scu_enable(S5P_VA_SCU); exynos_cpu_restore_register(); + exynos_pm_central_resume(); break; } -- 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 11/17] ARM: exynos: cpuidle: Move the power sequence call in the cpu_pm notifier Date: Fri, 4 Apr 2014 09:47:57 +0200 [thread overview] Message-ID: <1396597683-6969-12-git-send-email-daniel.lezcano@linaro.org> (raw) In-Reply-To: <1396597683-6969-1-git-send-email-daniel.lezcano@linaro.org> The code to initiate and exit the powerdown sequence is the same in pm.c and cpuidle.c. Let's split the common part in the pm.c and reuse it from the cpu_pm notifier. That is one more step forward to make the cpuidle driver arch indenpendant. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- arch/arm/mach-exynos/cpuidle.c | 21 --------------------- arch/arm/mach-exynos/pm.c | 22 ++++++++++++++++++---- 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index 7014654..635b09c 100644 --- a/arch/arm/mach-exynos/cpuidle.c +++ b/arch/arm/mach-exynos/cpuidle.c @@ -77,31 +77,10 @@ static int exynos_enter_core0_aftr(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) { - unsigned long tmp; - - /* 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(); cpu_suspend(0, idle_finisher); cpu_pm_exit(); - /* - * If PMU failed while entering sleep mode, WFI will be - * ignored by PMU and then exiting cpu_do_idle(). - * S5P_CENTRAL_LOWPWR_CFG bit will not be set automatically - * in this situation. - */ - tmp = __raw_readl(S5P_CENTRAL_SEQ_CONFIGURATION); - if (!(tmp & S5P_CENTRAL_LOWPWR_CFG)) { - tmp |= S5P_CENTRAL_LOWPWR_CFG; - __raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION); - /* Clear wakeup state register */ - __raw_writel(0x0, S5P_WAKEUP_STAT); - } - return index; } diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index 3f2ddef..b364212 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -301,15 +301,19 @@ static __init int exynos_pm_drvinit(void) } arch_initcall(exynos_pm_drvinit); -static int exynos_pm_suspend(void) +static void exynos_pm_central_suspend(void) { unsigned long tmp; /* 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); +} + +static int exynos_pm_suspend(void) +{ + unsigned long tmp; /* Setting SEQ_OPTION register */ @@ -322,7 +326,7 @@ static int exynos_pm_suspend(void) return 0; } -static void exynos_pm_resume(void) +static int exynos_pm_central_resume(void) { unsigned long tmp; @@ -339,9 +343,17 @@ static void exynos_pm_resume(void) /* clear the wakeup state register */ __raw_writel(0x0, S5P_WAKEUP_STAT); /* No need to perform below restore code */ - goto early_wakeup; + return -1; } + return 0; +} + +static void exynos_pm_resume(void) +{ + if (exynos_pm_central_resume()) + goto early_wakeup; + if (!soc_is_exynos5250()) exynos_cpu_restore_register(); @@ -385,6 +397,7 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self, { switch (cmd) { case CPU_PM_ENTER: + exynos_pm_central_suspend(); exynos_cpu_save_register(); exynos_set_wakeupmask(); break; @@ -392,6 +405,7 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self, case CPU_PM_EXIT: scu_enable(S5P_VA_SCU); exynos_cpu_restore_register(); + exynos_pm_central_resume(); break; } -- 1.7.9.5
next prev parent reply other threads:[~2014-04-04 7:48 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 ` [PATCH 04/17] ARM: exynos: cpuidle: encapsulate register access inside a function Daniel Lezcano 2014-04-04 7:47 ` 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 ` Daniel Lezcano [this message] 2014-04-04 7:47 ` [PATCH 11/17] ARM: exynos: cpuidle: Move the power sequence call " 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-12-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.