Skip to content

Commit e62a2d2

Browse files
brooniectmarinas
authored andcommitted
arm64/sysreg: Convert ID_AA64FDR0_EL1 to automatic generation
Convert ID_AA64DFR0_EL1 to automatic generation as per DDI0487I.a, no functional changes. Signed-off-by: Mark Brown <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent 121a8fc commit e62a2d2

File tree

2 files changed

+63
-24
lines changed

2 files changed

+63
-24
lines changed

arch/arm64/include/asm/sysreg.h

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@
190190
#define SYS_MVFR1_EL1 sys_reg(3, 0, 0, 3, 1)
191191
#define SYS_MVFR2_EL1 sys_reg(3, 0, 0, 3, 2)
192192

193-
#define SYS_ID_AA64DFR0_EL1 sys_reg(3, 0, 0, 5, 0)
194193
#define SYS_ID_AA64DFR1_EL1 sys_reg(3, 0, 0, 5, 1)
195194

196195
#define SYS_ID_AA64AFR0_EL1 sys_reg(3, 0, 0, 5, 4)
@@ -698,29 +697,6 @@
698697
#define ID_AA64MMFR0_EL1_PARANGE_MAX ID_AA64MMFR0_EL1_PARANGE_48
699698
#endif
700699

701-
/* id_aa64dfr0 */
702-
#define ID_AA64DFR0_EL1_MTPMU_SHIFT 48
703-
#define ID_AA64DFR0_EL1_TraceBuffer_SHIFT 44
704-
#define ID_AA64DFR0_EL1_TraceFilt_SHIFT 40
705-
#define ID_AA64DFR0_EL1_DoubleLock_SHIFT 36
706-
#define ID_AA64DFR0_EL1_PMSVer_SHIFT 32
707-
#define ID_AA64DFR0_EL1_CTX_CMPs_SHIFT 28
708-
#define ID_AA64DFR0_EL1_WRPs_SHIFT 20
709-
#define ID_AA64DFR0_EL1_BRPs_SHIFT 12
710-
#define ID_AA64DFR0_EL1_PMUVer_SHIFT 8
711-
#define ID_AA64DFR0_EL1_TraceVer_SHIFT 4
712-
#define ID_AA64DFR0_EL1_DebugVer_SHIFT 0
713-
714-
#define ID_AA64DFR0_EL1_PMUVer_IMP 0x1
715-
#define ID_AA64DFR0_EL1_PMUVer_V3P1 0x4
716-
#define ID_AA64DFR0_EL1_PMUVer_V3P4 0x5
717-
#define ID_AA64DFR0_EL1_PMUVer_V3P5 0x6
718-
#define ID_AA64DFR0_EL1_PMUVer_V3P7 0x7
719-
#define ID_AA64DFR0_EL1_PMUVer_IMP_DEF 0xf
720-
721-
#define ID_AA64DFR0_EL1_PMSVer_IMP 0x1
722-
#define ID_AA64DFR0_EL1_PMSVer_V1P1 0x2
723-
724700
#define ID_DFR0_PERFMON_SHIFT 24
725701

726702
#define ID_DFR0_PERFMON_8_0 0x3

arch/arm64/tools/sysreg

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,69 @@ EndEnum
252252
Res0 31:0
253253
EndSysreg
254254

255+
Sysreg ID_AA64DFR0_EL1 3 0 0 5 0
256+
Enum 63:60 HPMN0
257+
0b0000 UNPREDICTABLE
258+
0b0001 DEF
259+
EndEnum
260+
Res0 59:56
261+
Enum 55:52 BRBE
262+
0b0000 NI
263+
0b0001 IMP
264+
0b0010 BRBE_V1P1
265+
EndEnum
266+
Enum 51:48 MTPMU
267+
0b0000 NI_IMPDEF
268+
0b0001 IMP
269+
0b1111 NI
270+
EndEnum
271+
Enum 47:44 TraceBuffer
272+
0b0000 NI
273+
0b0001 IMP
274+
EndEnum
275+
Enum 43:40 TraceFilt
276+
0b0000 NI
277+
0b0001 IMP
278+
EndEnum
279+
Enum 39:36 DoubleLock
280+
0b0000 IMP
281+
0b1111 NI
282+
EndEnum
283+
Enum 35:32 PMSVer
284+
0b0000 NI
285+
0b0001 IMP
286+
0b0010 V1P1
287+
0b0011 V1P2
288+
0b0100 V1P3
289+
EndEnum
290+
Field 31:28 CTX_CMPs
291+
Res0 27:24
292+
Field 23:20 WRPs
293+
Res0 19:16
294+
Field 15:12 BRPs
295+
Enum 11:8 PMUVer
296+
0b0000 NI
297+
0b0001 IMP
298+
0b0100 V3P1
299+
0b0101 V3P4
300+
0b0110 V3P5
301+
0b0111 V3P7
302+
0b1000 V3P8
303+
0b1111 IMP_DEF
304+
EndEnum
305+
Enum 7:4 TraceVer
306+
0b0000 NI
307+
0b0001 IMP
308+
EndEnum
309+
Enum 3:0 DebugVer
310+
0b0110 IMP
311+
0b0111 VHE
312+
0b1000 V8P2
313+
0b1001 V8P4
314+
0b1010 V8P8
315+
EndEnum
316+
EndSysreg
317+
255318
Sysreg ID_AA64ISAR0_EL1 3 0 0 6 0
256319
Enum 63:60 RNDR
257320
0b0000 NI

0 commit comments

Comments
 (0)