tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch kvm-arm64/pmu-fixes-6.2 into kvmarm-master/fixes
* kvm-arm64/pmu-fixes-6.2:
: .
: Fix for an incredibly stupid bug in the PMU rework that went into
: 6.2. Brown paper bag time.
: .
KVM: arm64: PMU: Fix PMCR_EL0 reset value
Signed-off-by: Marc Zyngier <maz@kernel.org>
+1
-1
+1
-1
arch/arm64/kvm/sys_regs.c
+1
-1
arch/arm64/kvm/sys_regs.c
···
646
646
return;
647
647
648
648
/* Only preserve PMCR_EL0.N, and reset the rest to 0 */
649
-
pmcr = read_sysreg(pmcr_el0) & ARMV8_PMU_PMCR_N_MASK;
649
+
pmcr = read_sysreg(pmcr_el0) & (ARMV8_PMU_PMCR_N_MASK << ARMV8_PMU_PMCR_N_SHIFT);
650
650
if (!kvm_supports_32bit_el0())
651
651
pmcr |= ARMV8_PMU_PMCR_LC;
652
652