From: Scott Wood Date: Thu, 30 Sep 2010 19:31:27 +0000 (-0500) Subject: KVM: PPC: BookE: Load the lower half of MSR X-Git-Tag: firefly_0821_release~7613^2~3504^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=df8940eadf011db2d4bedecf6eb659d44494edb3;p=firefly-linux-kernel-4.4.55.git KVM: PPC: BookE: Load the lower half of MSR This was preventing the guest from setting any bits in the hardware MSR which aren't forced on, such as MSR[SPE]. Signed-off-by: Scott Wood Signed-off-by: Alexander Graf --- diff --git a/arch/powerpc/kvm/booke_interrupts.S b/arch/powerpc/kvm/booke_interrupts.S index 049846911ce4..1cc471faac2d 100644 --- a/arch/powerpc/kvm/booke_interrupts.S +++ b/arch/powerpc/kvm/booke_interrupts.S @@ -416,7 +416,7 @@ lightweight_exit: lwz r3, VCPU_PC(r4) mtsrr0 r3 lwz r3, VCPU_SHARED(r4) - lwz r3, VCPU_SHARED_MSR(r3) + lwz r3, (VCPU_SHARED_MSR + 4)(r3) oris r3, r3, KVMPPC_MSR_MASK@h ori r3, r3, KVMPPC_MSR_MASK@l mtsrr1 r3