* [PATCH v2 17/22] arm64/kvm: Make use of the system wide safe values [not found] <1444064531-25607-1-git-send-email-suzuki.poulose@arm.com> @ 2015-10-05 17:02 ` Suzuki K. Poulose 2015-10-10 15:17 ` Christoffer Dall 0 siblings, 1 reply; 2+ messages in thread From: Suzuki K. Poulose @ 2015-10-05 17:02 UTC (permalink / raw) To: linux-arm-kernel Cc: ard.biesheuvel, marc.zyngier, catalin.marinas, will.deacon, linux-kernel, kvmarm, edward.nevill, aph, andre.przywara, dave.martin Use the system wide safe value from the new API for safer decisions Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Christoffer Dall <christoffer.dall@linaro.org> Cc: kvmarm@lists.cs.columbia.edu Signed-off-by: Suzuki K. Poulose <suzuki.poulose@arm.com> --- 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 ^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2 17/22] arm64/kvm: Make use of the system wide safe values 2015-10-05 17:02 ` [PATCH v2 17/22] arm64/kvm: Make use of the system wide safe values Suzuki K. Poulose @ 2015-10-10 15:17 ` Christoffer Dall 0 siblings, 0 replies; 2+ messages in thread From: Christoffer Dall @ 2015-10-10 15:17 UTC (permalink / raw) To: Suzuki K. Poulose Cc: ard.biesheuvel, marc.zyngier, catalin.marinas, will.deacon, linux-kernel, kvmarm, edward.nevill, aph, andre.przywara, dave.martin, linux-arm-kernel 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 <marc.zyngier@arm.com> > Cc: Christoffer Dall <christoffer.dall@linaro.org> > Cc: kvmarm@lists.cs.columbia.edu > Signed-off-by: Suzuki K. Poulose <suzuki.poulose@arm.com> > --- > 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 <christoffer.dall@linaro.org> ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-10 15:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1444064531-25607-1-git-send-email-suzuki.poulose@arm.com>
2015-10-05 17:02 ` [PATCH v2 17/22] arm64/kvm: Make use of the system wide safe values Suzuki K. Poulose
2015-10-10 15:17 ` Christoffer Dall
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox