From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: rjw@rjwysocki.net
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>,
linux-pm@vger.kernel.org (open list:POWER MANAGEMENT CORE),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH V3 3/3] powercap/drivers/idle_inject: Specify the idle state to inject
Date: Thu, 3 Oct 2019 14:45:41 +0200 [thread overview]
Message-ID: <20191003124541.27147-3-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <20191003124541.27147-1-daniel.lezcano@linaro.org>
Currently the idle injection framework only allows to inject the
deepest idle state available on the system.
Give the opportunity to specify which idle state we want to inject by
adding a new function helper to set the state and use it when calling
play_idle().
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>
---
drivers/powercap/idle_inject.c | 14 +++++++++++++-
include/linux/idle_inject.h | 3 +++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/powercap/idle_inject.c b/drivers/powercap/idle_inject.c
index 233c878cbf46..a612c425d74c 100644
--- a/drivers/powercap/idle_inject.c
+++ b/drivers/powercap/idle_inject.c
@@ -66,6 +66,7 @@ struct idle_inject_thread {
*/
struct idle_inject_device {
struct hrtimer timer;
+ int state;
unsigned int idle_duration_us;
unsigned int run_duration_us;
unsigned long int cpumask[0];
@@ -140,7 +141,7 @@ static void idle_inject_fn(unsigned int cpu)
iit->should_run = 0;
play_idle(READ_ONCE(ii_dev->idle_duration_us),
- cpuidle_find_deepest_state());
+ READ_ONCE(ii_dev->state));
}
/**
@@ -171,6 +172,16 @@ void idle_inject_get_duration(struct idle_inject_device *ii_dev,
*idle_duration_us = READ_ONCE(ii_dev->idle_duration_us);
}
+/**
+ * idle_inject_set_state - set the idle state to inject
+ * @state: an integer for the idle state to inject
+ */
+void idle_inject_set_state(struct idle_inject_device *ii_dev, int state)
+{
+ if (state >= CPUIDLE_STATE_NOUSE && state < CPUIDLE_STATE_MAX)
+ WRITE_ONCE(ii_dev->state, state);
+}
+
/**
* idle_inject_start - start idle injections
* @ii_dev: idle injection control device structure
@@ -299,6 +310,7 @@ struct idle_inject_device *idle_inject_register(struct cpumask *cpumask)
cpumask_copy(to_cpumask(ii_dev->cpumask), cpumask);
hrtimer_init(&ii_dev->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
ii_dev->timer.function = idle_inject_timer_fn;
+ ii_dev->state = cpuidle_find_deepest_state();
for_each_cpu(cpu, to_cpumask(ii_dev->cpumask)) {
diff --git a/include/linux/idle_inject.h b/include/linux/idle_inject.h
index a445cd1a36c5..e2b26b9ccd34 100644
--- a/include/linux/idle_inject.h
+++ b/include/linux/idle_inject.h
@@ -26,4 +26,7 @@ void idle_inject_set_duration(struct idle_inject_device *ii_dev,
void idle_inject_get_duration(struct idle_inject_device *ii_dev,
unsigned int *run_duration_us,
unsigned int *idle_duration_us);
+
+void idle_inject_set_state(struct idle_inject_device *ii_dev, int state);
+
#endif /* __IDLE_INJECT_H__ */
--
2.17.1
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 ` [PATCH V3 2/3] cpuidle: play_idle: Specify play_idle with an idle state Daniel Lezcano
2019-10-03 16:51 ` kbuild test robot
2019-10-03 12:45 ` Daniel Lezcano [this message]
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-3-daniel.lezcano@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mathieu.poirier@linaro.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 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).