Skip to content

Commit c9b718e

Browse files
James Morsewilldeacon
authored andcommitted
arm64/sysreg: Convert MVFR1_EL1 to automatic generation
Convert MVFR1_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 e79c94a commit c9b718e

File tree

2 files changed

+39
-10
lines changed

2 files changed

+39
-10
lines changed

arch/arm64/include/asm/sysreg.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@
170170
#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3)
171171
#define SYS_ID_MMFR5_EL1 sys_reg(3, 0, 0, 3, 6)
172172

173-
#define SYS_MVFR1_EL1 sys_reg(3, 0, 0, 3, 1)
174173
#define SYS_MVFR2_EL1 sys_reg(3, 0, 0, 3, 2)
175174

176175
#define SYS_ACTLR_EL1 sys_reg(3, 0, 1, 0, 1)
@@ -692,15 +691,6 @@
692691
#define ID_DFR0_EL1_CopSDbg_SHIFT 4
693692
#define ID_DFR0_EL1_CopDbg_SHIFT 0
694693

695-
#define MVFR1_EL1_SIMDFMAC_SHIFT 28
696-
#define MVFR1_EL1_FPHP_SHIFT 24
697-
#define MVFR1_EL1_SIMDHP_SHIFT 20
698-
#define MVFR1_EL1_SIMDSP_SHIFT 16
699-
#define MVFR1_EL1_SIMDInt_SHIFT 12
700-
#define MVFR1_EL1_SIMDLS_SHIFT 8
701-
#define MVFR1_EL1_FPDNaN_SHIFT 4
702-
#define MVFR1_EL1_FPFtZ_SHIFT 0
703-
704694
#if defined(CONFIG_ARM64_4K_PAGES)
705695
#define ID_AA64MMFR0_EL1_TGRAN_SHIFT ID_AA64MMFR0_EL1_TGRAN4_SHIFT
706696
#define ID_AA64MMFR0_EL1_TGRAN_SUPPORTED_MIN ID_AA64MMFR0_EL1_TGRAN4_SUPPORTED_MIN

arch/arm64/tools/sysreg

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,45 @@ Enum 3:0 SIMDReg
645645
EndEnum
646646
EndSysreg
647647

648+
Sysreg MVFR1_EL1 3 0 0 3 1
649+
Res0 63:32
650+
Enum 31:28 SIMDFMAC
651+
0b0000 NI
652+
0b0001 IMP
653+
EndEnum
654+
Enum 27:24 FPHP
655+
0b0000 NI
656+
0b0001 FPHP
657+
0b0010 FPHP_CONV
658+
0b0011 FP16
659+
EndEnum
660+
Enum 23:20 SIMDHP
661+
0b0000 NI
662+
0b0001 SIMDHP
663+
0b0001 SIMDHP_FLOAT
664+
EndEnum
665+
Enum 19:16 SIMDSP
666+
0b0000 NI
667+
0b0001 IMP
668+
EndEnum
669+
Enum 15:12 SIMDInt
670+
0b0000 NI
671+
0b0001 IMP
672+
EndEnum
673+
Enum 11:8 SIMDLS
674+
0b0000 NI
675+
0b0001 IMP
676+
EndEnum
677+
Enum 7:4 FPDNaN
678+
0b0000 NI
679+
0b0001 IMP
680+
EndEnum
681+
Enum 3:0 FPFtZ
682+
0b0000 NI
683+
0b0001 IMP
684+
EndEnum
685+
EndSysreg
686+
648687
Sysreg ID_PFR2_EL1 3 0 0 3 4
649688
Res0 63:12
650689
Enum 11:8 RAS_frac

0 commit comments

Comments
 (0)