Skip to content

Commit fb0b8d1

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

File tree

2 files changed

+41
-8
lines changed

2 files changed

+41
-8
lines changed

arch/arm64/include/asm/sysreg.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@
165165
#define SYS_MPIDR_EL1 sys_reg(3, 0, 0, 0, 5)
166166
#define SYS_REVIDR_EL1 sys_reg(3, 0, 0, 0, 6)
167167

168-
#define SYS_ID_PFR0_EL1 sys_reg(3, 0, 0, 1, 0)
169168
#define SYS_ID_PFR1_EL1 sys_reg(3, 0, 0, 1, 1)
170169
#define SYS_ID_PFR2_EL1 sys_reg(3, 0, 0, 3, 4)
171170
#define SYS_ID_DFR0_EL1 sys_reg(3, 0, 0, 1, 2)
@@ -688,13 +687,6 @@
688687

689688
#define ID_MMFR5_EL1_ETS_SHIFT 0
690689

691-
#define ID_PFR0_EL1_DIT_SHIFT 24
692-
#define ID_PFR0_EL1_CSV2_SHIFT 16
693-
#define ID_PFR0_EL1_State3_SHIFT 12
694-
#define ID_PFR0_EL1_State2_SHIFT 8
695-
#define ID_PFR0_EL1_State1_SHIFT 4
696-
#define ID_PFR0_EL1_State0_SHIFT 0
697-
698690
#define ID_DFR0_EL1_PerfMon_SHIFT 24
699691
#define ID_DFR0_EL1_MProfDbg_SHIFT 20
700692
#define ID_DFR0_EL1_MMapTrc_SHIFT 16

arch/arm64/tools/sysreg

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,47 @@
4646
# feature that introduces them (eg, FEAT_LS64_ACCDATA introduces enumeration
4747
# item ACCDATA) though it may be more taseful to do something else.
4848

49+
Sysreg ID_PFR0_EL1 3 0 0 1 0
50+
Res0 63:32
51+
Enum 31:28 RAS
52+
0b0000 NI
53+
0b0001 RAS
54+
0b0010 RASv1p1
55+
EndEnum
56+
Enum 27:24 DIT
57+
0b0000 NI
58+
0b0001 IMP
59+
EndEnum
60+
Enum 23:20 AMU
61+
0b0000 NI
62+
0b0001 AMUv1
63+
0b0010 AMUv1p1
64+
EndEnum
65+
Enum 19:16 CSV2
66+
0b0000 UNDISCLOSED
67+
0b0001 IMP
68+
0b0010 CSV2p1
69+
EndEnum
70+
Enum 15:12 State3
71+
0b0000 NI
72+
0b0001 IMP
73+
EndEnum
74+
Enum 11:8 State2
75+
0b0000 NI
76+
0b0001 NO_CV
77+
0b0010 CV
78+
EndEnum
79+
Enum 7:4 State1
80+
0b0000 NI
81+
0b0001 THUMB
82+
0b0010 THUMB2
83+
EndEnum
84+
Enum 3:0 State0
85+
0b0000 NI
86+
0b0001 IMP
87+
EndEnum
88+
EndSysreg
89+
4990
Sysreg ID_MMFR0_EL1 3 0 0 1 4
5091
Res0 63:32
5192
Enum 31:28 InnerShr

0 commit comments

Comments
 (0)