On 25.06.2012, at 14:26, Mihai Caraman wrote: > Mask high 32 bits of effective address in emulation layer, for guests running > in 32-bit mode. > MAS2's high-order 32 bits represents the upper 32 bits of the effective address > of the page. Mask it too for tlbwe instruction emulation. Ah, there is the tlbwe masking :). Please split this into 2 patches. > > Signed-off-by: Mihai Caraman <mihai.caraman@xxxxxxxxxxxxx> > --- > arch/powerpc/kvm/e500_emulate.c | 5 ++++- > arch/powerpc/kvm/e500_tlb.c | 2 ++ > 2 files changed, 6 insertions(+), 1 deletions(-) > > diff --git a/arch/powerpc/kvm/e500_emulate.c b/arch/powerpc/kvm/e500_emulate.c > index 81288f7..94305db 100644 > --- a/arch/powerpc/kvm/e500_emulate.c > +++ b/arch/powerpc/kvm/e500_emulate.c > @@ -1,5 +1,5 @@ > /* > - * Copyright (C) 2008-2011 Freescale Semiconductor, Inc. All rights reserved. > + * Copyright (C) 2008-2012 Freescale Semiconductor, Inc. All rights reserved. > * > * Author: Yu Liu, <yu.liu@xxxxxxxxxxxxx> > * > @@ -90,6 +90,9 @@ static inline ulong kvmppc_get_ea_indexed(struct kvm_vcpu *vcpu, int ra, int rb) > if (ra) > ea += kvmppc_get_gpr(vcpu, ra); > > + if (!(vcpu->arch.shared->msr & MSR_CM)) > + ea &= 0xffffffffUL; Since this will be in generic code, please guard it with an #ifdef CONFIG_BOOKE. Alex -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
