Commit d5b4d07b authored by Marc Zyngier's avatar Marc Zyngier
Browse files

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: default avatarMarc Zyngier <maz@kernel.org>
parents decb17ae aff23483

arch/arm64/kvm/sys_regs.c

+1 −1
Original line number Diff line number Diff line
@@ -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;