Commit c058b1c4 authored by Vincenzo Frascino's avatar Vincenzo Frascino Committed by Catalin Marinas
Browse files

arm64: mte: system register definitions 



Add Memory Tagging Extension system register definitions together with
the relevant bitfields.

Signed-off-by: default avatarVincenzo Frascino <vincenzo.frascino@arm.com>
Co-developed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
parent f75aef39

arch/arm64/include/asm/kvm_arm.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <asm/types.h>



/* Hyp Configuration Register (HCR) bits */

#define HCR_ATA		(UL(1) << 56)

#define HCR_FWB		(UL(1) << 46)

#define HCR_API		(UL(1) << 41)

#define HCR_APK		(UL(1) << 40)

arch/arm64/include/asm/sysreg.h

+53 −0
Original line number Diff line number Diff line
@@ -91,10 +91,12 @@ 
#define PSTATE_PAN			pstate_field(0, 4)

#define PSTATE_UAO			pstate_field(0, 3)

#define PSTATE_SSBS			pstate_field(3, 1)

#define PSTATE_TCO			pstate_field(3, 4)



#define SET_PSTATE_PAN(x)		__emit_inst(0xd500401f | PSTATE_PAN | ((!!x) << PSTATE_Imm_shift))

#define SET_PSTATE_UAO(x)		__emit_inst(0xd500401f | PSTATE_UAO | ((!!x) << PSTATE_Imm_shift))

#define SET_PSTATE_SSBS(x)		__emit_inst(0xd500401f | PSTATE_SSBS | ((!!x) << PSTATE_Imm_shift))

#define SET_PSTATE_TCO(x)		__emit_inst(0xd500401f | PSTATE_TCO | ((!!x) << PSTATE_Imm_shift))



#define __SYS_BARRIER_INSN(CRm, op2, Rt) \

	__emit_inst(0xd5000000 | sys_insn(0, 3, 3, (CRm), (op2)) | ((Rt) & 0x1f))
@@ -181,6 +183,8 @@ 
#define SYS_SCTLR_EL1			sys_reg(3, 0, 1, 0, 0)

#define SYS_ACTLR_EL1			sys_reg(3, 0, 1, 0, 1)

#define SYS_CPACR_EL1			sys_reg(3, 0, 1, 0, 2)

#define SYS_RGSR_EL1			sys_reg(3, 0, 1, 0, 5)

#define SYS_GCR_EL1			sys_reg(3, 0, 1, 0, 6)



#define SYS_ZCR_EL1			sys_reg(3, 0, 1, 2, 0)
@@ -218,6 +222,8 @@ 
#define SYS_ERXADDR_EL1			sys_reg(3, 0, 5, 4, 3)

#define SYS_ERXMISC0_EL1		sys_reg(3, 0, 5, 5, 0)

#define SYS_ERXMISC1_EL1		sys_reg(3, 0, 5, 5, 1)

#define SYS_TFSR_EL1			sys_reg(3, 0, 5, 6, 0)

#define SYS_TFSRE0_EL1			sys_reg(3, 0, 5, 6, 1)



#define SYS_FAR_EL1			sys_reg(3, 0, 6, 0, 0)

#define SYS_PAR_EL1			sys_reg(3, 0, 7, 4, 0)
@@ -368,6 +374,7 @@ 


#define SYS_CCSIDR_EL1			sys_reg(3, 1, 0, 0, 0)

#define SYS_CLIDR_EL1			sys_reg(3, 1, 0, 0, 1)

#define SYS_GMID_EL1			sys_reg(3, 1, 0, 0, 4)

#define SYS_AIDR_EL1			sys_reg(3, 1, 0, 0, 7)



#define SYS_CSSELR_EL1			sys_reg(3, 2, 0, 0, 0)
@@ -460,6 +467,7 @@ 
#define SYS_ESR_EL2			sys_reg(3, 4, 5, 2, 0)

#define SYS_VSESR_EL2			sys_reg(3, 4, 5, 2, 3)

#define SYS_FPEXC32_EL2			sys_reg(3, 4, 5, 3, 0)

#define SYS_TFSR_EL2			sys_reg(3, 4, 5, 6, 0)

#define SYS_FAR_EL2			sys_reg(3, 4, 6, 0, 0)



#define SYS_VDISR_EL2			sys_reg(3, 4, 12, 1,  1)
@@ -516,6 +524,7 @@ 
#define SYS_AFSR0_EL12			sys_reg(3, 5, 5, 1, 0)

#define SYS_AFSR1_EL12			sys_reg(3, 5, 5, 1, 1)

#define SYS_ESR_EL12			sys_reg(3, 5, 5, 2, 0)

#define SYS_TFSR_EL12			sys_reg(3, 5, 5, 6, 0)

#define SYS_FAR_EL12			sys_reg(3, 5, 6, 0, 0)

#define SYS_MAIR_EL12			sys_reg(3, 5, 10, 2, 0)

#define SYS_AMAIR_EL12			sys_reg(3, 5, 10, 3, 0)
@@ -531,6 +540,15 @@ 


/* Common SCTLR_ELx flags. */

#define SCTLR_ELx_DSSBS	(BIT(44))

#define SCTLR_ELx_ATA	(BIT(43))



#define SCTLR_ELx_TCF_SHIFT	40

#define SCTLR_ELx_TCF_NONE	(UL(0x0) << SCTLR_ELx_TCF_SHIFT)

#define SCTLR_ELx_TCF_SYNC	(UL(0x1) << SCTLR_ELx_TCF_SHIFT)

#define SCTLR_ELx_TCF_ASYNC	(UL(0x2) << SCTLR_ELx_TCF_SHIFT)

#define SCTLR_ELx_TCF_MASK	(UL(0x3) << SCTLR_ELx_TCF_SHIFT)



#define SCTLR_ELx_ITFSB	(BIT(37))

#define SCTLR_ELx_ENIA	(BIT(31))

#define SCTLR_ELx_ENIB	(BIT(30))

#define SCTLR_ELx_ENDA	(BIT(27))
@@ -559,6 +577,14 @@ 
#endif



/* SCTLR_EL1 specific flags. */

#define SCTLR_EL1_ATA0		(BIT(42))



#define SCTLR_EL1_TCF0_SHIFT	38

#define SCTLR_EL1_TCF0_NONE	(UL(0x0) << SCTLR_EL1_TCF0_SHIFT)

#define SCTLR_EL1_TCF0_SYNC	(UL(0x1) << SCTLR_EL1_TCF0_SHIFT)

#define SCTLR_EL1_TCF0_ASYNC	(UL(0x2) << SCTLR_EL1_TCF0_SHIFT)

#define SCTLR_EL1_TCF0_MASK	(UL(0x3) << SCTLR_EL1_TCF0_SHIFT)



#define SCTLR_EL1_BT1		(BIT(36))

#define SCTLR_EL1_BT0		(BIT(35))

#define SCTLR_EL1_UCI		(BIT(26))
@@ -595,6 +621,7 @@ 
#define MAIR_ATTR_DEVICE_GRE		UL(0x0c)

#define MAIR_ATTR_NORMAL_NC		UL(0x44)

#define MAIR_ATTR_NORMAL_WT		UL(0xbb)

#define MAIR_ATTR_NORMAL_TAGGED		UL(0xf0)

#define MAIR_ATTR_NORMAL		UL(0xff)

#define MAIR_ATTR_MASK			UL(0xff)
@@ -686,6 +713,10 @@ 
#define ID_AA64PFR1_SSBS_PSTATE_INSNS	2

#define ID_AA64PFR1_BT_BTI		0x1



#define ID_AA64PFR1_MTE_NI		0x0

#define ID_AA64PFR1_MTE_EL0		0x1

#define ID_AA64PFR1_MTE			0x2



/* id_aa64zfr0 */

#define ID_AA64ZFR0_F64MM_SHIFT		56

#define ID_AA64ZFR0_F32MM_SHIFT		52
@@ -920,6 +951,28 @@ 
#define CPACR_EL1_ZEN_EL0EN	(BIT(17)) /* enable EL0 access, if EL1EN set */

#define CPACR_EL1_ZEN		(CPACR_EL1_ZEN_EL1EN | CPACR_EL1_ZEN_EL0EN)



/* TCR EL1 Bit Definitions */

#define SYS_TCR_EL1_TCMA1	(BIT(58))

#define SYS_TCR_EL1_TCMA0	(BIT(57))



/* GCR_EL1 Definitions */

#define SYS_GCR_EL1_RRND	(BIT(16))

#define SYS_GCR_EL1_EXCL_MASK	0xffffUL



/* RGSR_EL1 Definitions */

#define SYS_RGSR_EL1_TAG_MASK	0xfUL

#define SYS_RGSR_EL1_SEED_SHIFT	8

#define SYS_RGSR_EL1_SEED_MASK	0xffffUL



/* GMID_EL1 field definitions */

#define SYS_GMID_EL1_BS_SHIFT	0

#define SYS_GMID_EL1_BS_SIZE	4



/* TFSR{,E0}_EL1 bit definitions */

#define SYS_TFSR_EL1_TF0_SHIFT	0

#define SYS_TFSR_EL1_TF1_SHIFT	1

#define SYS_TFSR_EL1_TF0	(UL(1) << SYS_TFSR_EL1_TF0_SHIFT)

#define SYS_TFSR_EL1_TF1	(UK(2) << SYS_TFSR_EL1_TF1_SHIFT)



/* Safe value for MPIDR_EL1: Bit31:RES1, Bit30:U:0, Bit24:MT:0 */

#define SYS_MPIDR_SAFE_VAL	(BIT(31))

arch/arm64/include/uapi/asm/ptrace.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#define PSR_PAN_BIT	0x00400000

#define PSR_UAO_BIT	0x00800000

#define PSR_DIT_BIT	0x01000000

#define PSR_TCO_BIT	0x02000000

#define PSR_V_BIT	0x10000000

#define PSR_C_BIT	0x20000000

#define PSR_Z_BIT	0x40000000

arch/arm64/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -1793,7 +1793,7 @@ void syscall_trace_exit(struct pt_regs *regs) 
 * We also reserve IL for the kernel; SS is handled dynamically.

 */

#define SPSR_EL1_AARCH64_RES0_BITS \

	(GENMASK_ULL(63, 32) | GENMASK_ULL(27, 25) | GENMASK_ULL(23, 22) | \

	(GENMASK_ULL(63, 32) | GENMASK_ULL(27, 26) | GENMASK_ULL(23, 22) | \

	 GENMASK_ULL(20, 13) | GENMASK_ULL(5, 5))

#define SPSR_EL1_AARCH32_RES0_BITS \

	(GENMASK_ULL(63, 32) | GENMASK_ULL(22, 22) | GENMASK_ULL(20, 20))