7 files changed, 98 insertions, 31 deletions

diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
index c9aac24b02e2..2aadb47efaec 100644
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@ -34,6 +34,8 @@ extern void __replay_interrupt(unsigned int vector);
 
 extern void timer_interrupt(struct pt_regs *);
 extern void performance_monitor_exception(struct pt_regs *regs);
+extern void WatchdogException(struct pt_regs *regs);
+extern void unknown_exception(struct pt_regs *regs);
 
 #ifdef CONFIG_PPC64
 #include <asm/paca.h>
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index 86681eec60b1..d25a097c852b 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -612,6 +612,12 @@ static void kvmppc_fill_pt_regs(struct pt_regs *regs)
         regs->link = lr;
 }
 
+/*
+ * For interrupts needed to be handled by host interrupt handlers,
+ * corresponding host handler are called from here in similar way
+ * (but not exact) as they are called from low level handler
+ * (such as from arch/powerpc/kernel/head_fsl_booke.S).
+ */
 static void kvmppc_restart_interrupt(struct kvm_vcpu *vcpu,
                                      unsigned int exit_nr)
 {
@@ -639,6 +645,17 @@ static void kvmppc_restart_interrupt(struct kvm_vcpu *vcpu,
                 kvmppc_fill_pt_regs(&regs);
                 performance_monitor_exception(&regs);
                 break;
+        case BOOKE_INTERRUPT_WATCHDOG:
+                kvmppc_fill_pt_regs(&regs);
+#ifdef CONFIG_BOOKE_WDT
+                WatchdogException(&regs);
+#else
+                unknown_exception(&regs);
+#endif
+                break;
+        case BOOKE_INTERRUPT_CRITICAL:
+                unknown_exception(&regs);
+                break;
         }
 }
 
@@ -683,6 +700,10 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
                 r = RESUME_GUEST;
                 break;
 
+        case BOOKE_INTERRUPT_WATCHDOG:
+                r = RESUME_GUEST;
+                break;
+
         case BOOKE_INTERRUPT_DOORBELL:
                 kvmppc_account_exit(vcpu, DBELL_EXITS);
                 r = RESUME_GUEST;
diff --git a/arch/powerpc/kvm/booke_emulate.c b/arch/powerpc/kvm/booke_emulate.c
index 9eb9809eb13e..12834bb608ab 100644
--- a/arch/powerpc/kvm/booke_emulate.c
+++ b/arch/powerpc/kvm/booke_emulate.c
@@ -24,6 +24,7 @@
 #include "booke.h"
 
 #define OP_19_XOP_RFI     50
+#define OP_19_XOP_RFCI    51
 
 #define OP_31_XOP_MFMSR   83
 #define OP_31_XOP_WRTEE   131
@@ -36,6 +37,12 @@ static void kvmppc_emul_rfi(struct kvm_vcpu *vcpu)
         kvmppc_set_msr(vcpu, vcpu->arch.shared->srr1);
 }
 
+static void kvmppc_emul_rfci(struct kvm_vcpu *vcpu)
+{
+        vcpu->arch.pc = vcpu->arch.csrr0;
+        kvmppc_set_msr(vcpu, vcpu->arch.csrr1);
+}
+
 int kvmppc_booke_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
                             unsigned int inst, int *advance)
 {
@@ -52,6 +59,12 @@ int kvmppc_booke_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
                         *advance = 0;
                         break;
 
+                case OP_19_XOP_RFCI:
+                        kvmppc_emul_rfci(vcpu);
+                        kvmppc_set_exit_type(vcpu, EMULATED_RFCI_EXITS);
+                        *advance = 0;
+                        break;
+
                 default:
                         emulated = EMULATE_FAIL;
                         break;
@@ -113,6 +126,12 @@ int kvmppc_booke_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, ulong spr_val)
         case SPRN_ESR:
                 vcpu->arch.shared->esr = spr_val;
                 break;
+        case SPRN_CSRR0:
+                vcpu->arch.csrr0 = spr_val;
+                break;
+        case SPRN_CSRR1:
+                vcpu->arch.csrr1 = spr_val;
+                break;
         case SPRN_DBCR0:
                 vcpu->arch.dbcr0 = spr_val;
                 break;
@@ -232,6 +251,12 @@ int kvmppc_booke_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, ulong *spr_val)
         case SPRN_ESR:
                 *spr_val = vcpu->arch.shared->esr;
                 break;
+        case SPRN_CSRR0:
+                *spr_val = vcpu->arch.csrr0;
+                break;
+        case SPRN_CSRR1:
+                *spr_val = vcpu->arch.csrr1;
+                break;
         case SPRN_DBCR0:
                 *spr_val = vcpu->arch.dbcr0;
                 break;
diff --git a/arch/powerpc/kvm/booke_interrupts.S b/arch/powerpc/kvm/booke_interrupts.S
index 8feec2ff3928..09456c4719f3 100644
--- a/arch/powerpc/kvm/booke_interrupts.S
+++ b/arch/powerpc/kvm/booke_interrupts.S
@@ -53,16 +53,21 @@
                        (1<<BOOKE_INTERRUPT_PROGRAM) | \
                        (1<<BOOKE_INTERRUPT_DTLB_MISS))
 
-.macro KVM_HANDLER ivor_nr
+.macro KVM_HANDLER ivor_nr scratch srr0
 _GLOBAL(kvmppc_handler_\ivor_nr)
         /* Get pointer to vcpu and record exit number. */
-        mtspr   SPRN_SPRG_WSCRATCH0, r4
+        mtspr   \scratch , r4
         mfspr   r4, SPRN_SPRG_RVCPU
+        stw     r3, VCPU_GPR(r3)(r4)
         stw     r5, VCPU_GPR(r5)(r4)
         stw     r6, VCPU_GPR(r6)(r4)
+        mfspr   r3, \scratch
         mfctr   r5
-        lis     r6, kvmppc_resume_host@h
+        stw     r3, VCPU_GPR(r4)(r4)
         stw     r5, VCPU_CTR(r4)
+        mfspr   r3, \srr0
+        lis     r6, kvmppc_resume_host@h
+        stw     r3, VCPU_PC(r4)
         li      r5, \ivor_nr
         ori     r6, r6, kvmppc_resume_host@l
         mtctr   r6
@@ -70,37 +75,35 @@ _GLOBAL(kvmppc_handler_\ivor_nr)
 .endm
 
 _GLOBAL(kvmppc_handlers_start)
-KVM_HANDLER BOOKE_INTERRUPT_CRITICAL
-KVM_HANDLER BOOKE_INTERRUPT_MACHINE_CHECK
-KVM_HANDLER BOOKE_INTERRUPT_DATA_STORAGE
-KVM_HANDLER BOOKE_INTERRUPT_INST_STORAGE
-KVM_HANDLER BOOKE_INTERRUPT_EXTERNAL
-KVM_HANDLER BOOKE_INTERRUPT_ALIGNMENT
+KVM_HANDLER BOOKE_INTERRUPT_CRITICAL SPRN_SPRG_RSCRATCH_CRIT SPRN_CSRR0
+KVM_HANDLER BOOKE_INTERRUPT_MACHINE_CHECK  SPRN_SPRG_RSCRATCH_MC SPRN_MCSRR0
+KVM_HANDLER BOOKE_INTERRUPT_DATA_STORAGE SPRN_SPRG_RSCRATCH0 SPRN_SRR0
+KVM_HANDLER BOOKE_INTERRUPT_INST_STORAGE SPRN_SPRG_RSCRATCH0 SPRN_SRR0
+KVM_HANDLER BOOKE_INTERRUPT_EXTERNAL SPRN_SPRG_RSCRATCH0 SPRN_SRR0
+KVM_HANDLER BOOKE_INTERRUPT_ALIGNMENT SPRN_SPRG_RSCRATCH0 SPRN_SRR0