Skip to content

Commit d044a9f

Browse files
James Morsewilldeacon
authored andcommitted
arm64/sysreg: Convert ID_DFR0_EL1 to automatic generation
Convert ID_DFR0_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 58e0105 commit d044a9f

File tree

2 files changed

+50
-14
lines changed

2 files changed

+50
-14
lines changed

arch/arm64/include/asm/sysreg.h

Lines changed: 0 additions & 14 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_DFR0_EL1 sys_reg(3, 0, 0, 1, 2)
169168
#define SYS_ID_DFR1_EL1 sys_reg(3, 0, 0, 3, 5)
170169

171170
#define SYS_ACTLR_EL1 sys_reg(3, 0, 1, 0, 1)
@@ -670,21 +669,8 @@
670669
#define ID_AA64MMFR0_EL1_PARANGE_MAX ID_AA64MMFR0_EL1_PARANGE_48
671670
#endif
672671

673-
#define ID_DFR0_EL1_PerfMon_PMUv3 0x3
674-
#define ID_DFR0_EL1_PerfMon_PMUv3p1 0x4
675-
#define ID_DFR0_EL1_PerfMon_PMUv3p4 0x5
676-
#define ID_DFR0_EL1_PerfMon_PMUv3p5 0x6
677-
678672
#define ID_DFR1_EL1_MTPMU_SHIFT 0
679673

680-
#define ID_DFR0_EL1_PerfMon_SHIFT 24
681-
#define ID_DFR0_EL1_MProfDbg_SHIFT 20
682-
#define ID_DFR0_EL1_MMapTrc_SHIFT 16
683-
#define ID_DFR0_EL1_CopTrc_SHIFT 12
684-
#define ID_DFR0_EL1_MMapDbg_SHIFT 8
685-
#define ID_DFR0_EL1_CopSDbg_SHIFT 4
686-
#define ID_DFR0_EL1_CopDbg_SHIFT 0
687-
688674
#if defined(CONFIG_ARM64_4K_PAGES)
689675
#define ID_AA64MMFR0_EL1_TGRAN_SHIFT ID_AA64MMFR0_EL1_TGRAN4_SHIFT
690676
#define ID_AA64MMFR0_EL1_TGRAN_SUPPORTED_MIN ID_AA64MMFR0_EL1_TGRAN4_SUPPORTED_MIN

arch/arm64/tools/sysreg

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,56 @@ Enum 3:0 ProgMod
127127
EndEnum
128128
EndSysreg
129129

130+
Sysreg ID_DFR0_EL1 3 0 0 1 2
131+
Res0 63:32
132+
Enum 31:28 TraceFilt
133+
0b0000 NI
134+
0b0001 IMP
135+
EndEnum
136+
Enum 27:24 PerfMon
137+
0b0000 NI
138+
0b0001 PMUv1
139+
0b0010 PMUv2
140+
0b0011 PMUv3
141+
0b0100 PMUv3p1
142+
0b0101 PMUv3p4
143+
0b0110 PMUv3p5
144+
0b0111 PMUv3p7
145+
0b1000 PMUv3p8
146+
0b1111 IMPDEF
147+
EndEnum
148+
Enum 23:20 MProfDbg
149+
0b0000 NI
150+
0b0001 IMP
151+
EndEnum
152+
Enum 19:16 MMapTrc
153+
0b0000 NI
154+
0b0001 IMP
155+
EndEnum
156+
Enum 15:12 CopTrc
157+
0b0000 NI
158+
0b0001 IMP
159+
EndEnum
160+
Enum 11:8 MMapDbg
161+
0b0000 NI
162+
0b0100 Armv7
163+
0b0101 Armv7p1
164+
EndEnum
165+
Field 7:4 CopSDbg
166+
Enum 3:0 CopDbg
167+
0b0000 NI
168+
0b0010 Armv6
169+
0b0011 Armv6p1
170+
0b0100 Armv7
171+
0b0101 Armv7p1
172+
0b0110 Armv8
173+
0b0111 VHE
174+
0b1000 Debugv8p2
175+
0b1001 Debugv8p4
176+
0b1010 Debugv8p8
177+
EndEnum
178+
EndSysreg
179+
130180
Sysreg ID_AFR0_EL1 3 0 0 1 3
131181
Res0 63:16
132182
Field 15:12 IMPDEF3

0 commit comments

Comments
 (0)