diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-06-18 16:25:59 +0300 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-06-18 16:25:59 +0300 |
| commit | cb5faa8c7df02a83dd18d8b5c4090a69e93523ec (patch) | |
| tree | bb6f3f42b86e64378409781a7c4870f1f64f8559 /arch/arm64/include/asm | |
| parent | b88835a89df7083510478896caafbf7292cea760 (diff) | |
| parent | d0c94c49792cf780cbfefe29f81bb8c3b73bc76b (diff) | |
| download | linux-cb5faa8c7df02a83dd18d8b5c4090a69e93523ec.tar.xz | |
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
Diffstat (limited to 'arch/arm64/include/asm')
| -rw-r--r-- | arch/arm64/include/asm/kvm_host.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 7cd7d5c8c4bc..6336b4309114 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -46,6 +46,7 @@ #define KVM_REQ_VCPU_RESET KVM_ARCH_REQ(2) #define KVM_REQ_RECORD_STEAL KVM_ARCH_REQ(3) #define KVM_REQ_RELOAD_GICv4 KVM_ARCH_REQ(4) +#define KVM_REQ_RELOAD_PMU KVM_ARCH_REQ(5) #define KVM_DIRTY_LOG_MANUAL_CAPS (KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE | \ KVM_DIRTY_LOG_INITIALLY_SET) |