Skip to content

Commit 2bc589b

Browse files
brooniewilldeacon
authored andcommitted
arm64/sysreg: Convert ID_AA64SMFR0_EL1 to automatic generation
Convert ID_AA64SMFR0_EL1 to automatic register generation as per DDI0487H.a, no functional change. Signed-off-by: Mark Brown <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent 12c897b commit 2bc589b

File tree

2 files changed

+37
-18
lines changed

2 files changed

+37
-18
lines changed

arch/arm64/include/asm/sysreg.h

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@
193193
#define SYS_ID_AA64PFR0_EL1 sys_reg(3, 0, 0, 4, 0)
194194
#define SYS_ID_AA64PFR1_EL1 sys_reg(3, 0, 0, 4, 1)
195195
#define SYS_ID_AA64ZFR0_EL1 sys_reg(3, 0, 0, 4, 4)
196-
#define SYS_ID_AA64SMFR0_EL1 sys_reg(3, 0, 0, 4, 5)
197196

198197
#define SYS_ID_AA64DFR0_EL1 sys_reg(3, 0, 0, 5, 0)
199198
#define SYS_ID_AA64DFR1_EL1 sys_reg(3, 0, 0, 5, 1)
@@ -760,23 +759,6 @@
760759
#define ID_AA64ZFR0_EL1_AES_PMULL128 0x2
761760
#define ID_AA64ZFR0_EL1_SVEver_SVE2 0x1
762761

763-
/* id_aa64smfr0 */
764-
#define ID_AA64SMFR0_EL1_FA64_SHIFT 63
765-
#define ID_AA64SMFR0_EL1_I16I64_SHIFT 52
766-
#define ID_AA64SMFR0_EL1_F64F64_SHIFT 48
767-
#define ID_AA64SMFR0_EL1_I8I32_SHIFT 36
768-
#define ID_AA64SMFR0_EL1_F16F32_SHIFT 35
769-
#define ID_AA64SMFR0_EL1_B16F32_SHIFT 34
770-
#define ID_AA64SMFR0_EL1_F32F32_SHIFT 32
771-
772-
#define ID_AA64SMFR0_EL1_FA64_IMP 0x1
773-
#define ID_AA64SMFR0_EL1_I16I64_IMP 0xf
774-
#define ID_AA64SMFR0_EL1_F64F64_IMP 0x1
775-
#define ID_AA64SMFR0_EL1_I8I32_IMP 0xf
776-
#define ID_AA64SMFR0_EL1_F16F32_IMP 0x1
777-
#define ID_AA64SMFR0_EL1_B16F32_IMP 0x1
778-
#define ID_AA64SMFR0_EL1_F32F32_IMP 0x1
779-
780762
/* id_aa64mmfr0 */
781763
#define ID_AA64MMFR0_ECV_SHIFT 60
782764
#define ID_AA64MMFR0_FGT_SHIFT 56

arch/arm64/tools/sysreg

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,43 @@
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_AA64SMFR0_EL1 3 0 0 4 5
50+
Enum 63 FA64
51+
0b0 NI
52+
0b1 IMP
53+
EndEnum
54+
Res0 62:60
55+
Field 59:56 SMEver
56+
Enum 55:52 I16I64
57+
0b0000 NI
58+
0b1111 IMP
59+
EndEnum
60+
Res0 51:49
61+
Enum 48 F64F64
62+
0b0 NI
63+
0b1 IMP
64+
EndEnum
65+
Res0 47:40
66+
Enum 39:36 I8I32
67+
0b0000 NI
68+
0b1111 IMP
69+
EndEnum
70+
Enum 35 F16F32
71+
0b0 NI
72+
0b1 IMP
73+
EndEnum
74+
Enum 34 B16F32
75+
0b0 NI
76+
0b1 IMP
77+
EndEnum
78+
Res0 33
79+
Enum 32 F32F32
80+
0b0 NI
81+
0b1 IMP
82+
EndEnum
83+
Res0 31:0
84+
EndSysreg
85+
4986
Sysreg ID_AA64ISAR0_EL1 3 0 0 6 0
5087
Enum 63:60 RNDR
5188
0b0000 NI

0 commit comments

Comments
 (0)