Commit ebf6aa8c authored by Alexandru Elisei's avatar Alexandru Elisei Committed by Marc Zyngier
Browse files

KVM: arm64: Replace get_raz_id_reg() with get_raz_reg() 



Reading a RAZ ID register isn't different from reading any other RAZ
register, so get rid of get_raz_id_reg() and replace it with get_raz_reg(),
which does the same thing, but does it without going through two layers of
indirection.

No functional change.

Suggested-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarAlexandru Elisei <alexandru.elisei@arm.com>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20211011105840.155815-4-alexandru.elisei@arm.com
parent 5a430976

arch/arm64/kvm/sys_regs.c

+2 −8
Original line number Diff line number Diff line
@@ -1273,12 +1273,6 @@ static int set_id_reg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, 
	return __set_id_reg(vcpu, rd, uaddr, raz);

}



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

			  const struct kvm_one_reg *reg, void __user *uaddr)

{

	return __get_id_reg(vcpu, rd, uaddr, true);

}



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

			  const struct kvm_one_reg *reg, void __user *uaddr)

{
@@ -1402,7 +1396,7 @@ static unsigned int mte_visibility(const struct kvm_vcpu *vcpu, 
#define ID_UNALLOCATED(crm, op2) {			\

	Op0(3), Op1(0), CRn(0), CRm(crm), Op2(op2),	\

	.access = access_raz_id_reg,			\

	.get_user = get_raz_id_reg,			\

	.get_user = get_raz_reg,			\

	.set_user = set_raz_id_reg,			\

}
@@ -1414,7 +1408,7 @@ static unsigned int mte_visibility(const struct kvm_vcpu *vcpu, 
#define ID_HIDDEN(name) {			\

	SYS_DESC(SYS_##name),			\

	.access = access_raz_id_reg,		\

	.get_user = get_raz_id_reg,		\

	.get_user = get_raz_reg,		\

	.set_user = set_raz_id_reg,		\

}