On Fri, Nov 30, 2012 at 08:22:28PM +0000, Christoffer Dall wrote: > On Mon, Nov 19, 2012 at 10:01 AM, Will Deacon <will.deacon@xxxxxxx> wrote: > > On Sat, Nov 10, 2012 at 03:43:13PM +0000, Christoffer Dall wrote: > > This should probably be 0xff and also use the macros that Lorenzo is > > introducing: > > > > http://lists.infradead.org/pipermail/linux-arm-kernel/2012-November/132977.html > > > > in the A15 TRM bits [7:2] are reserved, so we really only do care > about bits [1:0], and this file is A15 specific, but if you prefer, I > can merge this: The upper bits are RAZ, so yes, please do merge something like this. > diff --git a/arch/arm/kvm/coproc_a15.c b/arch/arm/kvm/coproc_a15.c > index 55cb4a3..685063a 100644 > --- a/arch/arm/kvm/coproc_a15.c > +++ b/arch/arm/kvm/coproc_a15.c > @@ -24,8 +24,6 @@ > #include <asm/kvm_coproc.h> > #include <linux/init.h> > > -#define MPIDR_CPUID 0x3 > - > static void reset_mpidr(struct kvm_vcpu *vcpu, const struct coproc_reg *r) > { > /* > @@ -35,8 +33,8 @@ static void reset_mpidr(struct kvm_vcpu *vcpu, const > struct coproc_reg *r) > * revealing the underlying hardware properties is likely to > * be the best choice). > */ > - vcpu->arch.cp15[c0_MPIDR] = (read_cpuid_mpidr() & ~MPIDR_CPUID) > - | (vcpu->vcpu_id & MPIDR_CPUID); > + vcpu->arch.cp15[c0_MPIDR] = (read_cpuid_mpidr() & ~MPIDR_LEVEL_MASK) > + | (vcpu->vcpu_id & MPIDR_LEVEL_MASK); > } > > #include "coproc.h" Will -- 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
