Commit ae976f06 authored by Marc Zyngier's avatar Marc Zyngier Committed by Will Deacon
Browse files

arm64: Add handling of CNTVCTSS traps 



Since CNTVCTSS obey the same control bits as CNTVCT, add the necessary
decoding to the hook table. Note that there is no known user of
this at the moment.

Acked-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20211017124225.3018098-17-maz@kernel.org


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 9ee840a9

arch/arm64/include/asm/esr.h

+6 −0
Original line number Diff line number Diff line
@@ -227,6 +227,9 @@ 
#define ESR_ELx_SYS64_ISS_SYS_CNTVCT	(ESR_ELx_SYS64_ISS_SYS_VAL(3, 3, 2, 14, 0) | \

					 ESR_ELx_SYS64_ISS_DIR_READ)



#define ESR_ELx_SYS64_ISS_SYS_CNTVCTSS	(ESR_ELx_SYS64_ISS_SYS_VAL(3, 3, 6, 14, 0) | \

					 ESR_ELx_SYS64_ISS_DIR_READ)



#define ESR_ELx_SYS64_ISS_SYS_CNTFRQ	(ESR_ELx_SYS64_ISS_SYS_VAL(3, 3, 0, 14, 0) | \

					 ESR_ELx_SYS64_ISS_DIR_READ)
@@ -317,6 +320,9 @@ 
#define ESR_ELx_CP15_64_ISS_SYS_CNTVCT	(ESR_ELx_CP15_64_ISS_SYS_VAL(1, 14) | \

					 ESR_ELx_CP15_64_ISS_DIR_READ)



#define ESR_ELx_CP15_64_ISS_SYS_CNTVCTSS (ESR_ELx_CP15_64_ISS_SYS_VAL(9, 14) | \

					 ESR_ELx_CP15_64_ISS_DIR_READ)



#define ESR_ELx_CP15_32_ISS_SYS_CNTFRQ	(ESR_ELx_CP15_32_ISS_SYS_VAL(0, 0, 14, 0) |\

					 ESR_ELx_CP15_32_ISS_DIR_READ)

arch/arm64/kernel/traps.c

+11 −0
Original line number Diff line number Diff line
@@ -653,6 +653,12 @@ static const struct sys64_hook sys64_hooks[] = { 
		.esr_val = ESR_ELx_SYS64_ISS_SYS_CNTVCT,

		.handler = cntvct_read_handler,

	},

	{

		/* Trap read access to CNTVCTSS_EL0 */

		.esr_mask = ESR_ELx_SYS64_ISS_SYS_OP_MASK,

		.esr_val = ESR_ELx_SYS64_ISS_SYS_CNTVCTSS,

		.handler = cntvct_read_handler,

	},

	{

		/* Trap read access to CNTFRQ_EL0 */

		.esr_mask = ESR_ELx_SYS64_ISS_SYS_OP_MASK,
@@ -729,6 +735,11 @@ static const struct sys64_hook cp15_64_hooks[] = { 
		.esr_val = ESR_ELx_CP15_64_ISS_SYS_CNTVCT,

		.handler = compat_cntvct_read_handler,

	},

	{

		.esr_mask = ESR_ELx_CP15_64_ISS_SYS_MASK,

		.esr_val = ESR_ELx_CP15_64_ISS_SYS_CNTVCTSS,

		.handler = compat_cntvct_read_handler,

	},

	{},

};