Skip to content

Commit 8a950ef

Browse files
James Morsewilldeacon
authored andcommitted
arm64/sysreg: Convert ID_MMFR5_EL1 to automatic generation
Convert ID_MMFR5_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 f70a810 commit 8a950ef

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

arch/arm64/include/asm/sysreg.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@
168168
#define SYS_ID_DFR0_EL1 sys_reg(3, 0, 0, 1, 2)
169169
#define SYS_ID_DFR1_EL1 sys_reg(3, 0, 0, 3, 5)
170170
#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3)
171-
#define SYS_ID_MMFR5_EL1 sys_reg(3, 0, 0, 3, 6)
172171

173172
#define SYS_ACTLR_EL1 sys_reg(3, 0, 1, 0, 1)
174173
#define SYS_RGSR_EL1 sys_reg(3, 0, 1, 0, 5)
@@ -679,8 +678,6 @@
679678

680679
#define ID_DFR1_EL1_MTPMU_SHIFT 0
681680

682-
#define ID_MMFR5_EL1_ETS_SHIFT 0
683-
684681
#define ID_DFR0_EL1_PerfMon_SHIFT 24
685682
#define ID_DFR0_EL1_MProfDbg_SHIFT 20
686683
#define ID_DFR0_EL1_MMapTrc_SHIFT 16

arch/arm64/tools/sysreg

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,18 @@ Enum 3:0 CSV3
717717
EndEnum
718718
EndSysreg
719719

720+
Sysreg ID_MMFR5_EL1 3 0 0 3 6
721+
Res0 63:8
722+
Enum 7:4 nTLBPA
723+
0b0000 NI
724+
0b0001 IMP
725+
EndEnum
726+
Enum 3:0 ETS
727+
0b0000 NI
728+
0b0001 IMP
729+
EndEnum
730+
EndSysreg
731+
720732
Sysreg ID_AA64PFR0_EL1 3 0 0 4 0
721733
Enum 63:60 CSV3
722734
0b0000 NI

0 commit comments

Comments
 (0)