From: Venkatesh Pallipadi Date: Mon, 29 Sep 2008 22:24:27 +0000 (-0700) Subject: cpuidle: use last_state which can reflect the actual state entered X-Git-Tag: v2.6.28-rc1~26^2~21^2~2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=887e301aa1105326f1412a98749024263b1031c7;p=~shefty%2Frdma-dev.git 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 Tested-by: Kevin Hilman Signed-off-by: Len Brown --- 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++;