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)
commitcb5faa8c7df02a83dd18d8b5c4090a69e93523ec
treebb6f3f42b86e64378409781a7c4870f1f64f8559
parentb88835a89df7083510478896caafbf7292cea760
parentd0c94c49792cf780cbfefe29f81bb8c3b73bc76b
Merge branch kvm-arm64/pmu-fixes into kvmarm-master/next

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