Commit af473829 authored by James Morse's avatar James Morse Committed by Marc Zyngier
Browse files

KVM: arm64: Move ACTLR_EL1 emulation to the sys_reg_descs array 



The only entry in the genericv8_sys_regs arrays is for emulation of
ACTLR_EL1. As all targets emulate this in the same way, move it to
sys_reg_descs[].

Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200622113317.20477-4-james.morse@arm.com
parent 04343ae3

arch/arm64/kvm/sys_regs.c

+28 −0
Original line number Diff line number Diff line
@@ -242,6 +242,25 @@ static bool access_vm_reg(struct kvm_vcpu *vcpu, 
	return true;

}



static bool access_actlr(struct kvm_vcpu *vcpu,

			 struct sys_reg_params *p,

			 const struct sys_reg_desc *r)

{

	if (p->is_write)

		return ignore_write(vcpu, p);



	p->regval = vcpu_read_sys_reg(vcpu, ACTLR_EL1);



	if (p->is_aarch32) {

		if (r->Op2 & 2)

			p->regval = upper_32_bits(p->regval);

		else

			p->regval = lower_32_bits(p->regval);

	}



	return true;

}



/*

 * Trap handler for the GICv3 SGI generation system register.

 * Forward the request to the VGIC emulation.
@@ -615,6 +634,12 @@ static void reset_amair_el1(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r) 
	vcpu_write_sys_reg(vcpu, amair, AMAIR_EL1);

}



static void reset_actlr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)

{

	u64 actlr = read_sysreg(actlr_el1);

	vcpu_write_sys_reg(vcpu, actlr, ACTLR_EL1);

}



static void reset_mpidr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)

{

	u64 mpidr;
@@ -1518,6 +1543,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { 
	ID_UNALLOCATED(7,7),



	{ SYS_DESC(SYS_SCTLR_EL1), access_vm_reg, reset_val, SCTLR_EL1, 0x00C50078 },

	{ SYS_DESC(SYS_ACTLR_EL1), access_actlr, reset_actlr, ACTLR_EL1 },

	{ SYS_DESC(SYS_CPACR_EL1), NULL, reset_val, CPACR_EL1, 0 },

	{ SYS_DESC(SYS_ZCR_EL1), NULL, reset_val, ZCR_EL1, 0, .visibility = sve_visibility },

	{ SYS_DESC(SYS_TTBR0_EL1), access_vm_reg, reset_unknown, TTBR0_EL1 },
@@ -1957,6 +1983,8 @@ static const struct sys_reg_desc cp14_64_regs[] = { 
static const struct sys_reg_desc cp15_regs[] = {

	{ Op1( 0), CRn( 0), CRm( 0), Op2( 1), access_ctr },

	{ Op1( 0), CRn( 1), CRm( 0), Op2( 0), access_vm_reg, NULL, c1_SCTLR },

	{ Op1( 0), CRn( 1), CRm( 0), Op2( 1), access_actlr },

	{ Op1( 0), CRn( 1), CRm( 0), Op2( 3), access_actlr },

	{ Op1( 0), CRn( 2), CRm( 0), Op2( 0), access_vm_reg, NULL, c2_TTBR0 },

	{ Op1( 0), CRn( 2), CRm( 0), Op2( 1), access_vm_reg, NULL, c2_TTBR1 },

	{ Op1( 0), CRn( 2), CRm( 0), Op2( 2), access_vm_reg, NULL, c2_TTBCR },

arch/arm64/kvm/sys_regs_generic_v8.c

+0 −30
Original line number Diff line number Diff line
@@ -19,44 +19,14 @@ 


#include "sys_regs.h"



static bool access_actlr(struct kvm_vcpu *vcpu,

			 struct sys_reg_params *p,

			 const struct sys_reg_desc *r)

{

	if (p->is_write)

		return ignore_write(vcpu, p);



	p->regval = vcpu_read_sys_reg(vcpu, ACTLR_EL1);



	if (p->is_aarch32) {

		if (r->Op2 & 2)

			p->regval = upper_32_bits(p->regval);

		else

			p->regval = lower_32_bits(p->regval);

	}



	return true;

}



static void reset_actlr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)

{

	__vcpu_sys_reg(vcpu, ACTLR_EL1) = read_sysreg(actlr_el1);

}



/*

 * Implementation specific sys-reg registers.

 * Important: Must be sorted ascending by Op0, Op1, CRn, CRm, Op2

 */

static const struct sys_reg_desc genericv8_sys_regs[] = {

	{ SYS_DESC(SYS_ACTLR_EL1), access_actlr, reset_actlr, ACTLR_EL1 },

};



static const struct sys_reg_desc genericv8_cp15_regs[] = {

	/* ACTLR */

	{ Op1(0b000), CRn(0b0001), CRm(0b0000), Op2(0b001),

	  access_actlr },

	{ Op1(0b000), CRn(0b0001), CRm(0b0000), Op2(0b011),

	  access_actlr },

};



struct kvm_sys_reg_target_table genericv8_target_table = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE