Merge branch kvm-arm64/pmu-fixes into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Fri, 18 Jun 2021 13:25:59 +0000 (14:25 +0100)
committerMarc Zyngier <maz@kernel.org>
Fri, 18 Jun 2021 13:25:59 +0000 (14:25 +0100)
Fixes for the PMUv3 emulation of PMCR_EL0:
- Don't spuriously reset the cycle counter when resetting other counters
- Force PMCR_EL0 to become effective after having restored it

* kvm-arm64/pmu-fixes:
  KVM: arm64: Restore PMU configuration on first run
  KVM: arm64: Don't zero the cycle count register when PMCR_EL0.P is set


Trivial merge