Commit 4782ccc8 authored by Oliver Upton's avatar Oliver Upton Committed by Marc Zyngier
Browse files

KVM: arm64: Remove internal accessor helpers for id regs 



The internal accessors are only ever called once. Dump out their
contents in the caller.

No functional change intended.

Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
Reviewed-by: default avatarReiji Watanabe <reijiw@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20220913094441.3957645-3-oliver.upton@linux.dev
parent 34b4d203

arch/arm64/kvm/sys_regs.c

+12 −34
Original line number Diff line number Diff line
@@ -1153,11 +1153,12 @@ static unsigned int raz_visibility(const struct kvm_vcpu *vcpu, 


/* cpufeature ID register access trap handlers */



static bool __access_id_reg(struct kvm_vcpu *vcpu,

static bool access_id_reg(struct kvm_vcpu *vcpu,

			  struct sys_reg_params *p,

			    const struct sys_reg_desc *r,

			    bool raz)

			  const struct sys_reg_desc *r)

{

	bool raz = sysreg_visible_as_raz(vcpu, r);



	if (p->is_write)

		return write_to_read_only(vcpu, p, r);
@@ -1165,15 +1166,6 @@ static bool __access_id_reg(struct kvm_vcpu *vcpu, 
	return true;

}



static bool access_id_reg(struct kvm_vcpu *vcpu,

			  struct sys_reg_params *p,

			  const struct sys_reg_desc *r)

{

	bool raz = sysreg_visible_as_raz(vcpu, r);



	return __access_id_reg(vcpu, p, r, raz);

}



/* Visibility overrides for SVE-specific control registers */

static unsigned int sve_visibility(const struct kvm_vcpu *vcpu,

				   const struct sys_reg_desc *rd)
@@ -1226,31 +1218,13 @@ static int set_id_aa64pfr0_el1(struct kvm_vcpu *vcpu, 
 * are stored, and for set_id_reg() we don't allow the effective value

 * to be changed.

 */

static int __get_id_reg(const struct kvm_vcpu *vcpu,

			const struct sys_reg_desc *rd, u64 *val,

			bool raz)

{

	*val = read_id_reg(vcpu, rd, raz);

	return 0;

}



static int __set_id_reg(const struct kvm_vcpu *vcpu,

			const struct sys_reg_desc *rd, u64 val,

			bool raz)

{

	/* This is what we mean by invariant: you can't change it. */

	if (val != read_id_reg(vcpu, rd, raz))

		return -EINVAL;



	return 0;

}



static int get_id_reg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd,

		      u64 *val)

{

	bool raz = sysreg_visible_as_raz(vcpu, rd);



	return __get_id_reg(vcpu, rd, val, raz);

	*val = read_id_reg(vcpu, rd, raz);

	return 0;

}



static int set_id_reg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd,
@@ -1258,7 +1232,11 @@ static int set_id_reg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, 
{

	bool raz = sysreg_visible_as_raz(vcpu, rd);



	return __set_id_reg(vcpu, rd, val, raz);

	/* This is what we mean by invariant: you can't change it. */

	if (val != read_id_reg(vcpu, rd, raz))

		return -EINVAL;



	return 0;

}



static int get_raz_reg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd,