From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
To: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Daniel Lezcano <daniel.lezcano@linaro.org>
Subject: [PATCH 2/2] drivers: cpuidle: add driver/device checks in cpuidle_enter_freeze()
Date: Tue, 24 Feb 2015 17:58:50 +0000 [thread overview]
Message-ID: <1424800730-32059-3-git-send-email-lorenzo.pieralisi@arm.com> (raw)
In-Reply-To: <1424800730-32059-1-git-send-email-lorenzo.pieralisi@arm.com>
The changes in commit:
381063133246 ("PM / sleep: Re-implement suspend-to-idle handling")
let suspend-to-idle code bypass the cpuidle_select() function to
enter the deepest idle state. The sanity checks carried out in
cpuidle_select() are bypassed too and this can cause breakage
on systems that try to suspend-to-idle with no registered cpuidle
driver.
This patch factors out a function cpuidle_device_disabled() that
is used to carry out sanity checks (ie CPUidle is disabled on the
cpu executing the code) in both cpuidle_select() and cpuidle_enter_freeze()
so that the checks are unified and carried out in both control paths.
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
---
drivers/cpuidle/cpuidle.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index f47edc6c..344fe6c 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -44,6 +44,12 @@ void disable_cpuidle(void)
off = 1;
}
+static bool cpuidle_device_disabled(struct cpuidle_driver *drv,
+ struct cpuidle_device *dev)
+{
+ return (off || !initialized || !drv || !dev || !dev->enabled);
+}
+
/**
* cpuidle_play_dead - cpu off-lining
*
@@ -124,6 +130,11 @@ void cpuidle_enter_freeze(void)
struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev);
int index;
+ if (cpuidle_device_disabled(drv, dev)) {
+ arch_cpu_idle();
+ return;
+ }
+
/*
* Find the deepest state with ->enter_freeze present, which guarantees
* that interrupts won't be enabled when it exits and allows the tick to
@@ -202,11 +213,8 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,
*/
int cpuidle_select(struct cpuidle_driver *drv, struct cpuidle_device *dev)
{
- if (off || !initialized)
- return -ENODEV;
-
- if (!drv || !dev || !dev->enabled)
- return -EBUSY;
+ if (cpuidle_device_disabled(drv, dev))
+ return -1;
return cpuidle_curr_governor->select(drv, dev);
}
--
2.2.1
next prev parent reply other threads:[~2015-02-24 17:58 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-24 17:58 [PATCH 0/2] drivers: cpuidle: minor suspend-to-idle fixes Lorenzo Pieralisi
2015-02-24 17:58 ` [PATCH 1/2] drivers: cpuidle: remove stale irq disabling call in cpuidle_enter_freeze() Lorenzo Pieralisi
2015-02-25 14:13 ` Daniel Lezcano
2015-02-25 14:39 ` Lorenzo Pieralisi
2015-02-25 23:36 ` Rafael J. Wysocki
2015-02-26 9:48 ` Lorenzo Pieralisi
2015-02-26 16:39 ` Rafael J. Wysocki
2015-02-24 17:58 ` Lorenzo Pieralisi [this message]
2015-02-25 14:30 ` [PATCH 2/2] drivers: cpuidle: add driver/device checks " Daniel Lezcano
2015-02-25 14:47 ` Lorenzo Pieralisi
2015-02-25 23:50 ` Rafael J. Wysocki
2015-02-26 0:35 ` Rafael J. Wysocki
2015-02-25 14:56 ` Lorenzo Pieralisi
2015-02-26 23:37 ` [PATCH 0/2] drivers: cpuidle: minor suspend-to-idle fixes Rafael J. Wysocki
2015-02-26 23:39 ` [PATCH 1/2] idle / sleep: Avoid excessive interrupts disabling and enabling Rafael J. Wysocki
2015-02-26 23:39 ` [PATCH 2/2] cpuidle / sleep: Do sanity checks in cpuidle_enter_freeze() too Rafael J. Wysocki
2015-02-27 8:41 ` [PATCH 0/2] drivers: cpuidle: minor suspend-to-idle fixes Peter Zijlstra
2015-02-27 10:00 ` Lorenzo Pieralisi
2015-02-27 22:11 ` Rafael J. Wysocki
2015-02-28 11:54 ` Lorenzo Pieralisi
2015-02-28 23:58 ` Rafael J. Wysocki
2015-03-02 10:08 ` Lorenzo Pieralisi
2015-03-02 13:13 ` Rafael J. Wysocki
2015-03-02 14:50 ` [PATCH 0/2] cpuidle / sleep: fix timer stopping regression (was: drivers: cpuidle: minor suspend-to-idle fixes) Rafael J. Wysocki
2015-03-02 14:51 ` [PATCH 1/2] cpuidle: Clean up fallback handling in cpuidle_idle_call() Rafael J. Wysocki
2015-03-02 16:05 ` Lorenzo Pieralisi
2015-03-02 22:30 ` Rafael J. Wysocki
2015-03-02 14:53 ` [PATCH 2/2] cpuidle / sleep: Use broadcast timer for states that stop local timer Rafael J. Wysocki
2015-03-02 16:27 ` Lorenzo Pieralisi
2015-03-02 22:28 ` Rafael J. Wysocki
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=1424800730-32059-3-git-send-email-lorenzo.pieralisi@arm.com \
--to=lorenzo.pieralisi@arm.com \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rjw@rjwysocki.net \
/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 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.