Skip to content

Commit ef4ba5a

Browse files
brooniectmarinas
authored andcommitted
arm64/sysreg: Convert ID_AA64PFR1_EL1 to automatic generation
Convert ID_AA64PFR1_EL1 to be automatically generated as per DDI04187H.a, no functional changes. Signed-off-by: Mark Brown <[email protected]> Reviewed-by: Kristina Martsenko <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent cea08f2 commit ef4ba5a

File tree

2 files changed

+45
-21
lines changed

2 files changed

+45
-21
lines changed

arch/arm64/include/asm/sysreg.h

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +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_AA64PFR1_EL1 sys_reg(3, 0, 0, 4, 1)
194-
195193
#define SYS_ID_AA64DFR0_EL1 sys_reg(3, 0, 0, 5, 0)
196194
#define SYS_ID_AA64DFR1_EL1 sys_reg(3, 0, 0, 5, 1)
197195

@@ -683,25 +681,6 @@
683681
#define ID_AA64PFR0_EL1_ELx_64BIT_ONLY 0x1
684682
#define ID_AA64PFR0_EL1_ELx_32BIT_64BIT 0x2
685683

686-
/* id_aa64pfr1 */
687-
#define ID_AA64PFR1_EL1_SME_SHIFT 24
688-
#define ID_AA64PFR1_EL1_MPAM_frac_SHIFT 16
689-
#define ID_AA64PFR1_EL1_RAS_frac_SHIFT 12
690-
#define ID_AA64PFR1_EL1_MTE_SHIFT 8
691-
#define ID_AA64PFR1_EL1_SSBS_SHIFT 4
692-
#define ID_AA64PFR1_EL1_BT_SHIFT 0
693-
694-
#define ID_AA64PFR1_EL1_SSBS_NI 0
695-
#define ID_AA64PFR1_EL1_SSBS_IMP 1
696-
#define ID_AA64PFR1_EL1_SSBS_SSBS2 2
697-
#define ID_AA64PFR1_EL1_BT_IMP 0x1
698-
#define ID_AA64PFR1_EL1_SME_IMP 1
699-
700-
#define ID_AA64PFR1_EL1_MTE_NI 0x0
701-
#define ID_AA64PFR1_EL1_MTE_IMP 0x1
702-
#define ID_AA64PFR1_EL1_MTE_MTE2 0x2
703-
#define ID_AA64PFR1_EL1_MTE_MTE3 0x3
704-
705684
/* id_aa64mmfr0 */
706685
#define ID_AA64MMFR0_EL1_TGRAN4_SUPPORTED_MIN 0x0
707686
#define ID_AA64MMFR0_EL1_TGRAN4_SUPPORTED_MAX 0x7

arch/arm64/tools/sysreg

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,51 @@ Enum 3:0 EL0
122122
EndEnum
123123
EndSysreg
124124

125+
Sysreg ID_AA64PFR1_EL1 3 0 0 4 1
126+
Res0 63:40
127+
Enum 39:36 NMI
128+
0b0000 NI
129+
0b0001 IMP
130+
EndEnum
131+
Enum 35:32 CSV2_frac
132+
0b0000 NI
133+
0b0001 CSV2_1p1
134+
0b0010 CSV2_1p2
135+
EndEnum
136+
Enum 31:28 RNDR_trap
137+
0b0000 NI
138+
0b0001 IMP
139+
EndEnum
140+
Enum 27:24 SME
141+
0b0000 NI
142+
0b0001 IMP
143+
EndEnum
144+
Res0 23:20
145+
Enum 19:16 MPAM_frac
146+
0b0000 MINOR_0
147+
0b0001 MINOR_1
148+
EndEnum
149+
Enum 15:12 RAS_frac
150+
0b0000 NI
151+
0b0001 RASv1p1
152+
EndEnum
153+
Enum 11:8 MTE
154+
0b0000 NI
155+
0b0001 IMP
156+
0b0010 MTE2
157+
0b0011 MTE3
158+
EndEnum
159+
Enum 7:4 SSBS
160+
0b0000 NI
161+
0b0001 IMP
162+
0b0010 SSBS2
163+
EndEnum
164+
Enum 3:0 BT
165+
0b0000 NI
166+
0b0001 IMP
167+
EndEnum
168+
EndSysreg
169+
125170
Sysreg ID_AA64ZFR0_EL1 3 0 0 4 4
126171
Res0 63:60
127172
Enum 59:56 F64MM

0 commit comments

Comments
 (0)