diff options
| author | Michael Neuling <mikey@neuling.org> | 2014-06-11 15:59:27 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-06-11 17:05:12 +1000 |
| commit | 9b6a68d94333cf19d4ec0f2aaf9f9eb68866630e (patch) | |
| tree | 59b7dc95763f5f070ca8a8f50582cb938aeebf5a /drivers/cpuidle/cpuidle-powernv.c | |
| parent | 5c7a35e3e25232aef8d7aee484436f8cbe3b9b94 (diff) | |
| download | talos-op-linux-9b6a68d94333cf19d4ec0f2aaf9f9eb68866630e.tar.gz talos-op-linux-9b6a68d94333cf19d4ec0f2aaf9f9eb68866630e.zip | |
powerpc/cpuidle: Only clear LPCR decrementer wakeup bit on fast sleep entry
Currently when entering fastsleep we clear all LPCR PECE bits.
This patch changes it to only clear the decrementer bit (ie. PECE1), which is
the only bit we really need to clear here. This is needed if we want to set
other wakeup causes like the PECEDH bit so we can use hypervisor doorbells on
powernv. Also we no longer clear the MER bit as it should never be set in the
host anyway.
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers/cpuidle/cpuidle-powernv.c')
| -rw-r--r-- | drivers/cpuidle/cpuidle-powernv.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/cpuidle/cpuidle-powernv.c b/drivers/cpuidle/cpuidle-powernv.c index 719f6fb5b1c3..74f5788d50b1 100644 --- a/drivers/cpuidle/cpuidle-powernv.c +++ b/drivers/cpuidle/cpuidle-powernv.c @@ -73,12 +73,10 @@ static int fastsleep_loop(struct cpuidle_device *dev, return index; new_lpcr = old_lpcr; - new_lpcr &= ~(LPCR_MER | LPCR_PECE); /* lpcr[mer] must be 0 */ - - /* exit powersave upon external interrupt, but not decrementer - * interrupt. + /* Do not exit powersave upon decrementer as we've setup the timer + * offload. */ - new_lpcr |= LPCR_PECE0; + new_lpcr &= ~LPCR_PECE1; mtspr(SPRN_LPCR, new_lpcr); power7_sleep(); |
