Commit 2d27fd78 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: Drop is_32bit trap attribute 



The is_32bit attribute is now completely unused, drop it.

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

arch/arm64/kvm/sys_regs.c

+0 −3
Original line number Diff line number Diff line
@@ -2176,7 +2176,6 @@ static int kvm_handle_cp_64(struct kvm_vcpu *vcpu, 
	int Rt2 = (esr >> 10) & 0x1f;



	params.is_aarch32 = true;

	params.is_32bit = false;

	params.CRm = (esr >> 1) & 0xf;

	params.is_write = ((esr & 1) == 0);
@@ -2227,7 +2226,6 @@ static int kvm_handle_cp_32(struct kvm_vcpu *vcpu, 
	int Rt  = kvm_vcpu_sys_get_rt(vcpu);



	params.is_aarch32 = true;

	params.is_32bit = true;

	params.CRm = (esr >> 1) & 0xf;

	params.regval = vcpu_get_reg(vcpu, Rt);

	params.is_write = ((esr & 1) == 0);
@@ -2322,7 +2320,6 @@ int kvm_handle_sys_reg(struct kvm_vcpu *vcpu) 
	trace_kvm_handle_sys_reg(esr);



	params.is_aarch32 = false;

	params.is_32bit = false;

	params.Op0 = (esr >> 20) & 3;

	params.Op1 = (esr >> 14) & 0x7;

	params.CRn = (esr >> 10) & 0xf;

arch/arm64/kvm/sys_regs.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ struct sys_reg_params { 
	u64	regval;

	bool	is_write;

	bool	is_aarch32;

	bool	is_32bit;	/* Only valid if is_aarch32 is true */

};



struct sys_reg_desc {

arch/arm64/kvm/vgic-sys-reg-v3.c

+0 −2
Original line number Diff line number Diff line
@@ -269,7 +269,6 @@ int vgic_v3_has_cpu_sysregs_attr(struct kvm_vcpu *vcpu, bool is_write, u64 id, 
	params.regval = *reg;

	params.is_write = is_write;

	params.is_aarch32 = false;

	params.is_32bit = false;



	if (find_reg_by_id(sysreg, &params, gic_v3_icc_reg_descs,

			      ARRAY_SIZE(gic_v3_icc_reg_descs)))
@@ -289,7 +288,6 @@ int vgic_v3_cpu_sysregs_uaccess(struct kvm_vcpu *vcpu, bool is_write, u64 id, 
		params.regval = *reg;

	params.is_write = is_write;

	params.is_aarch32 = false;

	params.is_32bit = false;



	r = find_reg_by_id(sysreg, &params, gic_v3_icc_reg_descs,

			   ARRAY_SIZE(gic_v3_icc_reg_descs));