1 files changed, 17 insertions, 34 deletions

diff --git a/arch/powerpc/kvm/book3s_rmhandlers.S b/arch/powerpc/kvm/book3s_rmhandlers.S
index 5ee66edd749d..34187585c507 100644
--- a/arch/powerpc/kvm/book3s_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_rmhandlers.S
@@ -36,9 +36,8 @@
 
 #if defined(CONFIG_PPC_BOOK3S_64)
 
-#define LOAD_SHADOW_VCPU(reg)   GET_PACA(reg)                                   
-#define MSR_NOIRQ               MSR_KERNEL & ~(MSR_IR | MSR_DR)
 #define FUNC(name)              GLUE(.,name)
+#define MTMSR_EERI(reg)         mtmsrd  (reg),1
 
         .globl  kvmppc_skip_interrupt
 kvmppc_skip_interrupt:
@@ -68,8 +67,8 @@ kvmppc_skip_Hinterrupt:
 
 #elif defined(CONFIG_PPC_BOOK3S_32)
 
-#define MSR_NOIRQ               MSR_KERNEL
 #define FUNC(name)              name
+#define MTMSR_EERI(reg)         mtmsr   (reg)
 
 .macro INTERRUPT_TRAMPOLINE intno
 
@@ -170,40 +169,24 @@ kvmppc_handler_skip_ins:
 #endif
 
 /*
- * This trampoline brings us back to a real mode handler
- *
- * Input Registers:
- *
- * R5 = SRR0
- * R6 = SRR1
- * LR = real-mode IP
+ * Call kvmppc_handler_trampoline_enter in real mode
  *
+ * On entry, r4 contains the guest shadow MSR
  */
-.global kvmppc_handler_lowmem_trampoline
-kvmppc_handler_lowmem_trampoline:
-
-        mtsrr0  r5
+_GLOBAL(kvmppc_entry_trampoline)
+        mfmsr   r5
+        LOAD_REG_ADDR(r7, kvmppc_handler_trampoline_enter)
+        toreal(r7)
+
+        li      r9, MSR_RI
+        ori     r9, r9, MSR_EE
+        andc    r9, r5, r9      /* Clear EE and RI in MSR value */
+        li      r6, MSR_IR | MSR_DR
+        ori     r6, r6, MSR_EE
+        andc    r6, r5, r6      /* Clear EE, DR and IR in MSR value */
+        MTMSR_EERI(r9)          /* Clear EE and RI in MSR */
+        mtsrr0  r7              /* before we set srr0/1 */
         mtsrr1  r6
-        blr
-kvmppc_handler_lowmem_trampoline_end:
-
-/*
- * Call a function in real mode
- *
- * Input Registers:
- *
- * R3 = function
- * R4 = MSR
- * R5 = scratch register
- *
- */
-_GLOBAL(kvmppc_rmcall)
-        LOAD_REG_IMMEDIATE(r5, MSR_NOIRQ)
-        mtmsr   r5              /* Disable relocation and interrupts, so mtsrr
-                                   doesn't get interrupted */
-        sync
-        mtsrr0  r3
-        mtsrr1  r4
         RFI
 
 #if defined(CONFIG_PPC_BOOK3S_32)