Skip to content

Commit 46f3a5b

Browse files
Anshuman Khandualctmarinas
authored andcommitted
arm64/sysreg: Convert TRBSR_EL1 register to automatic generation
This converts TRBSR_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 cbaf0cf commit 46f3a5b

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

arch/arm64/include/asm/sysreg.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -227,24 +227,12 @@
227227

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

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

235-
#define TRBSR_EL1_EC_MASK GENMASK(31, 26)
236-
#define TRBSR_EL1_EC_SHIFT 26
237-
#define TRBSR_EL1_IRQ BIT(22)
238-
#define TRBSR_EL1_TRG BIT(21)
239-
#define TRBSR_EL1_WRAP BIT(20)
240-
#define TRBSR_EL1_EA BIT(18)
241-
#define TRBSR_EL1_S BIT(17)
242-
#define TRBSR_EL1_MSS_MASK GENMASK(15, 0)
243-
#define TRBSR_EL1_MSS_SHIFT 0
244234
#define TRBSR_EL1_BSC_MASK GENMASK(5, 0)
245235
#define TRBSR_EL1_BSC_SHIFT 0
246-
#define TRBSR_EL1_FSC_MASK GENMASK(5, 0)
247-
#define TRBSR_EL1_FSC_SHIFT 0
248236
#define TRBMAR_EL1_SH_MASK GENMASK(9, 8)
249237
#define TRBMAR_EL1_SH_SHIFT 8
250238
#define TRBMAR_EL1_Attr_MASK GENMASK(7, 0)

arch/arm64/tools/sysreg

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2282,3 +2282,19 @@ Sysreg TRBBASER_EL1 3 0 9 11 2
22822282
Field 63:12 BASE
22832283
Res0 11:0
22842284
EndSysreg
2285+
2286+
Sysreg TRBSR_EL1 3 0 9 11 3
2287+
Res0 63:56
2288+
Field 55:32 MSS2
2289+
Field 31:26 EC
2290+
Res0 25:24
2291+
Field 23 DAT
2292+
Field 22 IRQ
2293+
Field 21 TRG
2294+
Field 20 WRAP
2295+
Res0 19
2296+
Field 18 EA
2297+
Field 17 S
2298+
Res0 16
2299+
Field 15:0 MSS
2300+
EndSysreg

0 commit comments

Comments
 (0)