Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0443230 authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

arm64: KVM: PMU: Inject UNDEF on read access to PMSWINC_EL0 



PMSWINC_EL0 is a WO register, so let's UNDEF when reading from it
(in the highly hypothetical case where this doesn't UNDEF at EL1).

Reviewed-by: default avatarChristoffer Dall <cdall@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 7b5b4df1

arch/arm64/kvm/sys_regs.c

+6 −7
Original line number Diff line number Diff line
@@ -772,18 +772,17 @@ static bool access_pmswinc(struct kvm_vcpu *vcpu, struct sys_reg_params *p, 
	if (!kvm_arm_pmu_v3_ready(vcpu))

		return trap_raz_wi(vcpu, p, r);



	if (!p->is_write)

		return read_from_write_only(vcpu, p);



	if (pmu_write_swinc_el0_disabled(vcpu))

		return false;



	if (p->is_write) {

	mask = kvm_pmu_valid_counter_mask(vcpu);

	kvm_pmu_software_increment(vcpu, p->regval & mask);

	return true;

}



	return false;

}



static bool access_pmuserenr(struct kvm_vcpu *vcpu, struct sys_reg_params *p,

			     const struct sys_reg_desc *r)

{