From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: rjw@rjwysocki.net
Cc: preeti@linux.vnet.ibm.com, nicolas.pitre@linaro.org,
linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
peterz@infradead.org, linaro-kernel@lists.linaro.org,
patches@linaro.org, lenb@kernel.org
Subject: [PATCH V3 4/6] cpuidle: idle: menu: Don't reflect when a state selection failed
Date: Fri, 7 Nov 2014 15:31:25 +0100 [thread overview]
Message-ID: <1415370687-18688-5-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <1415370687-18688-1-git-send-email-daniel.lezcano@linaro.org>
In the current code, the check to reflect or not the outcoming state is done
against the idle state which has been chosen and its value.
Instead of doing a check in each of the reflect functions, just don't call reflect
if something went wrong in the idle path.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Nicolas Pitre <nico@linaro.org>
---
drivers/cpuidle/governors/ladder.c | 3 +--
| 3 +--
kernel/sched/idle.c | 3 ++-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c
index 51c9ccd..86e4d49 100644
--- a/drivers/cpuidle/governors/ladder.c
+++ b/drivers/cpuidle/governors/ladder.c
@@ -165,8 +165,7 @@ static int ladder_enable_device(struct cpuidle_driver *drv,
static void ladder_reflect(struct cpuidle_device *dev, int index)
{
struct ladder_device *ldev = this_cpu_ptr(&ladder_devices);
- if (index > 0)
- ldev->last_state_idx = index;
+ ldev->last_state_idx = index;
}
static struct cpuidle_governor ladder_governor = {
--git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index 91b3000..2e4a315 100644
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -366,8 +366,7 @@ static void menu_reflect(struct cpuidle_device *dev, int index)
{
struct menu_device *data = this_cpu_ptr(&menu_devices);
data->last_state_idx = index;
- if (index >= 0)
- data->needs_update = 1;
+ data->needs_update = 1;
}
/**
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index 0a7a1d1..0ae1cc8 100644
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -173,7 +173,8 @@ use_default:
/*
* Give the governor an opportunity to reflect on the outcome
*/
- cpuidle_reflect(dev, entered_state);
+ if (entered_state >= 0)
+ cpuidle_reflect(dev, entered_state);
exit_idle:
__current_set_polling();
--
1.9.1
next prev parent reply other threads:[~2014-11-07 14:32 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-07 14:31 [PATCH V3 0/6] sched: idle: cpuidle: cleanups and fixes Daniel Lezcano
2014-11-07 14:31 ` [PATCH V3 1/6] sched: idle: Add a weak arch_cpu_idle_poll function Daniel Lezcano
2014-11-08 10:39 ` Preeti U Murthy
2014-11-10 12:29 ` Peter Zijlstra
2014-11-10 14:20 ` Preeti U Murthy
2014-11-10 15:17 ` Peter Zijlstra
2014-11-11 11:00 ` Preeti U Murthy
2014-11-07 14:31 ` [PATCH V3 2/6] sched: idle: cpuidle: Check the latency req before idle Daniel Lezcano
2014-11-08 10:40 ` Preeti U Murthy
2014-11-10 12:41 ` Peter Zijlstra
2014-11-10 15:12 ` Daniel Lezcano
2014-11-10 15:28 ` Peter Zijlstra
2014-11-10 15:58 ` Daniel Lezcano
2014-11-10 16:15 ` Peter Zijlstra
2014-11-10 17:19 ` Daniel Lezcano
2014-11-10 19:48 ` Peter Zijlstra
2014-11-10 22:21 ` Daniel Lezcano
2014-11-11 10:20 ` Peter Zijlstra
2014-11-12 13:53 ` Daniel Lezcano
2014-11-12 15:02 ` Peter Zijlstra
2014-11-12 17:52 ` Daniel Lezcano
2014-11-07 14:31 ` [PATCH V3 3/6] sched: idle: Get the next timer event and pass it the cpuidle framework Daniel Lezcano
2014-11-08 10:44 ` Preeti U Murthy
2014-11-10 12:43 ` Peter Zijlstra
2014-11-10 15:15 ` Daniel Lezcano
2014-11-07 14:31 ` Daniel Lezcano [this message]
2014-11-08 10:41 ` [PATCH V3 4/6] cpuidle: idle: menu: Don't reflect when a state selection failed Preeti U Murthy
2014-11-07 14:31 ` [PATCH V3 5/6] cpuidle: menu: Fix the get_typical_interval Daniel Lezcano
2014-11-07 14:31 ` [PATCH V3 6/6] cpuidle: menu: Move the update function before its declaration Daniel Lezcano
2014-11-07 14:34 ` [PATCH V3 0/6] sched: idle: cpuidle: cleanups and fixes 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=1415370687-18688-5-git-send-email-daniel.lezcano@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=lenb@kernel.org \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=nicolas.pitre@linaro.org \
--cc=patches@linaro.org \
--cc=peterz@infradead.org \
--cc=preeti@linux.vnet.ibm.com \
--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 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).