Skip to contentSkip to conversation

Clear MSR_RI during RTAS calls

PATCH In review Anton Blanchard 1 participant 2 messages Feb 8, 2010 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Clear MSR_RI during RTAS calls

RTAS should never cause an exception but if it does (for example accessing outside our RMO) then we might go a long way through the kernel before oopsing. If we unset MSR_RI we should at least stop things on exception exit.

---

The setting of MSR_RI during RTAS calls went in ages ago (2003), and I'm not sure why. Clearly an exception inside RTAS is fatal since we most likely have a bad r13.

arch/powerpc/kernel/entry_64.S +1 -2
Index: powerpc.git/arch/powerpc/kernel/entry_64.S
===================================================================
@@ -791,9 +791,8 @@ _GLOBAL(enter_rtas)
 	
         li      r9,1
         rldicr  r9,r9,MSR_SF_LG,(63-MSR_SF_LG)
-	ori	r9,r9,MSR_IR|MSR_DR|MSR_FE0|MSR_FE1|MSR_FP
+	ori	r9,r9,MSR_IR|MSR_DR|MSR_FE0|MSR_FE1|MSR_FP|MSR_RI
 	andc	r6,r0,r9
-	ori	r6,r6,MSR_RI
 	sync				/* disable interrupts so SRR0/1 */
 	mtmsrd	r0			/* don't get trashed */
 
#1 lore raw
Quoted 4 lines

The setting of MSR_RI during RTAS calls went in ages ago (2003), and I'm not sure why. Clearly an exception inside RTAS is fatal since we most likely have a bad r13.

I wrote the r13 comment without thinking :) Regardless I think we want to catch any RTAS exception ASAP.

Anton