From 0d9ea5d875cdfb0edfcc752f747a65285964350e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 26 Apr 2023 12:15:30 +0000 Subject: [PATCH] Revert "Revert "KVM: arm64: PMU: Don't save PMCR_EL0.{C,P} for the vCPU"" This reverts commit 067f7ca9fd4db04b9e6be163a0bef89cbfc7d7c3. It was perserving the ABI, but that is not needed anymore at this point in time. Change-Id: Ie5c4e8b82bac1966ea56834f02ddcc83dccbd7d1 Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kvm/pmu-emul.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c index 21a7b028295c..ed12c5355afb 100644 --- a/arch/arm64/kvm/pmu-emul.c +++ b/arch/arm64/kvm/pmu-emul.c @@ -511,7 +511,8 @@ void kvm_pmu_handle_pmcr(struct kvm_vcpu *vcpu, u64 val) if (!kvm_vcpu_has_pmu(vcpu)) return; - __vcpu_sys_reg(vcpu, PMCR_EL0) = val; + /* The reset bits don't indicate any state, and shouldn't be saved. */ + __vcpu_sys_reg(vcpu, PMCR_EL0) = val & ~(ARMV8_PMU_PMCR_C | ARMV8_PMU_PMCR_P); if (val & ARMV8_PMU_PMCR_E) { kvm_pmu_enable_counter_mask(vcpu,