On Mon, Oct 05, 2015 at 06:02:06PM +0100, Suzuki K. Poulose wrote: > Use the system wide safe value from the new API for safer > decisions > > Cc: Marc Zyngier <[email protected]> > Cc: Christoffer Dall <[email protected]> > Cc: [email protected] > Signed-off-by: Suzuki K. Poulose <[email protected]> > --- > arch/arm64/kvm/reset.c | 2 +- > arch/arm64/kvm/sys_regs.c | 12 ++++++------ > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c > index 91cf535..f34745c 100644 > --- a/arch/arm64/kvm/reset.c > +++ b/arch/arm64/kvm/reset.c > @@ -53,7 +53,7 @@ static bool cpu_has_32bit_el1(void) > { > u64 pfr0; > > - pfr0 = read_cpuid(ID_AA64PFR0_EL1); > + pfr0 = read_system_reg(SYS_ID_AA64PFR0_EL1); > return !!(pfr0 & 0x20); > } > > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > index d03d3af..87a64e8 100644 > --- a/arch/arm64/kvm/sys_regs.c > +++ b/arch/arm64/kvm/sys_regs.c > @@ -693,13 +693,13 @@ static bool trap_dbgidr(struct kvm_vcpu *vcpu, > if (p->is_write) { > return ignore_write(vcpu, p); > } else { > - u64 dfr = read_cpuid(ID_AA64DFR0_EL1); > - u64 pfr = read_cpuid(ID_AA64PFR0_EL1); > - u32 el3 = !!((pfr >> 12) & 0xf); > + u64 dfr = read_system_reg(SYS_ID_AA64DFR0_EL1); > + u64 pfr = read_system_reg(SYS_ID_AA64PFR0_EL1); > + u32 el3 = !!cpuid_feature_extract_field(pfr, > ID_AA64PFR0_EL3_SHIFT); > > - *vcpu_reg(vcpu, p->Rt) = ((((dfr >> 20) & 0xf) << 28) | > - (((dfr >> 12) & 0xf) << 24) | > - (((dfr >> 28) & 0xf) << 20) | > + *vcpu_reg(vcpu, p->Rt) = ((((dfr >> ID_AA64DFR0_WRPS_SHIFT) & > 0xf) << 28) | > + (((dfr >> ID_AA64DFR0_BRPS_SHIFT) & > 0xf) << 24) | > + (((dfr >> ID_AA64DFR0_CTX_CMPS_SHIFT) > & 0xf) << 20) | > (6 << 16) | (el3 << 14) | (el3 << > 12)); > return true; > } > -- > 1.7.9.5 >
Acked-by: Christoffer Dall <[email protected]> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
