Commit 7ded92e2 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: Simplify handling of absent PMU system registers 



Now that all PMU registers are gated behind a .visibility callback,
remove the other checks against an absent PMU.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 11663111

arch/arm64/kvm/sys_regs.c

+1 −7
Original line number Diff line number Diff line
@@ -622,9 +622,8 @@ static void reset_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r) 
static bool check_pmu_access_disabled(struct kvm_vcpu *vcpu, u64 flags)

{

	u64 reg = __vcpu_sys_reg(vcpu, PMUSERENR_EL0);

	bool enabled = kvm_vcpu_has_pmu(vcpu);

	bool enabled = (reg & flags) || vcpu_mode_priv(vcpu);



	enabled &= (reg & flags) || vcpu_mode_priv(vcpu);

	if (!enabled)

		kvm_inject_undefined(vcpu);
@@ -909,11 +908,6 @@ static bool access_pmswinc(struct kvm_vcpu *vcpu, struct sys_reg_params *p, 
static bool access_pmuserenr(struct kvm_vcpu *vcpu, struct sys_reg_params *p,

			     const struct sys_reg_desc *r)

{

	if (!kvm_vcpu_has_pmu(vcpu)) {

		kvm_inject_undefined(vcpu);

		return false;

	}



	if (p->is_write) {

		if (!vcpu_mode_priv(vcpu)) {

			kvm_inject_undefined(vcpu);