KVM: PPC: Mask ea's high 32-bits in 32/64 instr emulation

Mask high 32 bits of effective address in emulation layer for guests running
in 32-bit mode.

Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com>
[agraf: fix indent]
Signed-off-by: Alexander Graf <agraf@suse.de>

diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h
index d55a2b28706e9af49669efbc2d37fade381981d3..572aa75306191272c684a8263a5900cd876352c2 100644 (file)
--- a/arch/powerpc/include/asm/kvm_ppc.h
+++ b/arch/powerpc/include/asm/kvm_ppc.h
@@ -298,11 +298,21 @@ static inline void kvmppc_lazy_ee_enable(void)
 static inline ulong kvmppc_get_ea_indexed(struct kvm_vcpu *vcpu, int ra, int rb)
 {
        ulong ea;
+       ulong msr_64bit = 0;
 
        ea = kvmppc_get_gpr(vcpu, rb);
        if (ra)
                ea += kvmppc_get_gpr(vcpu, ra);
 
+#if defined(CONFIG_PPC_BOOK3E_64)
+       msr_64bit = MSR_CM;
+#elif defined(CONFIG_PPC_BOOK3S_64)
+       msr_64bit = MSR_SF;
+#endif
+
+       if (!(vcpu->arch.shared->msr & msr_64bit))
+               ea = (uint32_t)ea;
+
        return ea;
 }