From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/5] ARM: OMAP4+: Fix bad fallthrough for cpuidle
Date: Wed, 26 Oct 2016 08:17:01 -0700 [thread overview]
Message-ID: <20161026151703.24730-4-tony@atomide.com> (raw)
In-Reply-To: <20161026151703.24730-1-tony@atomide.com>
We don't want to fall through to a bunch of errors for retention
if PM_OMAP4_CPU_OSWR_DISABLE is not configured for a SoC.
Fixes: 6099dd37c669 ("ARM: OMAP5 / DRA7: Enable CPU RET on suspend")
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
@@ -244,10 +244,9 @@ int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state)
save_state = 1;
break;
case PWRDM_POWER_RET:
- if (IS_PM44XX_ERRATUM(PM_OMAP4_CPU_OSWR_DISABLE)) {
+ if (IS_PM44XX_ERRATUM(PM_OMAP4_CPU_OSWR_DISABLE))
save_state = 0;
- break;
- }
+ break;
default:
/*
* CPUx CSWR is invalid hardware state. Also CPUx OSWR
--
2.9.3
next prev parent reply other threads:[~2016-10-26 15:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-26 15:16 [PATCH 0/5] Minimal cpuidle fixes for omap5 and dra7 Tony Lindgren
2016-10-26 15:16 ` [PATCH 1/5] ARM: OMAP5: Fix build for PM code Tony Lindgren
2016-10-26 15:17 ` [PATCH 2/5] ARM: OMAP5: Fix mpuss_early_init Tony Lindgren
2016-10-26 20:21 ` Tony Lindgren
2016-10-26 15:17 ` Tony Lindgren [this message]
2016-10-26 15:17 ` [PATCH 4/5] ARM: DRA7: PM: cpuidle MPU CSWR support Tony Lindgren
2016-10-27 16:15 ` Tony Lindgren
2016-10-26 15:17 ` [PATCH 5/5] ARM: OMAP5: Enable minimal cpuidle for omap5 retention Tony Lindgren
2016-10-26 19:53 ` [PATCH 0/5] Minimal cpuidle fixes for omap5 and dra7 Santosh Shilimkar
2016-10-26 20:56 ` Nishanth Menon
2016-10-26 21:31 ` Tony Lindgren
2016-10-27 7:43 ` H. Nikolaus Schaller
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=20161026151703.24730-4-tony@atomide.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).