From: Tomasz Figa <t.figa@samsung.com>
To: linux-samsung-soc@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Kukjin Kim <kgene.kim@samsung.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Tomasz Figa <tomasz.figa@gmail.com>,
Abhilash Kesavan <kesavan.abhilash@gmail.com>,
Tomasz Figa <t.figa@samsung.com>
Subject: [PATCH v2 5/6] ARM: EXYNOS: Fix suspend/resume sequences
Date: Wed, 25 Jun 2014 13:52:55 +0200 [thread overview]
Message-ID: <1403697175-13476-1-git-send-email-t.figa@samsung.com> (raw)
In-Reply-To: <1403618235-19353-1-git-send-email-t.figa@samsung.com>
Due to recent consolidation of Exynos suspend and cpuidle code, some
parts of suspend and resume sequences are executed two times, once from
exynos_pm_syscore_ops and then from exynos_cpu_pm_notifier() and thus it
breaks suspend, at least on Exynos4-based boards.
This patch fixes the issue by removing exynos_pm_syscore_ops completely
and making the code rely only on CPU PM notifier.
Tested on Exynos4210-based Trats board.
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
---
arch/arm/mach-exynos/pm.c | 23 ++++-------------------
1 file changed, 4 insertions(+), 19 deletions(-)
Changes since v1:
- rebased onto Kukjin's fixes branch.
diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c
index 202ca73..f23cc77 100644
--- a/arch/arm/mach-exynos/pm.c
+++ b/arch/arm/mach-exynos/pm.c
@@ -364,11 +364,6 @@ early_wakeup:
return;
}
-static struct syscore_ops exynos_pm_syscore_ops = {
- .suspend = exynos_pm_suspend,
- .resume = exynos_pm_resume,
-};
-
/*
* Suspend Ops
*/
@@ -438,22 +433,13 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self,
switch (cmd) {
case CPU_PM_ENTER:
- if (cpu == 0) {
- exynos_pm_central_suspend();
- if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9)
- exynos_cpu_save_register();
- }
+ if (cpu == 0)
+ exynos_pm_suspend();
break;
case CPU_PM_EXIT:
- if (cpu == 0) {
- if (read_cpuid_part_number() ==
- ARM_CPU_PART_CORTEX_A9) {
- scu_enable(S5P_VA_SCU);
- exynos_cpu_restore_register();
- }
- exynos_pm_central_resume();
- }
+ if (cpu == 0)
+ exynos_pm_resume();
break;
}
@@ -478,6 +464,5 @@ void __init exynos_pm_init(void)
tmp |= ((0xFF << 8) | (0x1F << 1));
__raw_writel(tmp, S5P_WAKEUP_MASK);
- register_syscore_ops(&exynos_pm_syscore_ops);
suspend_set_ops(&exynos_suspend_ops);
}
--
1.9.3
next prev parent reply other threads:[~2014-06-25 11:53 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-24 13:57 [PATCH 0/6] Various Samsung fixes for v3.16-rc3 Tomasz Figa
2014-06-24 13:57 ` [PATCH 1/6] mmc: sdhci-s3c: Fix local I/O clock gating Tomasz Figa
2014-07-14 8:05 ` Jaehoon Chung
2014-06-24 13:57 ` [PATCH 2/6] ARM: EXYNOS: Fix core ID used by platsmp and hotplug code Tomasz Figa
2014-07-08 13:21 ` Kukjin Kim
2014-07-14 9:50 ` Tomasz Figa
2014-07-15 18:00 ` Kukjin Kim
2014-06-24 13:57 ` [PATCH 3/6] clk: samsung: exynos4: Remove SRC_MASK_ISP gates Tomasz Figa
2014-06-25 9:58 ` Daniel Drake
2014-06-25 10:10 ` Tomasz Figa
2014-06-30 13:50 ` Tomasz Figa
2014-06-24 13:57 ` [PATCH 4/6] ARM: SAMSUNG: Restore Samsung PM Debug functionality Tomasz Figa
2014-06-25 10:09 ` Daniel Drake
2014-06-25 11:41 ` Tomasz Figa
2014-06-25 11:43 ` [PATCH v2 " Tomasz Figa
2014-06-26 9:24 ` Daniel Drake
2014-07-14 9:52 ` Tomasz Figa
2014-07-08 13:48 ` [PATCH " Kukjin Kim
2014-07-08 13:54 ` Tomasz Figa
2014-07-15 18:02 ` Kukjin Kim
2014-07-15 23:59 ` Tomasz Figa
2014-07-21 10:30 ` Tomasz Figa
2014-06-24 13:57 ` [PATCH 5/6] ARM: EXYNOS: Fix suspend/resume sequencies Tomasz Figa
2014-06-24 15:33 ` Abhilash Kesavan
2014-07-08 14:02 ` Kukjin Kim
2014-06-24 13:57 ` [PATCH 6/6] ARM: EXYNOS: Register cpuidle device only on Exynos4210 and 5250 Tomasz Figa
2014-07-08 14:15 ` Kukjin Kim
2014-07-08 15:45 ` Bartlomiej Zolnierkiewicz
2014-07-10 13:30 ` Kukjin Kim
2014-06-25 11:52 ` Tomasz Figa [this message]
2014-07-14 9:54 ` [PATCH v2 5/6] ARM: EXYNOS: Fix suspend/resume sequences Tomasz Figa
2014-07-15 11:19 ` Bartlomiej Zolnierkiewicz
2014-07-15 12:15 ` Tomasz Figa
2014-07-15 14:24 ` [PATCH v3] " Tomasz Figa
2014-07-15 14:26 ` Tomasz Figa
2014-07-17 14:42 ` Tomasz Figa
2014-07-21 10:23 ` Tomasz Figa
2014-07-15 17:31 ` [PATCH v2 5/6] " Chander Kashyap
2014-07-01 13:54 ` [PATCH 0/6] Various Samsung fixes for v3.16-rc3 Tomasz Figa
2014-07-07 23:25 ` Kukjin Kim
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=1403697175-13476-1-git-send-email-t.figa@samsung.com \
--to=t.figa@samsung.com \
--cc=kesavan.abhilash@gmail.com \
--cc=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=tomasz.figa@gmail.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).