arm64/sysreg: Add missing system register definitions for FGT

Add the definitions of missing system registers that are
trappable by fine grain traps. The definitions are based on
DDI0601 2023-09.

Signed-off-by: Fuad Tabba <tabba@google.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20231214100158.2305400-4-tabba@google.com
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index a8e36640c027ffc000698c95435aac8cec864129..5ceaa1d3630e44cfff8dfd3fa930f8528cca9d87 100644 (file)
--- a/arch/arm64/tools/sysreg
+++ b/arch/arm64/tools/sysreg
@@ -2086,10 +2086,18 @@ Sysreg  CONTEXTIDR_EL1  3       0       13      0       1
 Fields CONTEXTIDR_ELx
 EndSysreg
 
+Sysreg RCWSMASK_EL1    3       0       13      0       3
+Field  63:0    RCWSMASK
+EndSysreg
+
 Sysreg TPIDR_EL1       3       0       13      0       4
 Field  63:0    ThreadID
 EndSysreg
 
+Sysreg RCWMASK_EL1     3       0       13      0       6
+Field  63:0    RCWMASK
+EndSysreg
+
 Sysreg SCXTNUM_EL1     3       0       13      0       7
 Field  63:0    SoftwareContextNumber
 EndSysreg
@@ -2714,6 +2722,33 @@ Field    1       PIE
 Field  0       PnCH
 EndSysreg
 
+SysregFields MAIR2_ELx
+Field  63:56   Attr7
+Field  55:48   Attr6
+Field  47:40   Attr5
+Field  39:32   Attr4
+Field  31:24   Attr3
+Field  23:16   Attr2
+Field  15:8    Attr1
+Field  7:0     Attr0
+EndSysregFields
+
+Sysreg MAIR2_EL1       3       0       10      2       1
+Fields MAIR2_ELx
+EndSysreg
+
+Sysreg MAIR2_EL2       3       4       10      1       1
+Fields MAIR2_ELx
+EndSysreg
+
+Sysreg AMAIR2_EL1      3       0       10      3       1
+Field  63:0    ImpDef
+EndSysreg
+
+Sysreg AMAIR2_EL2      3       4       10      3       1
+Field  63:0    ImpDef
+EndSysreg
+
 SysregFields PIRx_ELx
 Field  63:60   Perm15
 Field  59:56   Perm14
@@ -2765,6 +2800,14 @@ Sysreg   POR_EL12        3       5       10      2       4
 Fields PIRx_ELx
 EndSysreg
 
+Sysreg S2POR_EL1       3       0       10      2       5
+Fields PIRx_ELx
+EndSysreg
+
+Sysreg S2PIR_EL2       3       4       10      2       5
+Fields PIRx_ELx
+EndSysreg
+
 Sysreg LORSA_EL1       3       0       10      4       0
 Res0   63:52
 Field  51:16   SA