diff options
| author | James Clark <james.clark@arm.com> | 2022-12-09 16:44:46 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2022-12-12 09:07:14 +0000 |
| commit | aff234839f8b80ac101e6c2f14d0e44b236efa48 (patch) | |
| tree | 81b6e0f5ad1c480705995526722f0bd68bd6ce6b | |
| parent | 753d734f3f347e7fc49b819472bbf61dcfc1a16f (diff) | |
| download | linux-stable-aff234839f8b80ac101e6c2f14d0e44b236efa48.tar.gz linux-stable-aff234839f8b80ac101e6c2f14d0e44b236efa48.tar.bz2 linux-stable-aff234839f8b80ac101e6c2f14d0e44b236efa48.zip | |
KVM: arm64: PMU: Fix PMCR_EL0 reset value
ARMV8_PMU_PMCR_N_MASK is an unshifted value which results in the wrong
reset value for PMCR_EL0, so shift it to fix it.
This fixes the following error when running qemu:
$ qemu-system-aarch64 -cpu host -machine type=virt,accel=kvm -kernel ...
target/arm/helper.c:1813: pmevcntr_rawwrite: Assertion `counter < pmu_num_counters(env)' failed.
Fixes: 292e8f149476 ("KVM: arm64: PMU: Simplify PMCR_EL0 reset handling")
Signed-off-by: James Clark <james.clark@arm.com>
Reviewed-by: Oliver Upton <oliver.upton@linux.dev>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20221209164446.1972014-2-james.clark@arm.com
| -rw-r--r-- | arch/arm64/kvm/sys_regs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index d5ee52d6bf73..c6cbfe6b854b 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -646,7 +646,7 @@ static void reset_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r) return; /* Only preserve PMCR_EL0.N, and reset the rest to 0 */ - pmcr = read_sysreg(pmcr_el0) & ARMV8_PMU_PMCR_N_MASK; + pmcr = read_sysreg(pmcr_el0) & (ARMV8_PMU_PMCR_N_MASK << ARMV8_PMU_PMCR_N_SHIFT); if (!kvm_supports_32bit_el0()) pmcr |= ARMV8_PMU_PMCR_LC; |