Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next

This merges in the ppc-kvm topic branch of the powerpc tree to get
two patches which are prerequisites for the following patch series,
plus another patch which touches both powerpc and KVM code.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

4 files changed, 15 insertions, 16 deletions

diff --git a/arch/powerpc/kvm/book3s_hv_ras.c b/arch/powerpc/kvm/book3s_hv_ras.c
index c356f9a40b24..c296343d0dcc 100644
--- a/arch/powerpc/kvm/book3s_hv_ras.c
+++ b/arch/powerpc/kvm/book3s_hv_ras.c
@@ -268,17 +268,19 @@ static void kvmppc_tb_resync_done(void)
  *   secondary threads to proceed.
  * - All secondary threads will eventually call opal hmi handler on
  *   their exit path.
+ *
+ * Returns 1 if the timebase offset should be applied, 0 if not.
  */
 
 long kvmppc_realmode_hmi_handler(void)
 {
-        int ptid = local_paca->kvm_hstate.ptid;
         bool resync_req;
 
-        /* This is only called on primary thread. */
-        BUG_ON(ptid != 0);
         __this_cpu_inc(irq_stat.hmi_exceptions);
 
+        if (hmi_handle_debugtrig(NULL) >= 0)
+                return 1;
+
         /*
          * By now primary thread has already completed guest->host
          * partition switch but haven't signaled secondaries yet.
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index 30ece4cebaf5..7daf21be33d0 100644
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -1909,16 +1909,17 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)
         bne     27f
         bl      kvmppc_realmode_hmi_handler
         nop
+        cmpdi   r3, 0
         li      r12, BOOK3S_INTERRUPT_HMI
         /*
-         * At this point kvmppc_realmode_hmi_handler would have resync-ed
-         * the TB. Hence it is not required to subtract guest timebase
-         * offset from timebase. So, skip it.
+         * At this point kvmppc_realmode_hmi_handler may have resync-ed
+         * the TB, and if it has, we must not subtract the guest timebase
+         * offset from the timebase. So, skip it.
          *
          * Also, do not call kvmppc_subcore_exit_guest() because it has
          * been invoked as part of kvmppc_realmode_hmi_handler().
          */
-        b       30f
+        beq     30f
 
 27:
         /* Subtract timebase offset from timebase */
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index 071b87ee682f..83b485810aea 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -599,9 +599,9 @@ static void arm_next_watchdog(struct kvm_vcpu *vcpu)
         spin_unlock_irqrestore(&vcpu->arch.wdt_lock, flags);
 }
 
-void kvmppc_watchdog_func(unsigned long data)
+void kvmppc_watchdog_func(struct timer_list *t)
 {
-        struct kvm_vcpu *vcpu = (struct kvm_vcpu *)data;
+        struct kvm_vcpu *vcpu = from_timer(vcpu, t, arch.wdt_timer);
         u32 tsr, new_tsr;
         int final;
 
@@ -1412,8 +1412,7 @@ int kvmppc_subarch_vcpu_init(struct kvm_vcpu *vcpu)
 {
         /* setup watchdog timer once */
         spin_lock_init(&vcpu->arch.wdt_lock);
-        setup_timer(&vcpu->arch.wdt_timer, kvmppc_watchdog_func,
-                    (unsigned long)vcpu);
+        timer_setup(&vcpu->arch.wdt_timer, kvmppc_watchdog_func, 0);
 
         /*
          * Clear DBSR.MRR to avoid guest debug interrupt as
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index 7c9e45f54186..77eb25abc601 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -1403,7 +1403,6 @@ int kvm_vcpu_ioctl_set_one_reg(struct kvm_vcpu *vcpu, struct kvm_one_reg *reg)
 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
 {
         int r;
-        sigset_t sigsaved;
 
         if (vcpu->mmio_needed) {
                 vcpu->mmio_needed = 0;
@@ -1444,16 +1443,14 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
 #endif
         }
 
-        if (vcpu->sigset_active)
-                sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);
+        kvm_sigset_activate(vcpu);
 
         if (run->immediate_exit)
                 r = -EINTR;
         else
                 r = kvmppc_vcpu_run(run, vcpu);
 
-        if (vcpu->sigset_active)
-                sigprocmask(SIG_SETMASK, &sigsaved, NULL);
+        kvm_sigset_deactivate(vcpu);
 
         return r;
 }