3 files changed, 54 insertions, 0 deletions

diff --git a/arch/powerpc/include/asm/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h
index 817bd1ac1752..0f0ad9fa01c1 100644
--- a/arch/powerpc/include/asm/reg_booke.h
+++ b/arch/powerpc/include/asm/reg_booke.h
@@ -83,6 +83,10 @@
 #define SPRN_IVOR13     0x19D   /* Interrupt Vector Offset Register 13 */
 #define SPRN_IVOR14     0x19E   /* Interrupt Vector Offset Register 14 */
 #define SPRN_IVOR15     0x19F   /* Interrupt Vector Offset Register 15 */
+#define SPRN_IVOR38     0x1B0   /* Interrupt Vector Offset Register 38 */
+#define SPRN_IVOR39     0x1B1   /* Interrupt Vector Offset Register 39 */
+#define SPRN_IVOR40     0x1B2   /* Interrupt Vector Offset Register 40 */
+#define SPRN_IVOR41     0x1B3   /* Interrupt Vector Offset Register 41 */
 #define SPRN_SPEFSCR    0x200   /* SPE & Embedded FP Status & Control */
 #define SPRN_BBEAR      0x201   /* Branch Buffer Entry Address Register */
 #define SPRN_BBTAR      0x202   /* Branch Buffer Target Address Register */
diff --git a/arch/powerpc/kernel/cpu_setup_fsl_booke.S b/arch/powerpc/kernel/cpu_setup_fsl_booke.S
index 913611105c1f..8053db02b85e 100644
--- a/arch/powerpc/kernel/cpu_setup_fsl_booke.S
+++ b/arch/powerpc/kernel/cpu_setup_fsl_booke.S
@@ -88,6 +88,9 @@ _GLOBAL(__setup_cpu_e5500)
         bl      __e500_dcache_setup
 #ifdef CONFIG_PPC_BOOK3E_64
         bl      .__setup_base_ivors
+        bl      .setup_perfmon_ivor
+        bl      .setup_doorbell_ivors
+        bl      .setup_ehv_ivors
 #else
         bl      __setup_e500mc_ivors
 #endif
diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
index cf27a8fa0d29..d24d4400cc79 100644
--- a/arch/powerpc/kernel/exceptions-64e.S
+++ b/arch/powerpc/kernel/exceptions-64e.S
@@ -269,8 +269,13 @@ interrupt_base_book3e:					/* fake trap */
         EXCEPTION_STUB(0x1a0, watchdog)                 /* 0x09f0 */
         EXCEPTION_STUB(0x1c0, data_tlb_miss)
         EXCEPTION_STUB(0x1e0, instruction_tlb_miss)
+        EXCEPTION_STUB(0x260, perfmon)
         EXCEPTION_STUB(0x280, doorbell)
         EXCEPTION_STUB(0x2a0, doorbell_crit)
+        EXCEPTION_STUB(0x2c0, guest_doorbell)
+        EXCEPTION_STUB(0x2e0, guest_doorbell_crit)
+        EXCEPTION_STUB(0x300, hypercall)
+        EXCEPTION_STUB(0x320, ehpriv)
 
         .globl interrupt_end_book3e
 interrupt_end_book3e:
@@ -514,6 +519,8 @@ kernel_dbg_exc:
         bl      .DebugException
         b       .ret_from_except
 
+        MASKABLE_EXCEPTION(0x260, perfmon, .performance_monitor_exception, ACK_NONE)
+
 /* Doorbell interrupt */
         MASKABLE_EXCEPTION(0x2070, doorbell, .doorbell_exception, ACK_NONE)
 
@@ -528,6 +535,11 @@ kernel_dbg_exc:
 //      b       ret_from_crit_except
         b       .
 
+        MASKABLE_EXCEPTION(0x2c0, guest_doorbell, .unknown_exception, ACK_NONE)
+        MASKABLE_EXCEPTION(0x2e0, guest_doorbell_crit, .unknown_exception, ACK_NONE)
+        MASKABLE_EXCEPTION(0x310, hypercall, .unknown_exception, ACK_NONE)
+        MASKABLE_EXCEPTION(0x320, ehpriv, .unknown_exception, ACK_NONE)
+
 
 /*
  * An interrupt came in while soft-disabled; clear EE in SRR1,
@@ -647,7 +659,12 @@ fast_exception_return:
 BAD_STACK_TRAMPOLINE(0x000)
 BAD_STACK_TRAMPOLINE(0x100)
 BAD_STACK_TRAMPOLINE(0x200)
+BAD_STACK_TRAMPOLINE(0x260)
+BAD_STACK_TRAMPOLINE(0x2c0)
+BAD_STACK_TRAMPOLINE(0x2e0)
 BAD_STACK_TRAMPOLINE(0x300)
+BAD_STACK_TRAMPOLINE(0x310)
+BAD_STACK_TRAMPOLINE(0x320)
 BAD_STACK_TRAMPOLINE(0x400)
 BAD_STACK_TRAMPOLINE(0x500)
 BAD_STACK_TRAMPOLINE(0x600)
@@ -1183,3 +1200,33 @@ _GLOBAL(__setup_base_ivors)
         sync
 
         blr
+
+_GLOBAL(setup_perfmon_ivor)
+        SET_IVOR(35, 0x260) /* Performance Monitor */
+        blr
+
+_GLOBAL(setup_doorbell_ivors)
+        SET_IVOR(36, 0x280) /* Processor Doorbell */
+        SET_IVOR(37, 0x2a0) /* Processor Doorbell Crit */
+
+        /* Check MMUCFG[LPIDSIZE] to determine if we have category E.HV */
+        mfspr   r10,SPRN_MMUCFG
+        rlwinm. r10,r10,0,MMUCFG_LPIDSIZE
+        beqlr
+
+        SET_IVOR(38, 0x2c0) /* Guest Processor Doorbell */
+        SET_IVOR(39, 0x2e0) /* Guest Processor Doorbell Crit/MC */
+        blr
+
+_GLOBAL(setup_ehv_ivors)
+        /*
+         * We may be running as a guest and lack E.HV even on a chip
+         * that normally has it.
+         */
+        mfspr   r10,SPRN_MMUCFG
+        rlwinm. r10,r10,0,MMUCFG_LPIDSIZE
+        beqlr
+
+        SET_IVOR(40, 0x300) /* Embedded Hypervisor System Call */
+        SET_IVOR(41, 0x320) /* Embedded Hypervisor Privilege */
+        blr