summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/exceptions-64e.S
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2009-08-18 19:08:31 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-08-28 14:24:13 +1000
commit6c188829d2c20a1d02aedb13db34b3ca2a8f0dc4 (patch)
treebf29dd33f42dda4ac30651998685145693c35342 /arch/powerpc/kernel/exceptions-64e.S
parentf45c4486f70d0a6502e7499a8664cdc0bba84cd2 (diff)
powerpc/book3e-64: Wait til generic_calibrate_decr to enable decrementer
Match what we do on 32-bit Book-E processors and enable the decrementer in generic_calibrate_decr. We need to make sure we disable the decrementer early in boot since we currently use lazy (soft) interrupt on 64-bit Book-E and possible get a decrementer exception before we are ready for it. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/exceptions-64e.S')
-rw-r--r--arch/powerpc/kernel/exceptions-64e.S6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
index 695d4847d22..3611b0e7d46 100644
--- a/arch/powerpc/kernel/exceptions-64e.S
+++ b/arch/powerpc/kernel/exceptions-64e.S
@@ -774,9 +774,11 @@ _STATIC(init_thread_book3e)
/* Make sure interrupts are off */
wrteei 0
- /* disable watchdog and FIT and enable DEC interrupts */
- lis r3,TCR_DIE@h
+ /* disable all timers and clear out status */
+ li r3,0
mtspr SPRN_TCR,r3
+ mfspr r3,SPRN_TSR
+ mtspr SPRN_TSR,r3
blr