From: Jean Pihet <jean.pihet@newoldbits.com>
To: Colin Cross <ccross@android.com>
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-pm@lists.linux-foundation.org,
Kevin Hilman <khilman@ti.com>, Len Brown <len.brown@intel.com>,
Amit Kucheria <amit.kucheria@linaro.org>,
linux-tegra@vger.kernel.org, linux-omap@vger.kernel.org,
Arjan van de Ven <arjan@linux.intel.com>
Subject: Re: [linux-pm] [PATCH 1/3] cpuidle: refactor out cpuidle_enter_state
Date: Wed, 4 Jan 2012 15:08:02 +0100 [thread overview]
Message-ID: <CAORVsuV-=h9qVcFB7ezEOV2ptLMT=FJcdvaspLj-qAzFK4-NEQ@mail.gmail.com> (raw)
In-Reply-To: <1324426147-16735-2-git-send-email-ccross@android.com>
Hi Colin,
On Wed, Dec 21, 2011 at 1:09 AM, Colin Cross <ccross@android.com> wrote:
> Split the code to enter a state and update the stats into a helper
> function, cpuidle_enter_state, and export it. This function will
> be called by the coupled state code to handle entering the safe
> state and the final coupled state.
>
> Signed-off-by: Colin Cross <ccross@android.com>
> ---
> drivers/cpuidle/cpuidle.c | 43 +++++++++++++++++++++++++++++--------------
> drivers/cpuidle/cpuidle.h | 2 ++
> 2 files changed, 31 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
> index 06ce268..1486b3c 100644
> --- a/drivers/cpuidle/cpuidle.c
> +++ b/drivers/cpuidle/cpuidle.c
> @@ -54,6 +54,34 @@ static void cpuidle_kick_cpus(void) {}
> static int __cpuidle_register_device(struct cpuidle_device *dev);
>
> /**
> + * cpuidle_enter_state
> + *
> + * enter the state and update stats
> + */
> +int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,
> + int next_state)
> +{
> + int entered_state;
> + struct cpuidle_state *target_state;
> +
> + target_state = &drv->states[next_state];
> +
> + entered_state = target_state->enter(dev, drv, next_state);
> +
> + if (entered_state >= 0) {
> + /* Update cpuidle counters */
> + /* This can be moved to within driver enter routine
> + * but that results in multiple copies of same code.
> + */
> + dev->states_usage[entered_state].time +=
> + (unsigned long long)dev->last_residency;
> + dev->states_usage[entered_state].usage++;
> + }
> +
> + return entered_state;
> +}
> +
> +/**
> * cpuidle_idle_call - the main idle loop
> *
> * NOTE: no locks or semaphores should be used here
> @@ -63,7 +91,6 @@ int cpuidle_idle_call(void)
> {
> struct cpuidle_device *dev = __this_cpu_read(cpuidle_devices);
> struct cpuidle_driver *drv = cpuidle_get_driver();
> - struct cpuidle_state *target_state;
> int next_state, entered_state;
>
> if (off)
> @@ -92,26 +119,14 @@ int cpuidle_idle_call(void)
> return 0;
> }
>
> - target_state = &drv->states[next_state];
> -
> trace_power_start(POWER_CSTATE, next_state, dev->cpu);
> trace_cpu_idle(next_state, dev->cpu);
>
> - entered_state = target_state->enter(dev, drv, next_state);
> + entered_state = cpuidle_enter_state(dev, drv, next_state);
>
> trace_power_end(dev->cpu);
> trace_cpu_idle(PWR_EVENT_EXIT, dev->cpu);
The cpu_idle traces are only present in this function and not in
cpuidle_enter_state. Is that expected? Can all the transitions from
all the cpus get traced that way?
Regards,
Jean
next prev parent reply other threads:[~2012-01-04 14:08 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-21 0:09 [PATCH 0/3] coupled cpuidle state support Colin Cross
2011-12-21 0:09 ` [PATCH 1/3] cpuidle: refactor out cpuidle_enter_state Colin Cross
2012-01-04 14:08 ` Jean Pihet [this message]
2011-12-21 0:09 ` [PATCH 2/3] cpuidle: fix error handling in __cpuidle_register_device Colin Cross
2011-12-21 0:09 ` [PATCH 3/3] cpuidle: add support for states that affect multiple cpus Colin Cross
2011-12-21 9:02 ` [PATCH 0/3] coupled cpuidle state support Arjan van de Ven
2011-12-21 9:40 ` Colin Cross
2011-12-21 9:44 ` Arjan van de Ven
2011-12-21 9:55 ` Colin Cross
2011-12-21 12:12 ` Arjan van de Ven
2011-12-21 19:05 ` Colin Cross
2011-12-21 19:36 ` Arjan van de Ven
2011-12-21 19:42 ` [linux-pm] " Colin Cross
2011-12-22 8:35 ` Shilimkar, Santosh
2011-12-22 8:53 ` Arjan van de Ven
2011-12-22 9:30 ` Shilimkar, Santosh
2011-12-22 21:20 ` Colin Cross
2012-03-14 0:39 ` Colin Cross
2012-01-04 0:41 ` Kevin Hilman
2012-01-04 17:27 ` Shilimkar, Santosh
2012-01-20 8:46 ` Daniel Lezcano
2012-01-20 20:40 ` Colin Cross
2012-01-25 14:04 ` Daniel Lezcano
2012-01-31 14:13 ` Daniel Lezcano
2012-01-27 8:54 ` [linux-pm] " Vincent Guittot
2012-01-27 17:32 ` Colin Cross
2012-02-01 12:13 ` Vincent Guittot
2012-02-01 14:59 ` Lorenzo Pieralisi
2012-02-01 17:30 ` Colin Cross
2012-02-01 18:07 ` Lorenzo Pieralisi
2012-02-03 1:19 ` Colin Cross
[not found] ` <8762e8kqi6.fsf@ti.com>
2012-03-14 0:28 ` Colin Cross
2012-03-14 0:47 ` Colin Cross
2012-03-14 14:23 ` [linux-pm] " Kevin Hilman
2012-03-14 2:04 ` Arjan van de Ven
2012-03-14 2:21 ` Colin Cross
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='CAORVsuV-=h9qVcFB7ezEOV2ptLMT=FJcdvaspLj-qAzFK4-NEQ@mail.gmail.com' \
--to=jean.pihet@newoldbits.com \
--cc=amit.kucheria@linaro.org \
--cc=arjan@linux.intel.com \
--cc=ccross@android.com \
--cc=khilman@ti.com \
--cc=len.brown@intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=linux-tegra@vger.kernel.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).