From 2c8b3d39c50e4bc6ab7b6e86db49efd7b2d4dc88 Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Fri, 15 Jan 2021 17:15:33 +0000 Subject: [PATCH] KVM: arm64: Use symbolic names for the PMU versions mainline inclusion from mainline-v5.12-rc1 commit 8e26d11f680a323f7e1073038c454df39307dfad category: cleanup bugzilla: https://gitee.com/openeuler/kernel/issues/I6OMSU CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8e26d11f680a323f7e1073038c454df39307dfad ---------------------------------------------------------------------- Instead of using a bunch of magic numbers, use the existing definitions that have been added since 8673e02e58410 ("arm64: perf: Add support for ARMv8.5-PMU 64-bit counters") Reviewed-by: Alexandru Elisei Reviewed-by: Eric Auger Signed-off-by: Marc Zyngier Signed-off-by: huangfangrun --- arch/arm64/kvm/pmu-emul.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c index 597d0ed84086..23a8e0e197e3 100644 --- a/arch/arm64/kvm/pmu-emul.c +++ b/arch/arm64/kvm/pmu-emul.c @@ -23,11 +23,11 @@ static void kvm_pmu_stop_counter(struct kvm_vcpu *vcpu, struct kvm_pmc *pmc); static u32 kvm_pmu_event_mask(struct kvm *kvm) { switch (kvm->arch.pmuver) { - case 1: /* ARMv8.0 */ + case ID_AA64DFR0_PMUVER_8_0: return GENMASK(9, 0); - case 4: /* ARMv8.1 */ - case 5: /* ARMv8.4 */ - case 6: /* ARMv8.5 */ + case ID_AA64DFR0_PMUVER_8_1: + case ID_AA64DFR0_PMUVER_8_4: + case ID_AA64DFR0_PMUVER_8_5: return GENMASK(15, 0); default: /* Shouldn't be here, just for sanity */ WARN_ONCE(1, "Unknown PMU version %d\n", kvm->arch.pmuver); -- GitLab