From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: rjw@rjwysocki.net
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>,
Zhang Rui <rui.zhang@intel.com>,
Eduardo Valentin <edubezval@gmail.com>,
Ingo Molnar <mingo@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Luc Van Oostenryck <luc.vanoostenryck@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>,
Amit Kucheria <amit.kucheria@linaro.org>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Jiri Kosina <jkosina@suse.cz>,
Nicholas Piggin <npiggin@gmail.com>,
linux-pm@vger.kernel.org (open list:POWER MANAGEMENT CORE),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH V3 2/3] cpuidle: play_idle: Specify play_idle with an idle state
Date: Thu, 3 Oct 2019 14:45:40 +0200 [thread overview]
Message-ID: <20191003124541.27147-2-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <20191003124541.27147-1-daniel.lezcano@linaro.org>
Currently, the play_idle function does not allow to tell which idle
state we want to go. Improve this by passing the idle state as
parameter to the function.
There is no functional changes, the cpuidle state is the deepest one.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
* V3 :
- Add missing cpuidle.h header
---
drivers/powercap/idle_inject.c | 4 +++-
drivers/thermal/intel/intel_powerclamp.c | 4 +++-
include/linux/cpu.h | 2 +-
kernel/sched/idle.c | 4 ++--
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/drivers/powercap/idle_inject.c b/drivers/powercap/idle_inject.c
index cd1270614cc6..233c878cbf46 100644
--- a/drivers/powercap/idle_inject.c
+++ b/drivers/powercap/idle_inject.c
@@ -38,6 +38,7 @@
#define pr_fmt(fmt) "ii_dev: " fmt
#include <linux/cpu.h>
+#include <linux/cpuidle.h>
#include <linux/hrtimer.h>
#include <linux/kthread.h>
#include <linux/sched.h>
@@ -138,7 +139,8 @@ static void idle_inject_fn(unsigned int cpu)
*/
iit->should_run = 0;
- play_idle(READ_ONCE(ii_dev->idle_duration_us));
+ play_idle(READ_ONCE(ii_dev->idle_duration_us),
+ cpuidle_find_deepest_state());
}
/**
diff --git a/drivers/thermal/intel/intel_powerclamp.c b/drivers/thermal/intel/intel_powerclamp.c
index 53216dcbe173..b55786c169ae 100644
--- a/drivers/thermal/intel/intel_powerclamp.c
+++ b/drivers/thermal/intel/intel_powerclamp.c
@@ -29,6 +29,7 @@
#include <linux/delay.h>
#include <linux/kthread.h>
#include <linux/cpu.h>
+#include <linux/cpuidle.h>
#include <linux/thermal.h>
#include <linux/slab.h>
#include <linux/tick.h>
@@ -430,7 +431,8 @@ static void clamp_idle_injection_func(struct kthread_work *work)
if (should_skip)
goto balance;
- play_idle(jiffies_to_usecs(w_data->duration_jiffies));
+ play_idle(jiffies_to_usecs(w_data->duration_jiffies),
+ cpuidle_find_deepest_state());
balance:
if (clamping && w_data->clamping && cpu_online(w_data->cpu))
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 88dc0c653925..76e3038b63ce 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -179,7 +179,7 @@ void arch_cpu_idle_dead(void);
int cpu_report_state(int cpu);
int cpu_check_up_prepare(int cpu);
void cpu_set_state_online(int cpu);
-void play_idle(unsigned long duration_us);
+void play_idle(unsigned long duration_us, int state);
#ifdef CONFIG_HOTPLUG_CPU
bool cpu_wait_death(unsigned int cpu, int seconds);
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index 17da9cb309e1..ead439dab2b5 100644
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -311,7 +311,7 @@ static enum hrtimer_restart idle_inject_timer_fn(struct hrtimer *timer)
return HRTIMER_NORESTART;
}
-void play_idle(unsigned long duration_us)
+void play_idle(unsigned long duration_us, int state)
{
struct idle_timer it;
@@ -328,7 +328,7 @@ void play_idle(unsigned long duration_us)
rcu_sleep_check();
preempt_disable();
current->flags |= PF_IDLE;
- cpuidle_use_state(cpuidle_find_deepest_state());
+ cpuidle_use_state(state);
it.done = 0;
hrtimer_init_on_stack(&it.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
--
2.17.1
next prev parent reply other threads:[~2019-10-03 12:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-03 12:45 [PATCH V3 1/3] cpuidle: play_idle: Make play_idle more flexible Daniel Lezcano
2019-10-03 12:45 ` Daniel Lezcano [this message]
2019-10-03 16:51 ` [PATCH V3 2/3] cpuidle: play_idle: Specify play_idle with an idle state kbuild test robot
2019-10-03 12:45 ` [PATCH V3 3/3] powercap/drivers/idle_inject: Specify the idle state to inject 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=20191003124541.27147-2-daniel.lezcano@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=amit.kucheria@linaro.org \
--cc=edubezval@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jkosina@suse.cz \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=luc.vanoostenryck@gmail.com \
--cc=mathieu.poirier@linaro.org \
--cc=mingo@redhat.com \
--cc=npiggin@gmail.com \
--cc=peterz@infradead.org \
--cc=rjw@rjwysocki.net \
--cc=rui.zhang@intel.com \
--cc=tglx@linutronix.de \
/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).