Commit 174ed3e4 authored by Mark Rutland's avatar Mark Rutland
Browse files

KVM: arm64: Use common performance monitor sysreg definitions 



Now that we have common definitions for the performance monitor register
encodings, make the KVM code use these, simplifying the sys_reg_descs
table.

The comments for PMUSERENR_EL0 and PMCCFILTR_EL0 are kept, as these
describe non-obvious details regarding the registers. However, a slight
fixup is applied to bring these into line with the usual comment style.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: kvmarm@lists.cs.columbia.edu
parent ee1b64e6

arch/arm64/kvm/sys_regs.c

+22 −56
Original line number Diff line number Diff line
@@ -804,16 +804,12 @@ static bool access_pmuserenr(struct kvm_vcpu *vcpu, struct sys_reg_params *p, 


/* Macro to expand the PMEVCNTRn_EL0 register */

#define PMU_PMEVCNTR_EL0(n)						\

	/* PMEVCNTRn_EL0 */						\

	{ Op0(0b11), Op1(0b011), CRn(0b1110),				\

	  CRm((0b1000 | (((n) >> 3) & 0x3))), Op2(((n) & 0x7)),		\

	{ SYS_DESC(SYS_PMEVCNTRn_EL0(n)),					\

	  access_pmu_evcntr, reset_unknown, (PMEVCNTR0_EL0 + n), }



/* Macro to expand the PMEVTYPERn_EL0 register */

#define PMU_PMEVTYPER_EL0(n)						\

	/* PMEVTYPERn_EL0 */						\

	{ Op0(0b11), Op1(0b011), CRn(0b1110),				\

	  CRm((0b1100 | (((n) >> 3) & 0x3))), Op2(((n) & 0x7)),		\

	{ SYS_DESC(SYS_PMEVTYPERn_EL0(n)),					\

	  access_pmu_evtyper, reset_unknown, (PMEVTYPER0_EL0 + n), }



static bool access_cntp_tval(struct kvm_vcpu *vcpu,
@@ -963,12 +959,8 @@ static const struct sys_reg_desc sys_reg_descs[] = { 
	{ Op0(0b11), Op1(0b000), CRn(0b0111), CRm(0b0100), Op2(0b000),

	  NULL, reset_unknown, PAR_EL1 },



	/* PMINTENSET_EL1 */

	{ Op0(0b11), Op1(0b000), CRn(0b1001), CRm(0b1110), Op2(0b001),

	  access_pminten, reset_unknown, PMINTENSET_EL1 },

	/* PMINTENCLR_EL1 */

	{ Op0(0b11), Op1(0b000), CRn(0b1001), CRm(0b1110), Op2(0b010),

	  access_pminten, NULL, PMINTENSET_EL1 },

	{ SYS_DESC(SYS_PMINTENSET_EL1), access_pminten, reset_unknown, PMINTENSET_EL1 },

	{ SYS_DESC(SYS_PMINTENCLR_EL1), access_pminten, NULL, PMINTENSET_EL1 },



	/* MAIR_EL1 */

	{ Op0(0b11), Op1(0b000), CRn(0b1010), CRm(0b0010), Op2(0b000),
@@ -1003,48 +995,23 @@ static const struct sys_reg_desc sys_reg_descs[] = { 
	{ Op0(0b11), Op1(0b010), CRn(0b0000), CRm(0b0000), Op2(0b000),

	  NULL, reset_unknown, CSSELR_EL1 },



	/* PMCR_EL0 */

	{ Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1100), Op2(0b000),

	  access_pmcr, reset_pmcr, },

	/* PMCNTENSET_EL0 */

	{ Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1100), Op2(0b001),

	  access_pmcnten, reset_unknown, PMCNTENSET_EL0 },

	/* PMCNTENCLR_EL0 */

	{ Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1100), Op2(0b010),

	  access_pmcnten, NULL, PMCNTENSET_EL0 },

	/* PMOVSCLR_EL0 */

	{ Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1100), Op2(0b011),

	  access_pmovs, NULL, PMOVSSET_EL0 },

	/* PMSWINC_EL0 */

	{ Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1100), Op2(0b100),

	  access_pmswinc, reset_unknown, PMSWINC_EL0 },

	/* PMSELR_EL0 */

	{ Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1100), Op2(0b101),

	  access_pmselr, reset_unknown, PMSELR_EL0 },

	/* PMCEID0_EL0 */

	{ Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1100), Op2(0b110),

	  access_pmceid },

	/* PMCEID1_EL0 */

	{ Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1100), Op2(0b111),

	  access_pmceid },

	/* PMCCNTR_EL0 */

	{ Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1101), Op2(0b000),

	  access_pmu_evcntr, reset_unknown, PMCCNTR_EL0 },

	/* PMXEVTYPER_EL0 */

	{ Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1101), Op2(0b001),

	  access_pmu_evtyper },

	/* PMXEVCNTR_EL0 */

	{ Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1101), Op2(0b010),

	  access_pmu_evcntr },

	/* PMUSERENR_EL0

	 * This register resets as unknown in 64bit mode while it resets as zero

	{ SYS_DESC(SYS_PMCR_EL0), access_pmcr, reset_pmcr, },

	{ SYS_DESC(SYS_PMCNTENSET_EL0), access_pmcnten, reset_unknown, PMCNTENSET_EL0 },

	{ SYS_DESC(SYS_PMCNTENCLR_EL0), access_pmcnten, NULL, PMCNTENSET_EL0 },

	{ SYS_DESC(SYS_PMOVSCLR_EL0), access_pmovs, NULL, PMOVSSET_EL0 },

	{ SYS_DESC(SYS_PMSWINC_EL0), access_pmswinc, reset_unknown, PMSWINC_EL0 },

	{ SYS_DESC(SYS_PMSELR_EL0), access_pmselr, reset_unknown, PMSELR_EL0 },

	{ SYS_DESC(SYS_PMCEID0_EL0), access_pmceid },

	{ SYS_DESC(SYS_PMCEID1_EL0), access_pmceid },

	{ SYS_DESC(SYS_PMCCNTR_EL0), access_pmu_evcntr, reset_unknown, PMCCNTR_EL0 },

	{ SYS_DESC(SYS_PMXEVTYPER_EL0), access_pmu_evtyper },

	{ SYS_DESC(SYS_PMXEVCNTR_EL0), access_pmu_evcntr },

	/*

	 * PMUSERENR_EL0 resets as unknown in 64bit mode while it resets as zero

	 * in 32bit mode. Here we choose to reset it as zero for consistency.

	 */

	{ Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1110), Op2(0b000),

	  access_pmuserenr, reset_val, PMUSERENR_EL0, 0 },

	/* PMOVSSET_EL0 */

	{ Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1110), Op2(0b011),

	  access_pmovs, reset_unknown, PMOVSSET_EL0 },

	{ SYS_DESC(SYS_PMUSERENR_EL0), access_pmuserenr, reset_val, PMUSERENR_EL0, 0 },

	{ SYS_DESC(SYS_PMOVSSET_EL0), access_pmovs, reset_unknown, PMOVSSET_EL0 },



	/* TPIDR_EL0 */

	{ Op0(0b11), Op1(0b011), CRn(0b1101), CRm(0b0000), Op2(0b010),
@@ -1127,12 +1094,11 @@ static const struct sys_reg_desc sys_reg_descs[] = { 
	PMU_PMEVTYPER_EL0(28),

	PMU_PMEVTYPER_EL0(29),

	PMU_PMEVTYPER_EL0(30),

	/* PMCCFILTR_EL0

	 * This register resets as unknown in 64bit mode while it resets as zero

	/*

	 * PMCCFILTR_EL0 resets as unknown in 64bit mode while it resets as zero

	 * in 32bit mode. Here we choose to reset it as zero for consistency.

	 */

	{ Op0(0b11), Op1(0b011), CRn(0b1110), CRm(0b1111), Op2(0b111),

	  access_pmu_evtyper, reset_val, PMCCFILTR_EL0, 0 },

	{ SYS_DESC(SYS_PMCCFILTR_EL0), access_pmu_evtyper, reset_val, PMCCFILTR_EL0, 0 },



	/* DACR32_EL2 */

	{ Op0(0b11), Op1(0b100), CRn(0b0011), CRm(0b0000), Op2(0b000),

CRA Git | Maintained and supported by SUSTech CRA and CCSE