Skip to content

Commit 3077b1d

Browse files
Anshuman Khandualctmarinas
authored andcommitted
arm64/sysreg: Convert TRBMAR_EL1 register to automatic generation
This converts TRBMAR_EL1 register to automatic generation without causing any functional change. Cc: Will Deacon <[email protected]> Cc: Marc Zyngier <[email protected]> Cc: Mark Brown <[email protected]> Cc: Rob Herring <[email protected]> Cc: Suzuki K Poulose <[email protected]> Cc: James Morse <[email protected]> Cc: [email protected] Cc: [email protected] Reviewed-by: Mark Brown <[email protected]> Signed-off-by: Anshuman Khandual <[email protected]> Reviewed-by: Suzuki K Poulose <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent 46f3a5b commit 3077b1d

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

arch/arm64/include/asm/sysreg.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,16 +227,11 @@
227227

228228
/*** End of Statistical Profiling Extension ***/
229229

230-
#define SYS_TRBMAR_EL1 sys_reg(3, 0, 9, 11, 4)
231230
#define SYS_TRBTRG_EL1 sys_reg(3, 0, 9, 11, 6)
232231
#define SYS_TRBIDR_EL1 sys_reg(3, 0, 9, 11, 7)
233232

234233
#define TRBSR_EL1_BSC_MASK GENMASK(5, 0)
235234
#define TRBSR_EL1_BSC_SHIFT 0
236-
#define TRBMAR_EL1_SH_MASK GENMASK(9, 8)
237-
#define TRBMAR_EL1_SH_SHIFT 8
238-
#define TRBMAR_EL1_Attr_MASK GENMASK(7, 0)
239-
#define TRBMAR_EL1_Attr_SHIFT 0
240235
#define TRBTRG_EL1_TRG_MASK GENMASK(31, 0)
241236
#define TRBTRG_EL1_TRG_SHIFT 0
242237
#define TRBIDR_EL1_F BIT(5)

arch/arm64/tools/sysreg

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2298,3 +2298,19 @@ Field 17 S
22982298
Res0 16
22992299
Field 15:0 MSS
23002300
EndSysreg
2301+
2302+
Sysreg TRBMAR_EL1 3 0 9 11 4
2303+
Res0 63:12
2304+
Enum 11:10 PAS
2305+
0b00 SECURE
2306+
0b01 NON_SECURE
2307+
0b10 ROOT
2308+
0b11 REALM
2309+
EndEnum
2310+
Enum 9:8 SH
2311+
0b00 NON_SHAREABLE
2312+
0b10 OUTER_SHAREABLE
2313+
0b11 INNER_SHAREABLE
2314+
EndEnum
2315+
Field 7:0 Attr
2316+
EndSysreg

0 commit comments

Comments
 (0)