Skip to content

Commit f4e9ce1

Browse files
James Morsewilldeacon
authored andcommitted
arm64/sysreg: Convert ID_ISAR5_EL1 to automatic generation
Convert ID_ISAR5_EL1 to be automatically generated as per DDI0487I.a, no functional changes. Reviewed-by: Mark Brown <[email protected]> Signed-off-by: James Morse <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent 849cc9b commit f4e9ce1

File tree

2 files changed

+34
-8
lines changed

2 files changed

+34
-8
lines changed

arch/arm64/include/asm/sysreg.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@
173173
#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3)
174174
#define SYS_ID_MMFR5_EL1 sys_reg(3, 0, 0, 3, 6)
175175

176-
#define SYS_ID_ISAR5_EL1 sys_reg(3, 0, 0, 2, 5)
177176
#define SYS_ID_ISAR6_EL1 sys_reg(3, 0, 0, 2, 7)
178177

179178
#define SYS_MVFR0_EL1 sys_reg(3, 0, 0, 3, 0)
@@ -689,13 +688,6 @@
689688

690689
#define ID_DFR1_EL1_MTPMU_SHIFT 0
691690

692-
#define ID_ISAR5_EL1_RDM_SHIFT 24
693-
#define ID_ISAR5_EL1_CRC32_SHIFT 16
694-
#define ID_ISAR5_EL1_SHA2_SHIFT 12
695-
#define ID_ISAR5_EL1_SHA1_SHIFT 8
696-
#define ID_ISAR5_EL1_AES_SHIFT 4
697-
#define ID_ISAR5_EL1_SEVL_SHIFT 0
698-
699691
#define ID_ISAR6_EL1_I8MM_SHIFT 24
700692
#define ID_ISAR6_EL1_BF16_SHIFT 20
701693
#define ID_ISAR6_EL1_SPECRES_SHIFT 16

arch/arm64/tools/sysreg

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,40 @@ Enum 3:0 Unpriv
421421
EndEnum
422422
EndSysreg
423423

424+
Sysreg ID_ISAR5_EL1 3 0 0 2 5
425+
Res0 63:32
426+
Enum 31:28 VCMA
427+
0b0000 NI
428+
0b0001 IMP
429+
EndEnum
430+
Enum 27:24 RDM
431+
0b0000 NI
432+
0b0001 IMP
433+
EndEnum
434+
Res0 23:20
435+
Enum 19:16 CRC32
436+
0b0000 NI
437+
0b0001 IMP
438+
EndEnum
439+
Enum 15:12 SHA2
440+
0b0000 NI
441+
0b0001 IMP
442+
EndEnum
443+
Enum 11:8 SHA1
444+
0b0000 NI
445+
0b0001 IMP
446+
EndEnum
447+
Enum 7:4 AES
448+
0b0000 NI
449+
0b0001 IMP
450+
0b0010 VMULL
451+
EndEnum
452+
Enum 3:0 SEVL
453+
0b0000 NI
454+
0b0001 IMP
455+
EndEnum
456+
EndSysreg
457+
424458
Sysreg ID_MMFR4_EL1 3 0 0 2 6
425459
Res0 63:32
426460
Enum 31:28 EVT

0 commit comments

Comments
 (0)