Commit 600f6fa5 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: Let kvm_vcpu_read_pmcr() return an EL-dependent value for PMCR_EL0.N 



When EL2 is present, PMCR_EL0.N is the effective value of MDCR_EL2.HPMN
when accessed from EL1 or EL0.

Make sure we honor this requirement.

Reviewed-by: default avatarOliver Upton <oliver.upton@linux.dev>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent efff9dd2

arch/arm64/kvm/pmu-emul.c

+5 −1
Original line number Diff line number Diff line
@@ -1300,8 +1300,12 @@ u8 kvm_arm_pmu_get_pmuver_limit(void) 
u64 kvm_vcpu_read_pmcr(struct kvm_vcpu *vcpu)

{

	u64 pmcr = __vcpu_sys_reg(vcpu, PMCR_EL0);

	u64 n = vcpu->kvm->arch.nr_pmu_counters;



	return u64_replace_bits(pmcr, vcpu->kvm->arch.nr_pmu_counters, ARMV8_PMU_PMCR_N);

	if (vcpu_has_nv(vcpu) && !vcpu_is_el2(vcpu))

		n = FIELD_GET(MDCR_EL2_HPMN, __vcpu_sys_reg(vcpu, MDCR_EL2));



	return u64_replace_bits(pmcr, n, ARMV8_PMU_PMCR_N);

}



void kvm_pmu_nested_transition(struct kvm_vcpu *vcpu)