Skip to content

Commit 039d372

Browse files
James Morsewilldeacon
authored andcommitted
arm64/sysreg: Convert ID_PFR2_EL1 to automatic generation
Convert ID_PFR2_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 1224308 commit 039d372

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

arch/arm64/include/asm/sysreg.h

Lines changed: 0 additions & 4 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_PFR2_EL1 sys_reg(3, 0, 0, 3, 4)
169168
#define SYS_ID_DFR0_EL1 sys_reg(3, 0, 0, 1, 2)
170169
#define SYS_ID_DFR1_EL1 sys_reg(3, 0, 0, 3, 5)
171170
#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3)
@@ -694,9 +693,6 @@
694693
#define ID_DFR0_EL1_CopSDbg_SHIFT 4
695694
#define ID_DFR0_EL1_CopDbg_SHIFT 0
696695

697-
#define ID_PFR2_EL1_SSBS_SHIFT 4
698-
#define ID_PFR2_EL1_CSV3_SHIFT 0
699-
700696
#define MVFR0_EL1_FPRound_SHIFT 28
701697
#define MVFR0_EL1_FPShVec_SHIFT 24
702698
#define MVFR0_EL1_FPSqrt_SHIFT 20

arch/arm64/tools/sysreg

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,22 @@ Enum 3:0 SpecSEI
606606
EndEnum
607607
EndSysreg
608608

609+
Sysreg ID_PFR2_EL1 3 0 0 3 4
610+
Res0 63:12
611+
Enum 11:8 RAS_frac
612+
0b0000 NI
613+
0b0001 RASv1p1
614+
EndEnum
615+
Enum 7:4 SSBS
616+
0b0000 NI
617+
0b0001 IMP
618+
EndEnum
619+
Enum 3:0 CSV3
620+
0b0000 NI
621+
0b0001 IMP
622+
EndEnum
623+
EndSysreg
624+
609625
Sysreg ID_AA64PFR0_EL1 3 0 0 4 0
610626
Enum 63:60 CSV3
611627
0b0000 NI

0 commit comments

Comments
 (0)