On 2019-06-28 15:08, Claudio Carvalho wrote:
From: Michael Anderson <andm...@linux.ibm.com>
- Check for MSR_S so that kvmppc_set_msr will include it. Prior to
this
change return to guest would not have the S bit set.
- Patch based on comment from Paul Mackerras <p...@au1.ibm.com>
Signed-off-by: Michael Anderson <andm...@linux.ibm.com>
Signed-off-by: Claudio Carvalho <cclau...@linux.ibm.com>
Acked-by: Paul Mackerras <pau...@ozlabs.org>
Reviewed-by: Janani Janakiraman <jan...@linux.ibm.com>
---
arch/powerpc/kvm/book3s_64_mmu_hv.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c
b/arch/powerpc/kvm/book3s_64_mmu_hv.c
index ab3d484c5e2e..ab62a66f9b4e 100644
--- a/arch/powerpc/kvm/book3s_64_mmu_hv.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c
@@ -295,6 +295,7 @@ static void
kvmppc_mmu_book3s_64_hv_reset_msr(struct kvm_vcpu *vcpu)
msr |= MSR_TS_S;
else
msr |= vcpu->arch.shregs.msr & MSR_TS_MASK;
+ msr |= vcpu->arch.shregs.msr & MSR_S;
kvmppc_set_msr(vcpu, msr);
}
