1 files changed, 6 insertions, 0 deletions

diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 54b45b73195f..a7352b59e6f9 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -224,6 +224,12 @@ static void kvmppc_core_vcpu_put_hv(struct kvm_vcpu *vcpu)
 
 static void kvmppc_set_msr_hv(struct kvm_vcpu *vcpu, u64 msr)
 {
+        /*
+         * Check for illegal transactional state bit combination
+         * and if we find it, force the TS field to a safe state.
+         */
+        if ((msr & MSR_TS_MASK) == MSR_TS_MASK)
+                msr &= ~MSR_TS_MASK;
         vcpu->arch.shregs.msr = msr;
         kvmppc_end_cede(vcpu);
 }