1 files changed, 143 insertions, 85 deletions

diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index a85f4874cba7..41b02c792aa3 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -40,7 +40,6 @@ __start_interrupts:
         .globl system_reset_pSeries;
 system_reset_pSeries:
         HMT_MEDIUM;
-        DO_KVM  0x100;
         SET_SCRATCH0(r13)
 #ifdef CONFIG_PPC_P7_NAP
 BEGIN_FTR_SECTION
@@ -50,82 +49,73 @@ BEGIN_FTR_SECTION
          * state loss at this time.
          */
         mfspr   r13,SPRN_SRR1
-        rlwinm  r13,r13,47-31,30,31
-        cmpwi   cr0,r13,1
-        bne     1f
-        b       .power7_wakeup_noloss
-1:      cmpwi   cr0,r13,2
-        bne     1f
-        b       .power7_wakeup_loss
+        rlwinm. r13,r13,47-31,30,31
+        beq     9f
+
+        /* waking up from powersave (nap) state */
+        cmpwi   cr1,r13,2
         /* Total loss of HV state is fatal, we could try to use the
          * PIR to locate a PACA, then use an emergency stack etc...
          * but for now, let's just stay stuck here
          */
-1:      cmpwi   cr0,r13,3
-        beq     .
-END_FTR_SECTION_IFSET(CPU_FTR_HVMODE_206)
+        bgt     cr1,.
+        GET_PACA(r13)
+
+#ifdef CONFIG_KVM_BOOK3S_64_HV
+        lbz     r0,PACAPROCSTART(r13)
+        cmpwi   r0,0x80
+        bne     1f
+        li      r0,0
+        stb     r0,PACAPROCSTART(r13)
+        b       kvm_start_guest
+1:
+#endif
+
+        beq     cr1,2f
+        b       .power7_wakeup_noloss
+2:      b       .power7_wakeup_loss
+9:
+END_FTR_SECTION_IFSET(CPU_FTR_HVMODE | CPU_FTR_ARCH_206)
 #endif /* CONFIG_PPC_P7_NAP */
-        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common, EXC_STD)
+        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common, EXC_STD,
+                                 NOTEST, 0x100)
 
         . = 0x200
-_machine_check_pSeries:
-        HMT_MEDIUM
-        DO_KVM  0x200
-        SET_SCRATCH0(r13)
-        EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common, EXC_STD)
+machine_check_pSeries_1:
+        /* This is moved out of line as it can be patched by FW, but
+         * some code path might still want to branch into the original
+         * vector
+         */
+        b       machine_check_pSeries
 
         . = 0x300
         .globl data_access_pSeries
 data_access_pSeries:
         HMT_MEDIUM
-        DO_KVM  0x300
         SET_SCRATCH0(r13)
+#ifndef CONFIG_POWER4_ONLY
 BEGIN_FTR_SECTION
-        GET_PACA(r13)
-        std     r9,PACA_EXSLB+EX_R9(r13)
-        std     r10,PACA_EXSLB+EX_R10(r13)
-        mfspr   r10,SPRN_DAR
-        mfspr   r9,SPRN_DSISR
-        srdi    r10,r10,60
-        rlwimi  r10,r9,16,0x20
-        mfcr    r9
-        cmpwi   r10,0x2c
-        beq     do_stab_bolted_pSeries
-        ld      r10,PACA_EXSLB+EX_R10(r13)
-        std     r11,PACA_EXGEN+EX_R11(r13)
-        ld      r11,PACA_EXSLB+EX_R9(r13)
-        std     r12,PACA_EXGEN+EX_R12(r13)
-        GET_SCRATCH0(r12)
-        std     r10,PACA_EXGEN+EX_R10(r13)
-        std     r11,PACA_EXGEN+EX_R9(r13)
-        std     r12,PACA_EXGEN+EX_R13(r13)
-        EXCEPTION_PROLOG_PSERIES_1(data_access_common, EXC_STD)
-FTR_SECTION_ELSE
-        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, data_access_common, EXC_STD)
-ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_SLB)
+        b       data_access_check_stab
+data_access_not_stab:
+END_MMU_FTR_SECTION_IFCLR(MMU_FTR_SLB)
+#endif
+        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, data_access_common, EXC_STD,
+                                 KVMTEST_PR, 0x300)
 
         . = 0x380
         .globl data_access_slb_pSeries
 data_access_slb_pSeries:
         HMT_MEDIUM
-        DO_KVM  0x380
         SET_SCRATCH0(r13)
-        GET_PACA(r13)
+        EXCEPTION_PROLOG_1(PACA_EXSLB, KVMTEST_PR, 0x380)
         std     r3,PACA_EXSLB+EX_R3(r13)
         mfspr   r3,SPRN_DAR
-        std     r9,PACA_EXSLB+EX_R9(r13)        /* save r9 - r12 */
-        mfcr    r9
 #ifdef __DISABLED__
         /* Keep that around for when we re-implement dynamic VSIDs */
         cmpdi   r3,0
         bge     slb_miss_user_pseries
 #endif /* __DISABLED__ */
-        std     r10,PACA_EXSLB+EX_R10(r13)
-        std     r11,PACA_EXSLB+EX_R11(r13)
-        std     r12,PACA_EXSLB+EX_R12(r13)
-        GET_SCRATCH0(r10)
-        std     r10,PACA_EXSLB+EX_R13(r13)
-        mfspr   r12,SPRN_SRR1           /* and SRR1 */
+        mfspr   r12,SPRN_SRR1
 #ifndef CONFIG_RELOCATABLE
         b       .slb_miss_realmode
 #else
@@ -147,24 +137,16 @@ data_access_slb_pSeries:
         .globl instruction_access_slb_pSeries
 instruction_access_slb_pSeries:
         HMT_MEDIUM
-        DO_KVM  0x480
         SET_SCRATCH0(r13)
-        GET_PACA(r13)
+        EXCEPTION_PROLOG_1(PACA_EXSLB, KVMTEST_PR, 0x480)
         std     r3,PACA_EXSLB+EX_R3(r13)
         mfspr   r3,SPRN_SRR0            /* SRR0 is faulting address */
-        std     r9,PACA_EXSLB+EX_R9(r13)        /* save r9 - r12 */
-        mfcr    r9
 #ifdef __DISABLED__
         /* Keep that around for when we re-implement dynamic VSIDs */
         cmpdi   r3,0
         bge     slb_miss_user_pseries
 #endif /* __DISABLED__ */
-        std     r10,PACA_EXSLB+EX_R10(r13)
-        std     r11,PACA_EXSLB+EX_R11(r13)
-        std     r12,PACA_EXSLB+EX_R12(r13)
-        GET_SCRATCH0(r10)
-        std     r10,PACA_EXSLB+EX_R13(r13)
-        mfspr   r12,SPRN_SRR1           /* and SRR1 */
+        mfspr   r12,SPRN_SRR1
 #ifndef CONFIG_RELOCATABLE
         b       .slb_miss_realmode
 #else
@@ -184,26 +166,46 @@ instruction_access_slb_pSeries:
 hardware_interrupt_pSeries:
 hardware_interrupt_hv:
         BEGIN_FTR_SECTION
-                _MASKABLE_EXCEPTION_PSERIES(0x500, hardware_interrupt, EXC_STD)
+                _MASKABLE_EXCEPTION_PSERIES(0x502, hardware_interrupt,
+                                            EXC_HV, SOFTEN_TEST_HV)
+                KVM_HANDLER(PACA_EXGEN, EXC_HV, 0x502)
         FTR_SECTION_ELSE
-                _MASKABLE_EXCEPTION_PSERIES(0x502, hardware_interrupt, EXC_HV)
-        ALT_FTR_SECTION_END_IFCLR(CPU_FTR_HVMODE_206)
+                _MASKABLE_EXCEPTION_PSERIES(0x500, hardware_interrupt,
+                                            EXC_STD, SOFTEN_TEST_HV_201)
+                KVM_HANDLER(PACA_EXGEN, EXC_STD, 0x500)
+        ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE | CPU_FTR_ARCH_206)
 
         STD_EXCEPTION_PSERIES(0x600, 0x600, alignment)
+        KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0x600)
+
         STD_EXCEPTION_PSERIES(0x700, 0x700, program_check)
+        KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0x700)
+
         STD_EXCEPTION_PSERIES(0x800, 0x800, fp_unavailable)
+        KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0x800)
 
         MASKABLE_EXCEPTION_PSERIES(0x900, 0x900, decrementer)
-        MASKABLE_EXCEPTION_HV(0x980, 0x980, decrementer)
+        MASKABLE_EXCEPTION_HV(0x980, 0x982, decrementer)
 
         STD_EXCEPTION_PSERIES(0xa00, 0xa00, trap_0a)
+        KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0xa00)
+
         STD_EXCEPTION_PSERIES(0xb00, 0xb00, trap_0b)
+        KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0xb00)
 
         . = 0xc00
         .globl  system_call_pSeries
 system_call_pSeries:
         HMT_MEDIUM
-        DO_KVM  0xc00
+#ifdef CONFIG_KVM_BOOK3S_64_HANDLER
+        SET_SCRATCH0(r13)
+        GET_PACA(r13)
+        std     r9,PACA_EXGEN+EX_R9(r13)
+        std     r10,PACA_EXGEN+EX_R10(r13)
+        mfcr    r9
+        KVMTEST(0xc00)
+        GET_SCRATCH0(r13)
+#endif
 BEGIN_FTR_SECTION
         cmpdi   r0,0x1ebe
         beq-    1f
@@ -220,6 +222,8 @@ END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE)
         rfid
         b       .       /* prevent speculative execution */
 
+        KVM_HANDLER(PACA_EXGEN, EXC_STD, 0xc00)
+
 /* Fast LE/BE switch system call */
 1:      mfspr   r12,SPRN_SRR1
         xori    r12,r12,MSR_LE
@@ -228,6 +232,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE)
         b       .
 
         STD_EXCEPTION_PSERIES(0xd00, 0xd00, single_step)
+        KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0xd00)
 
         /* At 0xe??? we have a bunch of hypervisor exceptions, we branch
          * out of line to handle them
@@ -262,30 +267,93 @@ vsx_unavailable_pSeries_1:
 
 #ifdef CONFIG_CBE_RAS
         STD_EXCEPTION_HV(0x1200, 0x1202, cbe_system_error)
+        KVM_HANDLER_PR_SKIP(PACA_EXGEN, EXC_HV, 0x1202)
 #endif /* CONFIG_CBE_RAS */
+
         STD_EXCEPTION_PSERIES(0x1300, 0x1300, instruction_breakpoint)
+        KVM_HANDLER_PR_SKIP(PACA_EXGEN, EXC_STD, 0x1300)
+
 #ifdef CONFIG_CBE_RAS
         STD_EXCEPTION_HV(0x1600, 0x1602, cbe_maintenance)
+        KVM_HANDLER_PR_SKIP(PACA_EXGEN, EXC_HV, 0x1602)
 #endif /* CONFIG_CBE_RAS */
+
         STD_EXCEPTION_PSERIES(0x1700, 0x1700, altivec_assist)
+        KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0x1700)
+
 #ifdef CONFIG_CBE_RAS
         STD_EXCEPTION_HV(0x1800, 0x1802, cbe_thermal)
+        KVM_HANDLER_PR_SKIP(PACA_EXGEN, EXC_HV, 0x1802)
 #endif /* CONFIG_CBE_RAS */
 
         . = 0x3000
 
 /*** Out of line interrupts support ***/
 
+        /* moved from 0x200 */
+machine_check_pSeries:
+        .globl machine_check_fwnmi
+machine_check_fwnmi:
+        HMT_MEDIUM
+        SET_SCRATCH0(r13)               /* save r13 */
+        EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common,
+                                 EXC_STD, KVMTEST, 0x200)
+        KVM_HANDLER_SKIP(PACA_EXMC, EXC_STD, 0x200)
+
+#ifndef CONFIG_POWER4_ONLY
+        /* moved from 0x300 */
+data_access_check_stab:
+        GET_PACA(r13)
+        std     r9,PACA_EXSLB+EX_R9(r13)
+        std     r10,PACA_EXSLB+EX_R10(r13)
+        mfspr   r10,SPRN_DAR
+        mfspr   r9,SPRN_DSISR
+        srdi    r10,r10,60
+        rlwimi  r10,r9,16,0x20
+#ifdef CONFIG_KVM_BOOK3S_PR
+        lbz     r9,HSTATE_IN_GUEST(r13)
+        rlwimi  r10,r9,8,0x300
+#endif
+        mfcr    r9
+        cmpwi   r10,0x2c
+        beq     do_stab_bolted_pSeries
+        mtcrf   0x80,r9
+        ld      r9,PACA_EXSLB+EX_R9(r13)
+        ld      r10,PACA_EXSLB+EX_R10(r13)
+        b       data_access_not_stab
+do_stab_bolted_pSeries:
+        std     r11,PACA_EXSLB+EX_R11(r13)
+        std     r12,PACA_EXSLB+EX_R12(r13)
+        GET_SCRATCH0(r10)
+        std     r10,PACA_EXSLB+EX_R13(r13)
+        EXCEPTION_PROLOG_PSERIES_1(.do_stab_bolted, EXC_STD)
+#endif /* CONFIG_POWER4_ONLY */
+
+        KVM_HANDLER_PR_SKIP(PACA_EXGEN, EXC_STD, 0x300)
+        KVM_HANDLER_PR_SKIP(PACA_EXSLB, EXC_STD, 0x380)
+        KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0x400)
+        KVM_HANDLER_PR(PACA_EXSLB, EXC_STD, 0x480)
+        KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0x900)
+        KVM_HANDLER(PACA_EXGEN, EXC_HV, 0x982)
+
+        .align  7
         /* moved from 0xe00 */
-        STD_EXCEPTION_HV(., 0xe00, h_data_storage)
-        STD_EXCEPTION_HV(., 0xe20, h_instr_storage)
-        STD_EXCEPTION_HV(., 0xe40, emulation_assist)
-        STD_EXCEPTION_HV(., 0xe60, hmi_exception) /* need to flush cache ? */
+        STD_EXCEPTION_HV(., 0xe02, h_data_storage)
+        KVM_HANDLER_SKIP(PACA_EXGEN, EXC_HV, 0xe02)
+        STD_EXCEPTION_HV(., 0xe22, h_instr_storage)
+        KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe22)
+        STD_EXCEPTION_HV(., 0xe42, emulation_assist)
+        KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe42)
+        STD_EXCEPTION_HV(., 0xe62, hmi_exception) /* need to flush cache ? */
+        KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe62)
 
         /* moved from 0xf00 */
         STD_EXCEPTION_PSERIES(., 0xf00, performance_monitor)
+        KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0xf00)
         STD_EXCEPTION_PSERIES(., 0xf20, altivec_unavailable)
+        KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0xf20)
         STD_EXCEPTION_PSERIES(., 0xf40, vsx_unavailable)
+        KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0xf40)
 
 /*
  * An interrupt came in while soft-disabled; clear EE in SRR1,
@@ -317,14 +385,6 @@ masked_Hinterrupt:
         hrfid
         b       .
 
-        .align  7
-do_stab_bolted_pSeries:
-        std     r11,PACA_EXSLB+EX_R11(r13)
-        std     r12,PACA_EXSLB+EX_R12(r13)
-        GET_SCRATCH0(r10)
-        std     r10,PACA_EXSLB+EX_R13(r13)
-        EXCEPTION_PROLOG_PSERIES_1(.do_stab_bolted, EXC_STD)
-
 #ifdef CONFIG_PPC_PSERIES
 /*
  * Vectors for the FWNMI option.  Share common code.
@@ -334,14 +394,8 @@ do_stab_bolted_pSeries:
 system_reset_fwnmi:
         HMT_MEDIUM
         SET_SCRATCH0(r13)               /* save r13 */
-        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common, EXC_STD)
-
-        .globl machine_check_fwnmi
-      .align 7
-machine_check_fwnmi:
-        HMT_MEDIUM
-        SET_SCRATCH0(r13)               /* save r13 */
-        EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common, EXC_STD)
+        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common, EXC_STD,
+                                 NOTEST, 0x100)
 
 #endif /* CONFIG_PPC_PSERIES */
 
@@ -376,7 +430,11 @@ slb_miss_user_pseries:
 /* KVM's trampoline code needs to be close to the interrupt handlers */
 
 #ifdef CONFIG_KVM_BOOK3S_64_HANDLER
+#ifdef CONFIG_KVM_BOOK3S_PR
 #include "../kvm/book3s_rmhandlers.S"
+#else
+#include "../kvm/book3s_hv_rmhandlers.S"
+#endif
 #endif
 
         .align  7