diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-02-12 14:08:41 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-02-12 14:08:41 +0000 |
| commit | c93199e93e1232b7220482dffa05b7a32a195fe8 (patch) | |
| tree | 8af55cb63c2c44c37455f0d79c06c5d92767f775 /arch/arm64/kvm/pmu-emul.c | |
| parent | 8cb68a9d147da4630603937e42e52c0b4ea1602e (diff) | |
| parent | 8c358b29e0dc69d5ced6acfea4cc3d1dcf10df27 (diff) | |
| download | linux-stable-c93199e93e1232b7220482dffa05b7a32a195fe8.tar.gz linux-stable-c93199e93e1232b7220482dffa05b7a32a195fe8.tar.bz2 linux-stable-c93199e93e1232b7220482dffa05b7a32a195fe8.zip | |
Merge branch 'kvm-arm64/pmu-debug-fixes-5.11' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/pmu-emul.c')
| -rw-r--r-- | arch/arm64/kvm/pmu-emul.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c index 247422ac78a9..e9ec08b0b070 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); @@ -795,6 +795,12 @@ u64 kvm_pmu_get_pmceid(struct kvm_vcpu *vcpu, bool pmceid1) base = 0; } else { val = read_sysreg(pmceid1_el0); + /* + * Don't advertise STALL_SLOT, as PMMIR_EL0 is handled + * as RAZ + */ + if (vcpu->kvm->arch.pmuver >= ID_AA64DFR0_PMUVER_8_4) + val &= ~BIT_ULL(ARMV8_PMUV3_PERFCTR_STALL_SLOT - 32); base = 32; } |