diff options
| author | Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> | 2008-09-29 15:24:27 -0700 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-16 17:59:44 -0400 |
| commit | 887e301aa1105326f1412a98749024263b1031c7 (patch) | |
| tree | 0079a925ac94cb0205858aba07dc2d9714a7ddc4 | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
cpuidle: use last_state which can reflect the actual state entered
cpuidle accounts the idle time for the C-state it was trying to enter and
not to the actual state that the driver eventually entered. The driver may
select a different state than the one chosen by cpuidle due to
constraints like bus-mastering, etc.
Change the time acounting code to look at the dev->last_state after
returning from target_state->enter(). Driver can modify dev->last_state
internally, inside the enter routine to reflect the actual C-state
entered.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Tested-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/cpuidle/cpuidle.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index 5ce07b517c5..eb2cade562d 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -67,8 +67,11 @@ static void cpuidle_idle_call(void) target_state = &dev->states[next_state]; /* enter the state and update stats */ - dev->last_residency = target_state->enter(dev, target_state); dev->last_state = target_state; + dev->last_residency = target_state->enter(dev, target_state); + if (dev->last_state) + target_state = dev->last_state; + target_state->time += (unsigned long long)dev->last_residency; target_state->usage++; |