Skip to contentSkip to conversation

tools: arm64: Sync sysreg.h with the kernel

PATCH In review Oliver Upton 3 participants 9 messages Oct 5, 2023 – Oct 6, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover tools: arm64: Sync sysreg.h with the kernel

KVM selftests needs to use the full set of sysreg definitions for an upcoming change [1]. We took a stab at copying the entire sysreg generation infrastructure into the tools directory, but that exploded and broke the build for perf, oops [2].

Short of better build infrastructure in tools for handling common prerequisite tasks, this series takes the lazy route and copies the generated output of the sysreg infra from the kernel.

Plan is to apply this series as part of the 'writable' ID register series, replacing the broken change.

[1]: https://lore.kernel.org/kvmarm/[email protected]/
[2]: https://lore.kernel.org/linux-next/[email protected]/

Jing Zhang (1):
tools: arm64: Sync sysreg.h with the kernel source

Oliver Upton (1):
tools: arm64: Add a copy of sysreg-defs.h generated from the kernel

 tools/arch/arm64/include/asm/gpr-num.h        |   26 +
 tools/arch/arm64/include/asm/sysreg-defs.h    | 6806 +++++++++++++++++
 tools/arch/arm64/include/asm/sysreg.h         |  839 +-
 .../selftests/kvm/aarch64/aarch32_id_regs.c   |    4 +-
 .../selftests/kvm/aarch64/debug-exceptions.c  |   12 +-
 .../selftests/kvm/aarch64/page_fault_test.c   |    6 +-
 .../selftests/kvm/lib/aarch64/processor.c     |    6 +-
 7 files changed, 7038 insertions(+), 661 deletions(-)
 create mode 100644 tools/arch/arm64/include/asm/gpr-num.h
 create mode 100644 tools/arch/arm64/include/asm/sysreg-defs.h
Signature · 1 line
2.42.0.609.gbb76f46606-goog
#1 lore raw

PATCH 1/2 tools: arm64: Add a copy of sysreg-defs.h generated from the kernel

Wiring up the build infrastructure necessary to generate the sysreg definitions for dependent targets (e.g. perf, KVM selftests) is a bit of an undertaking with near zero benefit. Just take what the kernel generated instead.

---
 tools/arch/arm64/include/asm/sysreg-defs.h | 6806 ++++++++++++++++++++
 1 file changed, 6806 insertions(+)
 create mode 100644 tools/arch/arm64/include/asm/sysreg-defs.h
tools/arch/arm64/include/asm/sysreg-defs.h new file +6806 -0
new file mode 100644
index 000000000000..570c27fd696f
@@ -0,0 +1,6806 @@
+#ifndef __ASM_SYSREG_DEFS_H
+#define __ASM_SYSREG_DEFS_H
+
+/* Generated file - do not edit */
+
+#define REG_OSDTRRX_EL1                                 S2_0_C0_C0_2
+#define SYS_OSDTRRX_EL1                                 sys_reg(2, 0, 0, 0, 2)
+#define SYS_OSDTRRX_EL1_Op0                             2
+#define SYS_OSDTRRX_EL1_Op1                             0
+#define SYS_OSDTRRX_EL1_CRn                             0
+#define SYS_OSDTRRX_EL1_CRm                             0
+#define SYS_OSDTRRX_EL1_Op2                             2
+
+#define OSDTRRX_EL1_DTRRX                               GENMASK(31, 0)
+#define OSDTRRX_EL1_DTRRX_MASK                          GENMASK(31, 0)
+#define OSDTRRX_EL1_DTRRX_SHIFT                         0
+#define OSDTRRX_EL1_DTRRX_WIDTH                         32
+
+#define OSDTRRX_EL1_RES0                                (UL(0) | GENMASK_ULL(63, 32))
+#define OSDTRRX_EL1_RES1                                (UL(0))
+#define OSDTRRX_EL1_UNKN                                (UL(0))
+
+#define REG_MDCCINT_EL1                                 S2_0_C0_C2_0
+#define SYS_MDCCINT_EL1                                 sys_reg(2, 0, 0, 2, 0)
+#define SYS_MDCCINT_EL1_Op0                             2
+#define SYS_MDCCINT_EL1_Op1                             0
+#define SYS_MDCCINT_EL1_CRn                             0
+#define SYS_MDCCINT_EL1_CRm                             2
+#define SYS_MDCCINT_EL1_Op2                             0
+
+#define MDCCINT_EL1_RX                                  GENMASK(30, 30)
+#define MDCCINT_EL1_RX_MASK                             GENMASK(30, 30)
+#define MDCCINT_EL1_RX_SHIFT                            30
+#define MDCCINT_EL1_RX_WIDTH                            1
+
+#define MDCCINT_EL1_TX                                  GENMASK(29, 29)
+#define MDCCINT_EL1_TX_MASK                             GENMASK(29, 29)
+#define MDCCINT_EL1_TX_SHIFT                            29
+#define MDCCINT_EL1_TX_WIDTH                            1
+
+#define MDCCINT_EL1_RES0                                (UL(0) | GENMASK_ULL(63, 31) | GENMASK_ULL(28, 0))
+#define MDCCINT_EL1_RES1                                (UL(0))
+#define MDCCINT_EL1_UNKN                                (UL(0))
+
+#define REG_MDSCR_EL1                                   S2_0_C0_C2_2
+#define SYS_MDSCR_EL1                                   sys_reg(2, 0, 0, 2, 2)
+#define SYS_MDSCR_EL1_Op0                               2
+#define SYS_MDSCR_EL1_Op1                               0
+#define SYS_MDSCR_EL1_CRn                               0
+#define SYS_MDSCR_EL1_CRm                               2
+#define SYS_MDSCR_EL1_Op2                               2
+
+#define MDSCR_EL1_EHBWE                                 GENMASK(35, 35)
+#define MDSCR_EL1_EHBWE_MASK                            GENMASK(35, 35)
+#define MDSCR_EL1_EHBWE_SHIFT                           35
+#define MDSCR_EL1_EHBWE_WIDTH                           1
+
+#define MDSCR_EL1_EnSPM                                 GENMASK(34, 34)
+#define MDSCR_EL1_EnSPM_MASK                            GENMASK(34, 34)
+#define MDSCR_EL1_EnSPM_SHIFT                           34
+#define MDSCR_EL1_EnSPM_WIDTH                           1
+
+#define MDSCR_EL1_TTA                                   GENMASK(33, 33)
+#define MDSCR_EL1_TTA_MASK                              GENMASK(33, 33)
+#define MDSCR_EL1_TTA_SHIFT                             33
+#define MDSCR_EL1_TTA_WIDTH                             1
+
+#define MDSCR_EL1_EMBWE                                 GENMASK(32, 32)
+#define MDSCR_EL1_EMBWE_MASK                            GENMASK(32, 32)
+#define MDSCR_EL1_EMBWE_SHIFT                           32
+#define MDSCR_EL1_EMBWE_WIDTH                           1
+
+#define MDSCR_EL1_TFO                                   GENMASK(31, 31)
+#define MDSCR_EL1_TFO_MASK                              GENMASK(31, 31)
+#define MDSCR_EL1_TFO_SHIFT                             31
+#define MDSCR_EL1_TFO_WIDTH                             1
+
+#define MDSCR_EL1_RXfull                                GENMASK(30, 30)
+#define MDSCR_EL1_RXfull_MASK                           GENMASK(30, 30)
+#define MDSCR_EL1_RXfull_SHIFT                          30
+#define MDSCR_EL1_RXfull_WIDTH                          1
+
+#define MDSCR_EL1_TXfull                                GENMASK(29, 29)
+#define MDSCR_EL1_TXfull_MASK                           GENMASK(29, 29)
+#define MDSCR_EL1_TXfull_SHIFT                          29
+#define MDSCR_EL1_TXfull_WIDTH                          1
+
+#define MDSCR_EL1_RXO                                   GENMASK(27, 27)
+#define MDSCR_EL1_RXO_MASK                              GENMASK(27, 27)
+#define MDSCR_EL1_RXO_SHIFT                             27
+#define MDSCR_EL1_RXO_WIDTH                             1
+
+#define MDSCR_EL1_TXU                                   GENMASK(26, 26)
+#define MDSCR_EL1_TXU_MASK                              GENMASK(26, 26)
+#define MDSCR_EL1_TXU_SHIFT                             26
+#define MDSCR_EL1_TXU_WIDTH                             1
+
+#define MDSCR_EL1_INTdis                                GENMASK(23, 22)
+#define MDSCR_EL1_INTdis_MASK                           GENMASK(23, 22)
+#define MDSCR_EL1_INTdis_SHIFT                          22
+#define MDSCR_EL1_INTdis_WIDTH                          2
+
+#define MDSCR_EL1_TDA                                   GENMASK(21, 21)
+#define MDSCR_EL1_TDA_MASK                              GENMASK(21, 21)
+#define MDSCR_EL1_TDA_SHIFT                             21
+#define MDSCR_EL1_TDA_WIDTH                             1
+
+#define MDSCR_EL1_SC2                                   GENMASK(19, 19)
+#define MDSCR_EL1_SC2_MASK                              GENMASK(19, 19)
+#define MDSCR_EL1_SC2_SHIFT                             19
+#define MDSCR_EL1_SC2_WIDTH                             1
+
+#define MDSCR_EL1_MDE                                   GENMASK(15, 15)
+#define MDSCR_EL1_MDE_MASK                              GENMASK(15, 15)
+#define MDSCR_EL1_MDE_SHIFT                             15
+#define MDSCR_EL1_MDE_WIDTH                             1
+
+#define MDSCR_EL1_HDE                                   GENMASK(14, 14)
+#define MDSCR_EL1_HDE_MASK                              GENMASK(14, 14)
+#define MDSCR_EL1_HDE_SHIFT                             14
+#define MDSCR_EL1_HDE_WIDTH                             1
+
+#define MDSCR_EL1_KDE                                   GENMASK(13, 13)
+#define MDSCR_EL1_KDE_MASK                              GENMASK(13, 13)
+#define MDSCR_EL1_KDE_SHIFT                             13
+#define MDSCR_EL1_KDE_WIDTH                             1
+
+#define MDSCR_EL1_TDCC                                  GENMASK(12, 12)
+#define MDSCR_EL1_TDCC_MASK                             GENMASK(12, 12)
+#define MDSCR_EL1_TDCC_SHIFT                            12
+#define MDSCR_EL1_TDCC_WIDTH                            1
+
+#define MDSCR_EL1_ERR                                   GENMASK(6, 6)
+#define MDSCR_EL1_ERR_MASK                              GENMASK(6, 6)
+#define MDSCR_EL1_ERR_SHIFT                             6
+#define MDSCR_EL1_ERR_WIDTH                             1
+
+#define MDSCR_EL1_SS                                    GENMASK(0, 0)
+#define MDSCR_EL1_SS_MASK                               GENMASK(0, 0)
+#define MDSCR_EL1_SS_SHIFT                              0
+#define MDSCR_EL1_SS_WIDTH                              1
+
+#define MDSCR_EL1_RES0                                  (UL(0) | GENMASK_ULL(63, 36) | GENMASK_ULL(28, 28) | GENMASK_ULL(25, 24) | GENMASK_ULL(20, 20) | GENMASK_ULL(18, 16) | GENMASK_ULL(11, 7) | GENMASK_ULL(5, 1))
+#define MDSCR_EL1_RES1                                  (UL(0))
+#define MDSCR_EL1_UNKN                                  (UL(0))
+
+#define REG_OSDTRTX_EL1                                 S2_0_C0_C3_2
+#define SYS_OSDTRTX_EL1                                 sys_reg(2, 0, 0, 3, 2)
+#define SYS_OSDTRTX_EL1_Op0                             2
+#define SYS_OSDTRTX_EL1_Op1                             0
+#define SYS_OSDTRTX_EL1_CRn                             0
+#define SYS_OSDTRTX_EL1_CRm                             3
+#define SYS_OSDTRTX_EL1_Op2                             2
+
+#define OSDTRTX_EL1_DTRTX                               GENMASK(31, 0)
+#define OSDTRTX_EL1_DTRTX_MASK                          GENMASK(31, 0)
+#define OSDTRTX_EL1_DTRTX_SHIFT                         0
+#define OSDTRTX_EL1_DTRTX_WIDTH                         32
+
+#define OSDTRTX_EL1_RES0                                (UL(0) | GENMASK_ULL(63, 32))
+#define OSDTRTX_EL1_RES1                                (UL(0))
+#define OSDTRTX_EL1_UNKN                                (UL(0))
+
+#define REG_OSECCR_EL1                                  S2_0_C0_C6_2
+#define SYS_OSECCR_EL1                                  sys_reg(2, 0, 0, 6, 2)
+#define SYS_OSECCR_EL1_Op0                              2
+#define SYS_OSECCR_EL1_Op1                              0
+#define SYS_OSECCR_EL1_CRn                              0
+#define SYS_OSECCR_EL1_CRm                              6
+#define SYS_OSECCR_EL1_Op2                              2
+
+#define OSECCR_EL1_EDECCR                               GENMASK(31, 0)
+#define OSECCR_EL1_EDECCR_MASK                          GENMASK(31, 0)
+#define OSECCR_EL1_EDECCR_SHIFT                         0
+#define OSECCR_EL1_EDECCR_WIDTH                         32
+
+#define OSECCR_EL1_RES0                                 (UL(0) | GENMASK_ULL(63, 32))
+#define OSECCR_EL1_RES1                                 (UL(0))
+#define OSECCR_EL1_UNKN                                 (UL(0))
+
+#define REG_OSLAR_EL1                                   S2_0_C1_C0_4
+#define SYS_OSLAR_EL1                                   sys_reg(2, 0, 1, 0, 4)
+#define SYS_OSLAR_EL1_Op0                               2
+#define SYS_OSLAR_EL1_Op1                               0
+#define SYS_OSLAR_EL1_CRn                               1
+#define SYS_OSLAR_EL1_CRm                               0
+#define SYS_OSLAR_EL1_Op2                               4
+
+#define OSLAR_EL1_OSLK                                  GENMASK(0, 0)
+#define OSLAR_EL1_OSLK_MASK                             GENMASK(0, 0)
+#define OSLAR_EL1_OSLK_SHIFT                            0
+#define OSLAR_EL1_OSLK_WIDTH                            1
+
+#define OSLAR_EL1_RES0                                  (UL(0) | GENMASK_ULL(63, 1))
+#define OSLAR_EL1_RES1                                  (UL(0))
+#define OSLAR_EL1_UNKN                                  (UL(0))
+
+#define REG_ID_PFR0_EL1                                 S3_0_C0_C1_0
+#define SYS_ID_PFR0_EL1                                 sys_reg(3, 0, 0, 1, 0)
+#define SYS_ID_PFR0_EL1_Op0                             3
+#define SYS_ID_PFR0_EL1_Op1                             0
+#define SYS_ID_PFR0_EL1_CRn                             0
+#define SYS_ID_PFR0_EL1_CRm                             1
+#define SYS_ID_PFR0_EL1_Op2                             0
+
+#define ID_PFR0_EL1_RAS                                 GENMASK(31, 28)
+#define ID_PFR0_EL1_RAS_MASK                            GENMASK(31, 28)
+#define ID_PFR0_EL1_RAS_SHIFT                           28
+#define ID_PFR0_EL1_RAS_WIDTH                           4
+#define ID_PFR0_EL1_RAS_SIGNED                          false
+#define ID_PFR0_EL1_RAS_NI                              UL(0b0000)
+#define ID_PFR0_EL1_RAS_RAS                             UL(0b0001)
+#define ID_PFR0_EL1_RAS_RASv1p1                         UL(0b0010)
+
+#define ID_PFR0_EL1_DIT                                 GENMASK(27, 24)
+#define ID_PFR0_EL1_DIT_MASK                            GENMASK(27, 24)
+#define ID_PFR0_EL1_DIT_SHIFT                           24
+#define ID_PFR0_EL1_DIT_WIDTH                           4
+#define ID_PFR0_EL1_DIT_SIGNED                          false
+#define ID_PFR0_EL1_DIT_NI                              UL(0b0000)
+#define ID_PFR0_EL1_DIT_IMP                             UL(0b0001)
+
+#define ID_PFR0_EL1_AMU                                 GENMASK(23, 20)
+#define ID_PFR0_EL1_AMU_MASK                            GENMASK(23, 20)
+#define ID_PFR0_EL1_AMU_SHIFT                           20
+#define ID_PFR0_EL1_AMU_WIDTH                           4
+#define ID_PFR0_EL1_AMU_SIGNED                          false
+#define ID_PFR0_EL1_AMU_NI                              UL(0b0000)
+#define ID_PFR0_EL1_AMU_AMUv1                           UL(0b0001)
+#define ID_PFR0_EL1_AMU_AMUv1p1                         UL(0b0010)
+
+#define ID_PFR0_EL1_CSV2                                GENMASK(19, 16)
+#define ID_PFR0_EL1_CSV2_MASK                           GENMASK(19, 16)
+#define ID_PFR0_EL1_CSV2_SHIFT                          16
+#define ID_PFR0_EL1_CSV2_WIDTH                          4
+#define ID_PFR0_EL1_CSV2_SIGNED                         false
+#define ID_PFR0_EL1_CSV2_UNDISCLOSED                    UL(0b0000)
+#define ID_PFR0_EL1_CSV2_IMP                            UL(0b0001)
+#define ID_PFR0_EL1_CSV2_CSV2p1                         UL(0b0010)
+
+#define ID_PFR0_EL1_State3                              GENMASK(15, 12)
+#define ID_PFR0_EL1_State3_MASK                         GENMASK(15, 12)
+#define ID_PFR0_EL1_State3_SHIFT                        12
+#define ID_PFR0_EL1_State3_WIDTH                        4
+#define ID_PFR0_EL1_State3_SIGNED                       false
+#define ID_PFR0_EL1_State3_NI                           UL(0b0000)
+#define ID_PFR0_EL1_State3_IMP                          UL(0b0001)
+
+#define ID_PFR0_EL1_State2                              GENMASK(11, 8)
+#define ID_PFR0_EL1_State2_MASK                         GENMASK(11, 8)
+#define ID_PFR0_EL1_State2_SHIFT                        8
+#define ID_PFR0_EL1_State2_WIDTH                        4
+#define ID_PFR0_EL1_State2_NI                           UL(0b0000)
+#define ID_PFR0_EL1_State2_NO_CV                        UL(0b0001)
+#define ID_PFR0_EL1_State2_CV                           UL(0b0010)
+
+#define ID_PFR0_EL1_State1                              GENMASK(7, 4)
+#define ID_PFR0_EL1_State1_MASK                         GENMASK(7, 4)
+#define ID_PFR0_EL1_State1_SHIFT                        4
+#define ID_PFR0_EL1_State1_WIDTH                        4
+#define ID_PFR0_EL1_State1_SIGNED                       false
+#define ID_PFR0_EL1_State1_NI                           UL(0b0000)
+#define ID_PFR0_EL1_State1_THUMB                        UL(0b0001)
+#define ID_PFR0_EL1_State1_THUMB2                       UL(0b0010)
+
+#define ID_PFR0_EL1_State0                              GENMASK(3, 0)
+#define ID_PFR0_EL1_State0_MASK                         GENMASK(3, 0)
+#define ID_PFR0_EL1_State0_SHIFT                        0
+#define ID_PFR0_EL1_State0_WIDTH                        4
+#define ID_PFR0_EL1_State0_SIGNED                       false
+#define ID_PFR0_EL1_State0_NI                           UL(0b0000)
+#define ID_PFR0_EL1_State0_IMP                          UL(0b0001)
+
+#define ID_PFR0_EL1_RES0                                (UL(0) | GENMASK_ULL(63, 32))
+#define ID_PFR0_EL1_RES1                                (UL(0))
+#define ID_PFR0_EL1_UNKN                                (UL(0))
+
+#define REG_ID_PFR1_EL1                                 S3_0_C0_C1_1
+#define SYS_ID_PFR1_EL1                                 sys_reg(3, 0, 0, 1, 1)
+#define SYS_ID_PFR1_EL1_Op0                             3
+#define SYS_ID_PFR1_EL1_Op1                             0
+#define SYS_ID_PFR1_EL1_CRn                             0
+#define SYS_ID_PFR1_EL1_CRm                             1
+#define SYS_ID_PFR1_EL1_Op2                             1
+
+#define ID_PFR1_EL1_GIC                                 GENMASK(31, 28)
+#define ID_PFR1_EL1_GIC_MASK                            GENMASK(31, 28)
+#define ID_PFR1_EL1_GIC_SHIFT                           28
+#define ID_PFR1_EL1_GIC_WIDTH                           4
+#define ID_PFR1_EL1_GIC_SIGNED                          false
+#define ID_PFR1_EL1_GIC_NI                              UL(0b0000)
+#define ID_PFR1_EL1_GIC_GICv3                           UL(0b0001)
+#define ID_PFR1_EL1_GIC_GICv4p1                         UL(0b0010)
+
+#define ID_PFR1_EL1_Virt_frac                           GENMASK(27, 24)
+#define ID_PFR1_EL1_Virt_frac_MASK                      GENMASK(27, 24)
+#define ID_PFR1_EL1_Virt_frac_SHIFT                     24
+#define ID_PFR1_EL1_Virt_frac_WIDTH                     4
+#define ID_PFR1_EL1_Virt_frac_SIGNED                    false
+#define ID_PFR1_EL1_Virt_frac_NI                        UL(0b0000)
+#define ID_PFR1_EL1_Virt_frac_IMP                       UL(0b0001)
+
+#define ID_PFR1_EL1_Sec_frac                            GENMASK(23, 20)
+#define ID_PFR1_EL1_Sec_frac_MASK                       GENMASK(23, 20)
+#define ID_PFR1_EL1_Sec_frac_SHIFT                      20
+#define ID_PFR1_EL1_Sec_frac_WIDTH                      4
+#define ID_PFR1_EL1_Sec_frac_NI                         UL(0b0000)
+#define ID_PFR1_EL1_Sec_frac_WALK_DISABLE               UL(0b0001)
+#define ID_PFR1_EL1_Sec_frac_SECURE_MEMORY              UL(0b0010)
+
+#define ID_PFR1_EL1_GenTimer                            GENMASK(19, 16)
+#define ID_PFR1_EL1_GenTimer_MASK                       GENMASK(19, 16)
+#define ID_PFR1_EL1_GenTimer_SHIFT                      16
+#define ID_PFR1_EL1_GenTimer_WIDTH                      4
+#define ID_PFR1_EL1_GenTimer_SIGNED                     false
+#define ID_PFR1_EL1_GenTimer_NI                         UL(0b0000)
+#define ID_PFR1_EL1_GenTimer_IMP                        UL(0b0001)
+#define ID_PFR1_EL1_GenTimer_ECV                        UL(0b0010)
+
+#define ID_PFR1_EL1_Virtualization                      GENMASK(15, 12)
+#define ID_PFR1_EL1_Virtualization_MASK                 GENMASK(15, 12)
+#define ID_PFR1_EL1_Virtualization_SHIFT                12
+#define ID_PFR1_EL1_Virtualization_WIDTH                4
+#define ID_PFR1_EL1_Virtualization_SIGNED               false
+#define ID_PFR1_EL1_Virtualization_NI                   UL(0b0000)
+#define ID_PFR1_EL1_Virtualization_IMP                  UL(0b0001)
+
+#define ID_PFR1_EL1_MProgMod                            GENMASK(11, 8)
+#define ID_PFR1_EL1_MProgMod_MASK                       GENMASK(11, 8)
+#define ID_PFR1_EL1_MProgMod_SHIFT                      8
+#define ID_PFR1_EL1_MProgMod_WIDTH                      4
+#define ID_PFR1_EL1_MProgMod_SIGNED                     false
+#define ID_PFR1_EL1_MProgMod_NI                         UL(0b0000)
+#define ID_PFR1_EL1_MProgMod_IMP                        UL(0b0001)
+
+#define ID_PFR1_EL1_Security                            GENMASK(7, 4)
+#define ID_PFR1_EL1_Security_MASK                       GENMASK(7, 4)
+#define ID_PFR1_EL1_Security_SHIFT                      4
+#define ID_PFR1_EL1_Security_WIDTH                      4
+#define ID_PFR1_EL1_Security_NI                         UL(0b0000)
+#define ID_PFR1_EL1_Security_EL3                        UL(0b0001)
+#define ID_PFR1_EL1_Security_NSACR_RFR                  UL(0b0001)
+
+#define ID_PFR1_EL1_ProgMod                             GENMASK(3, 0)
+#define ID_PFR1_EL1_ProgMod_MASK                        GENMASK(3, 0)
+#define ID_PFR1_EL1_ProgMod_SHIFT                       0
+#define ID_PFR1_EL1_ProgMod_WIDTH                       4
+#define ID_PFR1_EL1_ProgMod_SIGNED                      false
+#define ID_PFR1_EL1_ProgMod_NI                          UL(0b0000)
+#define ID_PFR1_EL1_ProgMod_IMP                         UL(0b0001)
+
+#define ID_PFR1_EL1_RES0                                (UL(0) | GENMASK_ULL(63, 32))
+#define ID_PFR1_EL1_RES1                                (UL(0))
+#define ID_PFR1_EL1_UNKN                                (UL(0))
+
+#define REG_ID_DFR0_EL1                                 S3_0_C0_C1_2
+#define SYS_ID_DFR0_EL1                                 sys_reg(3, 0, 0, 1, 2)
+#define SYS_ID_DFR0_EL1_Op0                             3
+#define SYS_ID_DFR0_EL1_Op1                             0
+#define SYS_ID_DFR0_EL1_CRn                             0
+#define SYS_ID_DFR0_EL1_CRm                             1
+#define SYS_ID_DFR0_EL1_Op2                             2
+
+#define ID_DFR0_EL1_TraceFilt                           GENMASK(31, 28)
+#define ID_DFR0_EL1_TraceFilt_MASK                      GENMASK(31, 28)
+#define ID_DFR0_EL1_TraceFilt_SHIFT                     28
+#define ID_DFR0_EL1_TraceFilt_WIDTH                     4
+#define ID_DFR0_EL1_TraceFilt_SIGNED                    false
+#define ID_DFR0_EL1_TraceFilt_NI                        UL(0b0000)
+#define ID_DFR0_EL1_TraceFilt_IMP                       UL(0b0001)
+
+#define ID_DFR0_EL1_PerfMon                             GENMASK(27, 24)
+#define ID_DFR0_EL1_PerfMon_MASK                        GENMASK(27, 24)
+#define ID_DFR0_EL1_PerfMon_SHIFT                       24
+#define ID_DFR0_EL1_PerfMon_WIDTH                       4
+#define ID_DFR0_EL1_PerfMon_SIGNED                      false
+#define ID_DFR0_EL1_PerfMon_NI                          UL(0b0000)
+#define ID_DFR0_EL1_PerfMon_PMUv1                       UL(0b0001)
+#define ID_DFR0_EL1_PerfMon_PMUv2                       UL(0b0010)
+#define ID_DFR0_EL1_PerfMon_PMUv3                       UL(0b0011)
+#define ID_DFR0_EL1_PerfMon_PMUv3p1                     UL(0b0100)
+#define ID_DFR0_EL1_PerfMon_PMUv3p4                     UL(0b0101)
+#define ID_DFR0_EL1_PerfMon_PMUv3p5                     UL(0b0110)
+#define ID_DFR0_EL1_PerfMon_PMUv3p7                     UL(0b0111)
+#define ID_DFR0_EL1_PerfMon_PMUv3p8                     UL(0b1000)
+#define ID_DFR0_EL1_PerfMon_IMPDEF                      UL(0b1111)
+
+#define ID_DFR0_EL1_MProfDbg                            GENMASK(23, 20)
+#define ID_DFR0_EL1_MProfDbg_MASK                       GENMASK(23, 20)
+#define ID_DFR0_EL1_MProfDbg_SHIFT                      20
+#define ID_DFR0_EL1_MProfDbg_WIDTH                      4
+#define ID_DFR0_EL1_MProfDbg_NI                         UL(0b0000)
+#define ID_DFR0_EL1_MProfDbg_IMP                        UL(0b0001)
+
+#define ID_DFR0_EL1_MMapTrc                             GENMASK(19, 16)
+#define ID_DFR0_EL1_MMapTrc_MASK                        GENMASK(19, 16)
+#define ID_DFR0_EL1_MMapTrc_SHIFT                       16
+#define ID_DFR0_EL1_MMapTrc_WIDTH                       4
+#define ID_DFR0_EL1_MMapTrc_NI                          UL(0b0000)
+#define ID_DFR0_EL1_MMapTrc_IMP                         UL(0b0001)
+
+#define ID_DFR0_EL1_CopTrc                              GENMASK(15, 12)
+#define ID_DFR0_EL1_CopTrc_MASK                         GENMASK(15, 12)
+#define ID_DFR0_EL1_CopTrc_SHIFT                        12
+#define ID_DFR0_EL1_CopTrc_WIDTH                        4
+#define ID_DFR0_EL1_CopTrc_NI                           UL(0b0000)
+#define ID_DFR0_EL1_CopTrc_IMP                          UL(0b0001)
+
+#define ID_DFR0_EL1_MMapDbg                             GENMASK(11, 8)
+#define ID_DFR0_EL1_MMapDbg_MASK                        GENMASK(11, 8)
+#define ID_DFR0_EL1_MMapDbg_SHIFT                       8
+#define ID_DFR0_EL1_MMapDbg_WIDTH                       4
+#define ID_DFR0_EL1_MMapDbg_NI                          UL(0b0000)
+#define ID_DFR0_EL1_MMapDbg_Armv7                       UL(0b0100)
+#define ID_DFR0_EL1_MMapDbg_Armv7p1                     UL(0b0101)
+
+#define ID_DFR0_EL1_CopSDbg                             GENMASK(7, 4)
+#define ID_DFR0_EL1_CopSDbg_MASK                        GENMASK(7, 4)
+#define ID_DFR0_EL1_CopSDbg_SHIFT                       4
+#define ID_DFR0_EL1_CopSDbg_WIDTH                       4
+
+#define ID_DFR0_EL1_CopDbg                              GENMASK(3, 0)
+#define ID_DFR0_EL1_CopDbg_MASK                         GENMASK(3, 0)
+#define ID_DFR0_EL1_CopDbg_SHIFT                        0
+#define ID_DFR0_EL1_CopDbg_WIDTH                        4
+#define ID_DFR0_EL1_CopDbg_NI                           UL(0b0000)
+#define ID_DFR0_EL1_CopDbg_Armv6                        UL(0b0010)
+#define ID_DFR0_EL1_CopDbg_Armv6p1                      UL(0b0011)
+#define ID_DFR0_EL1_CopDbg_Armv7                        UL(0b0100)
+#define ID_DFR0_EL1_CopDbg_Armv7p1                      UL(0b0101)
+#define ID_DFR0_EL1_CopDbg_Armv8                        UL(0b0110)
+#define ID_DFR0_EL1_CopDbg_VHE                          UL(0b0111)
+#define ID_DFR0_EL1_CopDbg_Debugv8p2                    UL(0b1000)
+#define ID_DFR0_EL1_CopDbg_Debugv8p4                    UL(0b1001)
+#define ID_DFR0_EL1_CopDbg_Debugv8p8                    UL(0b1010)
+
+#define ID_DFR0_EL1_RES0                                (UL(0) | GENMASK_ULL(63, 32))
+#define ID_DFR0_EL1_RES1                                (UL(0))
+#define ID_DFR0_EL1_UNKN                                (UL(0))
+
+#define REG_ID_AFR0_EL1                                 S3_0_C0_C1_3
+#define SYS_ID_AFR0_EL1                                 sys_reg(3, 0, 0, 1, 3)
+#define SYS_ID_AFR0_EL1_Op0                             3
+#define SYS_ID_AFR0_EL1_Op1                             0
+#define SYS_ID_AFR0_EL1_CRn                             0
+#define SYS_ID_AFR0_EL1_CRm                             1
+#define SYS_ID_AFR0_EL1_Op2                             3
+
+#define ID_AFR0_EL1_IMPDEF3                             GENMASK(15, 12)
+#define ID_AFR0_EL1_IMPDEF3_MASK                        GENMASK(15, 12)
+#define ID_AFR0_EL1_IMPDEF3_SHIFT                       12
+#define ID_AFR0_EL1_IMPDEF3_WIDTH                       4
+
+#define ID_AFR0_EL1_IMPDEF2                             GENMASK(11, 8)
+#define ID_AFR0_EL1_IMPDEF2_MASK                        GENMASK(11, 8)
+#define ID_AFR0_EL1_IMPDEF2_SHIFT                       8
+#define ID_AFR0_EL1_IMPDEF2_WIDTH                       4
+
+#define ID_AFR0_EL1_IMPDEF1                             GENMASK(7, 4)
+#define ID_AFR0_EL1_IMPDEF1_MASK                        GENMASK(7, 4)
+#define ID_AFR0_EL1_IMPDEF1_SHIFT                       4
+#define ID_AFR0_EL1_IMPDEF1_WIDTH                       4
+
+#define ID_AFR0_EL1_IMPDEF0                             GENMASK(3, 0)
+#define ID_AFR0_EL1_IMPDEF0_MASK                        GENMASK(3, 0)
+#define ID_AFR0_EL1_IMPDEF0_SHIFT                       0
+#define ID_AFR0_EL1_IMPDEF0_WIDTH                       4
+
+#define ID_AFR0_EL1_RES0                                (UL(0) | GENMASK_ULL(63, 16))
+#define ID_AFR0_EL1_RES1                                (UL(0))
+#define ID_AFR0_EL1_UNKN                                (UL(0))
+
+#define REG_ID_MMFR0_EL1                                S3_0_C0_C1_4
+#define SYS_ID_MMFR0_EL1                                sys_reg(3, 0, 0, 1, 4)
+#define SYS_ID_MMFR0_EL1_Op0                            3
+#define SYS_ID_MMFR0_EL1_Op1                            0
+#define SYS_ID_MMFR0_EL1_CRn                            0
+#define SYS_ID_MMFR0_EL1_CRm                            1
+#define SYS_ID_MMFR0_EL1_Op2                            4
+
+#define ID_MMFR0_EL1_InnerShr                           GENMASK(31, 28)
+#define ID_MMFR0_EL1_InnerShr_MASK                      GENMASK(31, 28)
+#define ID_MMFR0_EL1_InnerShr_SHIFT                     28
+#define ID_MMFR0_EL1_InnerShr_WIDTH                     4
+#define ID_MMFR0_EL1_InnerShr_NC                        UL(0b0000)
+#define ID_MMFR0_EL1_InnerShr_HW                        UL(0b0001)
+#define ID_MMFR0_EL1_InnerShr_IGNORED                   UL(0b1111)
+
+#define ID_MMFR0_EL1_FCSE                               GENMASK(27, 24)
+#define ID_MMFR0_EL1_FCSE_MASK                          GENMASK(27, 24)
+#define ID_MMFR0_EL1_FCSE_SHIFT                         24
+#define ID_MMFR0_EL1_FCSE_WIDTH                         4
+#define ID_MMFR0_EL1_FCSE_SIGNED                        false
+#define ID_MMFR0_EL1_FCSE_NI                            UL(0b0000)
+#define ID_MMFR0_EL1_FCSE_IMP                           UL(0b0001)
+
+#define ID_MMFR0_EL1_AuxReg                             GENMASK(23, 20)
+#define ID_MMFR0_EL1_AuxReg_MASK                        GENMASK(23, 20)
+#define ID_MMFR0_EL1_AuxReg_SHIFT                       20
+#define ID_MMFR0_EL1_AuxReg_WIDTH                       4
+#define ID_MMFR0_EL1_AuxReg_NI                          UL(0b0000)
+#define ID_MMFR0_EL1_AuxReg_ACTLR                       UL(0b0001)
+#define ID_MMFR0_EL1_AuxReg_AIFSR                       UL(0b0010)
+
+#define ID_MMFR0_EL1_TCM                                GENMASK(19, 16)
+#define ID_MMFR0_EL1_TCM_MASK                           GENMASK(19, 16)
+#define ID_MMFR0_EL1_TCM_SHIFT                          16
+#define ID_MMFR0_EL1_TCM_WIDTH                          4
+#define ID_MMFR0_EL1_TCM_NI                             UL(0b0000)
+#define ID_MMFR0_EL1_TCM_IMPDEF                         UL(0b0001)
+#define ID_MMFR0_EL1_TCM_TCM                            UL(0b0010)
+#define ID_MMFR0_EL1_TCM_TCM_DMA                        UL(0b0011)
+
+#define ID_MMFR0_EL1_ShareLvl                           GENMASK(15, 12)
+#define ID_MMFR0_EL1_ShareLvl_MASK                      GENMASK(15, 12)
+#define ID_MMFR0_EL1_ShareLvl_SHIFT                     12
+#define ID_MMFR0_EL1_ShareLvl_WIDTH                     4
+#define ID_MMFR0_EL1_ShareLvl_ONE                       UL(0b0000)
+#define ID_MMFR0_EL1_ShareLvl_TWO                       UL(0b0001)
+
+#define ID_MMFR0_EL1_OuterShr                           GENMASK(11, 8)
+#define ID_MMFR0_EL1_OuterShr_MASK                      GENMASK(11, 8)
+#define ID_MMFR0_EL1_OuterShr_SHIFT                     8
+#define ID_MMFR0_EL1_OuterShr_WIDTH                     4
+#define ID_MMFR0_EL1_OuterShr_NC                        UL(0b0000)
+#define ID_MMFR0_EL1_OuterShr_HW                        UL(0b0001)
+#define ID_MMFR0_EL1_OuterShr_IGNORED                   UL(0b1111)
+
+#define ID_MMFR0_EL1_PMSA                               GENMASK(7, 4)
+#define ID_MMFR0_EL1_PMSA_MASK                          GENMASK(7, 4)
+#define ID_MMFR0_EL1_PMSA_SHIFT                         4
+#define ID_MMFR0_EL1_PMSA_WIDTH                         4
+#define ID_MMFR0_EL1_PMSA_NI                            UL(0b0000)
+#define ID_MMFR0_EL1_PMSA_IMPDEF                        UL(0b0001)
+#define ID_MMFR0_EL1_PMSA_PMSAv6                        UL(0b0010)
+#define ID_MMFR0_EL1_PMSA_PMSAv7                        UL(0b0011)
+
+#define ID_MMFR0_EL1_VMSA                               GENMASK(3, 0)
+#define ID_MMFR0_EL1_VMSA_MASK                          GENMASK(3, 0)
+#define ID_MMFR0_EL1_VMSA_SHIFT                         0
+#define ID_MMFR0_EL1_VMSA_WIDTH                         4
+#define ID_MMFR0_EL1_VMSA_NI                            UL(0b0000)
+#define ID_MMFR0_EL1_VMSA_IMPDEF                        UL(0b0001)
+#define ID_MMFR0_EL1_VMSA_VMSAv6                        UL(0b0010)
+#define ID_MMFR0_EL1_VMSA_VMSAv7                        UL(0b0011)
+#define ID_MMFR0_EL1_VMSA_VMSAv7_PXN                    UL(0b0100)
+#define ID_MMFR0_EL1_VMSA_VMSAv7_LONG                   UL(0b0101)
+
+#define ID_MMFR0_EL1_RES0                               (UL(0) | GENMASK_ULL(63, 32))
+#define ID_MMFR0_EL1_RES1                               (UL(0))
+#define ID_MMFR0_EL1_UNKN                               (UL(0))
+
+#define REG_ID_MMFR1_EL1                                S3_0_C0_C1_5
+#define SYS_ID_MMFR1_EL1                                sys_reg(3, 0, 0, 1, 5)
+#define SYS_ID_MMFR1_EL1_Op0                            3
+#define SYS_ID_MMFR1_EL1_Op1                            0
+#define SYS_ID_MMFR1_EL1_CRn                            0
+#define SYS_ID_MMFR1_EL1_CRm                            1
+#define SYS_ID_MMFR1_EL1_Op2                            5
+
+#define ID_MMFR1_EL1_BPred                              GENMASK(31, 28)
+#define ID_MMFR1_EL1_BPred_MASK                         GENMASK(31, 28)
+#define ID_MMFR1_EL1_BPred_SHIFT                        28
+#define ID_MMFR1_EL1_BPred_WIDTH                        4
+#define ID_MMFR1_EL1_BPred_NI                           UL(0b0000)
+#define ID_MMFR1_EL1_BPred_BP_SW_MANGED                 UL(0b0001)
+#define ID_MMFR1_EL1_BPred_BP_ASID_AWARE                UL(0b0010)
+#define ID_MMFR1_EL1_BPred_BP_NOSNOOP                   UL(0b0011)
+#define ID_MMFR1_EL1_BPred_BP_INVISIBLE                 UL(0b0100)
+
+#define ID_MMFR1_EL1_L1TstCln                           GENMASK(27, 24)
+#define ID_MMFR1_EL1_L1TstCln_MASK                      GENMASK(27, 24)
+#define ID_MMFR1_EL1_L1TstCln_SHIFT                     24
+#define ID_MMFR1_EL1_L1TstCln_WIDTH                     4
+#define ID_MMFR1_EL1_L1TstCln_NI                        UL(0b0000)
+#define ID_MMFR1_EL1_L1TstCln_NOINVALIDATE              UL(0b0001)
+#define ID_MMFR1_EL1_L1TstCln_INVALIDATE                UL(0b0010)
+
+#define ID_MMFR1_EL1_L1Uni                              GENMASK(23, 20)
+#define ID_MMFR1_EL1_L1Uni_MASK                         GENMASK(23, 20)
+#define ID_MMFR1_EL1_L1Uni_SHIFT                        20
+#define ID_MMFR1_EL1_L1Uni_WIDTH                        4
+#define ID_MMFR1_EL1_L1Uni_NI                           UL(0b0000)
+#define ID_MMFR1_EL1_L1Uni_INVALIDATE                   UL(0b0001)
+#define ID_MMFR1_EL1_L1Uni_CLEAN_AND_INVALIDATE         UL(0b0010)
+
+#define ID_MMFR1_EL1_L1Hvd                              GENMASK(19, 16)
+#define ID_MMFR1_EL1_L1Hvd_MASK                         GENMASK(19, 16)
+#define ID_MMFR1_EL1_L1Hvd_SHIFT                        16
+#define ID_MMFR1_EL1_L1Hvd_WIDTH                        4
+#define ID_MMFR1_EL1_L1Hvd_NI                           UL(0b0000)
+#define ID_MMFR1_EL1_L1Hvd_INVALIDATE_ISIDE_ONLY        UL(0b0001)
+#define ID_MMFR1_EL1_L1Hvd_INVALIDATE                   UL(0b0010)
+#define ID_MMFR1_EL1_L1Hvd_CLEAN_AND_INVALIDATE         UL(0b0011)
+
+#define ID_MMFR1_EL1_L1UniSW                            GENMASK(15, 12)
+#define ID_MMFR1_EL1_L1UniSW_MASK                       GENMASK(15, 12)
+#define ID_MMFR1_EL1_L1UniSW_SHIFT                      12
+#define ID_MMFR1_EL1_L1UniSW_WIDTH                      4
+#define ID_MMFR1_EL1_L1UniSW_NI                         UL(0b0000)
+#define ID_MMFR1_EL1_L1UniSW_CLEAN                      UL(0b0001)
+#define ID_MMFR1_EL1_L1UniSW_CLEAN_AND_INVALIDATE       UL(0b0010)
+#define ID_MMFR1_EL1_L1UniSW_INVALIDATE                 UL(0b0011)
+
+#define ID_MMFR1_EL1_L1HvdSW                            GENMASK(11, 8)
+#define ID_MMFR1_EL1_L1HvdSW_MASK                       GENMASK(11, 8)
+#define ID_MMFR1_EL1_L1HvdSW_SHIFT                      8
+#define ID_MMFR1_EL1_L1HvdSW_WIDTH                      4
+#define ID_MMFR1_EL1_L1HvdSW_NI                         UL(0b0000)
+#define ID_MMFR1_EL1_L1HvdSW_CLEAN_AND_INVALIDATE       UL(0b0001)
+#define ID_MMFR1_EL1_L1HvdSW_INVALIDATE_DSIDE_ONLY      UL(0b0010)
+#define ID_MMFR1_EL1_L1HvdSW_INVALIDATE                 UL(0b0011)
+
+#define ID_MMFR1_EL1_L1UniVA                            GENMASK(7, 4)
+#define ID_MMFR1_EL1_L1UniVA_MASK                       GENMASK(7, 4)
+#define ID_MMFR1_EL1_L1UniVA_SHIFT                      4
+#define ID_MMFR1_EL1_L1UniVA_WIDTH                      4
+#define ID_MMFR1_EL1_L1UniVA_NI                         UL(0b0000)
+#define ID_MMFR1_EL1_L1UniVA_CLEAN_AND_INVALIDATE       UL(0b0001)
+#define ID_MMFR1_EL1_L1UniVA_INVALIDATE_BP              UL(0b0010)
+
+#define ID_MMFR1_EL1_L1HvdVA                            GENMASK(3, 0)
+#define ID_MMFR1_EL1_L1HvdVA_MASK                       GENMASK(3, 0)
+#define ID_MMFR1_EL1_L1HvdVA_SHIFT                      0
+#define ID_MMFR1_EL1_L1HvdVA_WIDTH                      4
+#define ID_MMFR1_EL1_L1HvdVA_NI                         UL(0b0000)
+#define ID_MMFR1_EL1_L1HvdVA_CLEAN_AND_INVALIDATE       UL(0b0001)
+#define ID_MMFR1_EL1_L1HvdVA_INVALIDATE_BP              UL(0b0010)
+
+#define ID_MMFR1_EL1_RES0                               (UL(0) | GENMASK_ULL(63, 32))
+#define ID_MMFR1_EL1_RES1                               (UL(0))
+#define ID_MMFR1_EL1_UNKN                               (UL(0))
+
+#define REG_ID_MMFR2_EL1                                S3_0_C0_C1_6
+#define SYS_ID_MMFR2_EL1                                sys_reg(3, 0, 0, 1, 6)
+#define SYS_ID_MMFR2_EL1_Op0                            3
+#define SYS_ID_MMFR2_EL1_Op1                            0
+#define SYS_ID_MMFR2_EL1_CRn                            0
+#define SYS_ID_MMFR2_EL1_CRm                            1
+#define SYS_ID_MMFR2_EL1_Op2                            6
+
+#define ID_MMFR2_EL1_HWAccFlg                           GENMASK(31, 28)
+#define ID_MMFR2_EL1_HWAccFlg_MASK                      GENMASK(31, 28)
+#define ID_MMFR2_EL1_HWAccFlg_SHIFT                     28
+#define ID_MMFR2_EL1_HWAccFlg_WIDTH                     4
+#define ID_MMFR2_EL1_HWAccFlg_NI                        UL(0b0000)
+#define ID_MMFR2_EL1_HWAccFlg_IMP                       UL(0b0001)
+
+#define ID_MMFR2_EL1_WFIStall                           GENMASK(27, 24)
+#define ID_MMFR2_EL1_WFIStall_MASK                      GENMASK(27, 24)
+#define ID_MMFR2_EL1_WFIStall_SHIFT                     24
+#define ID_MMFR2_EL1_WFIStall_WIDTH                     4
+#define ID_MMFR2_EL1_WFIStall_NI                        UL(0b0000)
+#define ID_MMFR2_EL1_WFIStall_IMP                       UL(0b0001)
+
+#define ID_MMFR2_EL1_MemBarr                            GENMASK(23, 20)
+#define ID_MMFR2_EL1_MemBarr_MASK                       GENMASK(23, 20)
+#define ID_MMFR2_EL1_MemBarr_SHIFT                      20
+#define ID_MMFR2_EL1_MemBarr_WIDTH                      4
+#define ID_MMFR2_EL1_MemBarr_NI                         UL(0b0000)
+#define ID_MMFR2_EL1_MemBarr_DSB_ONLY                   UL(0b0001)
+#define ID_MMFR2_EL1_MemBarr_IMP                        UL(0b0010)
+
+#define ID_MMFR2_EL1_UniTLB                             GENMASK(19, 16)
+#define ID_MMFR2_EL1_UniTLB_MASK                        GENMASK(19, 16)
+#define ID_MMFR2_EL1_UniTLB_SHIFT                       16
+#define ID_MMFR2_EL1_UniTLB_WIDTH                       4
+#define ID_MMFR2_EL1_UniTLB_NI                          UL(0b0000)
+#define ID_MMFR2_EL1_UniTLB_BY_VA                       UL(0b0001)
+#define ID_MMFR2_EL1_UniTLB_BY_MATCH_ASID               UL(0b0010)
+#define ID_MMFR2_EL1_UniTLB_BY_ALL_ASID                 UL(0b0011)
+#define ID_MMFR2_EL1_UniTLB_OTHER_TLBS                  UL(0b0100)
+#define ID_MMFR2_EL1_UniTLB_BROADCAST                   UL(0b0101)
+#define ID_MMFR2_EL1_UniTLB_BY_IPA                      UL(0b0110)
+
+#define ID_MMFR2_EL1_HvdTLB                             GENMASK(15, 12)
+#define ID_MMFR2_EL1_HvdTLB_MASK                        GENMASK(15, 12)
+#define ID_MMFR2_EL1_HvdTLB_SHIFT                       12
+#define ID_MMFR2_EL1_HvdTLB_WIDTH                       4
+#define ID_MMFR2_EL1_HvdTLB_NI                          UL(0b0000)
+
+#define ID_MMFR2_EL1_L1HvdRng                           GENMASK(11, 8)
+#define ID_MMFR2_EL1_L1HvdRng_MASK                      GENMASK(11, 8)
+#define ID_MMFR2_EL1_L1HvdRng_SHIFT                     8
+#define ID_MMFR2_EL1_L1HvdRng_WIDTH                     4
+#define ID_MMFR2_EL1_L1HvdRng_NI                        UL(0b0000)
+#define ID_MMFR2_EL1_L1HvdRng_IMP                       UL(0b0001)
+
+#define ID_MMFR2_EL1_L1HvdBG                            GENMASK(7, 4)
+#define ID_MMFR2_EL1_L1HvdBG_MASK                       GENMASK(7, 4)
+#define ID_MMFR2_EL1_L1HvdBG_SHIFT                      4
+#define ID_MMFR2_EL1_L1HvdBG_WIDTH                      4
+#define ID_MMFR2_EL1_L1HvdBG_NI                         UL(0b0000)
+#define ID_MMFR2_EL1_L1HvdBG_IMP                        UL(0b0001)
+
+#define ID_MMFR2_EL1_L1HvdFG                            GENMASK(3, 0)
+#define ID_MMFR2_EL1_L1HvdFG_MASK                       GENMASK(3, 0)
+#define ID_MMFR2_EL1_L1HvdFG_SHIFT                      0
+#define ID_MMFR2_EL1_L1HvdFG_WIDTH                      4
+#define ID_MMFR2_EL1_L1HvdFG_NI                         UL(0b0000)
+#define ID_MMFR2_EL1_L1HvdFG_IMP                        UL(0b0001)
+
+#define ID_MMFR2_EL1_RES0                               (UL(0) | GENMASK_ULL(63, 32))
+#define ID_MMFR2_EL1_RES1                               (UL(0))
+#define ID_MMFR2_EL1_UNKN                               (UL(0))
+
+#define REG_ID_MMFR3_EL1                                S3_0_C0_C1_7
+#define SYS_ID_MMFR3_EL1                                sys_reg(3, 0, 0, 1, 7)
+#define SYS_ID_MMFR3_EL1_Op0                            3
+#define SYS_ID_MMFR3_EL1_Op1                            0
+#define SYS_ID_MMFR3_EL1_CRn                            0
+#define SYS_ID_MMFR3_EL1_CRm                            1
+#define SYS_ID_MMFR3_EL1_Op2                            7
+
+#define ID_MMFR3_EL1_Supersec                           GENMASK(31, 28)
+#define ID_MMFR3_EL1_Supersec_MASK                      GENMASK(31, 28)
+#define ID_MMFR3_EL1_Supersec_SHIFT                     28
+#define ID_MMFR3_EL1_Supersec_WIDTH                     4
+#define ID_MMFR3_EL1_Supersec_IMP                       UL(0b0000)
+#define ID_MMFR3_EL1_Supersec_NI                        UL(0b1111)
+
+#define ID_MMFR3_EL1_CMemSz                             GENMASK(27, 24)
+#define ID_MMFR3_EL1_CMemSz_MASK                        GENMASK(27, 24)
+#define ID_MMFR3_EL1_CMemSz_SHIFT                       24
+#define ID_MMFR3_EL1_CMemSz_WIDTH                       4
+#define ID_MMFR3_EL1_CMemSz_4GB                         UL(0b0000)
+#define ID_MMFR3_EL1_CMemSz_64GB                        UL(0b0001)
+#define ID_MMFR3_EL1_CMemSz_1TB                         UL(0b0010)
+
+#define ID_MMFR3_EL1_CohWalk                            GENMASK(23, 20)
+#define ID_MMFR3_EL1_CohWalk_MASK                       GENMASK(23, 20)
+#define ID_MMFR3_EL1_CohWalk_SHIFT                      20
+#define ID_MMFR3_EL1_CohWalk_WIDTH                      4
+#define ID_MMFR3_EL1_CohWalk_NI                         UL(0b0000)
+#define ID_MMFR3_EL1_CohWalk_IMP                        UL(0b0001)
+
+#define ID_MMFR3_EL1_PAN                                GENMASK(19, 16)
+#define ID_MMFR3_EL1_PAN_MASK                           GENMASK(19, 16)
+#define ID_MMFR3_EL1_PAN_SHIFT                          16
+#define ID_MMFR3_EL1_PAN_WIDTH                          4
+#define ID_MMFR3_EL1_PAN_NI                             UL(0b0000)
+#define ID_MMFR3_EL1_PAN_PAN                            UL(0b0001)
+#define ID_MMFR3_EL1_PAN_PAN2                           UL(0b0010)
+
+#define ID_MMFR3_EL1_MaintBcst                          GENMASK(15, 12)
+#define ID_MMFR3_EL1_MaintBcst_MASK                     GENMASK(15, 12)
+#define ID_MMFR3_EL1_MaintBcst_SHIFT                    12
+#define ID_MMFR3_EL1_MaintBcst_WIDTH                    4
+#define ID_MMFR3_EL1_MaintBcst_NI                       UL(0b0000)
+#define ID_MMFR3_EL1_MaintBcst_NO_TLB                   UL(0b0001)
+#define ID_MMFR3_EL1_MaintBcst_ALL                      UL(0b0010)
+
+#define ID_MMFR3_EL1_BPMaint                            GENMASK(11, 8)
+#define ID_MMFR3_EL1_BPMaint_MASK                       GENMASK(11, 8)
+#define ID_MMFR3_EL1_BPMaint_SHIFT                      8
+#define ID_MMFR3_EL1_BPMaint_WIDTH                      4
+#define ID_MMFR3_EL1_BPMaint_NI                         UL(0b0000)
+#define ID_MMFR3_EL1_BPMaint_ALL                        UL(0b0001)
+#define ID_MMFR3_EL1_BPMaint_BY_VA                      UL(0b0010)
+
+#define ID_MMFR3_EL1_CMaintSW                           GENMASK(7, 4)
+#define ID_MMFR3_EL1_CMaintSW_MASK                      GENMASK(7, 4)
+#define ID_MMFR3_EL1_CMaintSW_SHIFT                     4
+#define ID_MMFR3_EL1_CMaintSW_WIDTH                     4
+#define ID_MMFR3_EL1_CMaintSW_NI                        UL(0b0000)
+#define ID_MMFR3_EL1_CMaintSW_IMP                       UL(0b0001)
+
+#define ID_MMFR3_EL1_CMaintVA                           GENMASK(3, 0)
+#define ID_MMFR3_EL1_CMaintVA_MASK                      GENMASK(3, 0)
+#define ID_MMFR3_EL1_CMaintVA_SHIFT                     0
+#define ID_MMFR3_EL1_CMaintVA_WIDTH                     4
+#define ID_MMFR3_EL1_CMaintVA_NI                        UL(0b0000)
+#define ID_MMFR3_EL1_CMaintVA_IMP                       UL(0b0001)
+
+#define ID_MMFR3_EL1_RES0                               (UL(0) | GENMASK_ULL(63, 32))
+#define ID_MMFR3_EL1_RES1                               (UL(0))
+#define ID_MMFR3_EL1_UNKN                               (UL(0))
+
+#define REG_ID_ISAR0_EL1                                S3_0_C0_C2_0
+#define SYS_ID_ISAR0_EL1                                sys_reg(3, 0, 0, 2, 0)
+#define SYS_ID_ISAR0_EL1_Op0                            3
+#define SYS_ID_ISAR0_EL1_Op1                            0
+#define SYS_ID_ISAR0_EL1_CRn                            0
+#define SYS_ID_ISAR0_EL1_CRm                            2
+#define SYS_ID_ISAR0_EL1_Op2                            0
+
+#define ID_ISAR0_EL1_Divide                             GENMASK(27, 24)
+#define ID_ISAR0_EL1_Divide_MASK                        GENMASK(27, 24)
+#define ID_ISAR0_EL1_Divide_SHIFT                       24
+#define ID_ISAR0_EL1_Divide_WIDTH                       4
+#define ID_ISAR0_EL1_Divide_NI                          UL(0b0000)
+#define ID_ISAR0_EL1_Divide_xDIV_T32                    UL(0b0001)
+#define ID_ISAR0_EL1_Divide_xDIV_A32                    UL(0b0010)
+
+#define ID_ISAR0_EL1_Debug                              GENMASK(23, 20)
+#define ID_ISAR0_EL1_Debug_MASK                         GENMASK(23, 20)
+#define ID_ISAR0_EL1_Debug_SHIFT                        20
+#define ID_ISAR0_EL1_Debug_WIDTH                        4
+#define ID_ISAR0_EL1_Debug_SIGNED                       false
+#define ID_ISAR0_EL1_Debug_NI                           UL(0b0000)
+#define ID_ISAR0_EL1_Debug_IMP                          UL(0b0001)
+
+#define ID_ISAR0_EL1_Coproc                             GENMASK(19, 16)
+#define ID_ISAR0_EL1_Coproc_MASK                        GENMASK(19, 16)
+#define ID_ISAR0_EL1_Coproc_SHIFT                       16
+#define ID_ISAR0_EL1_Coproc_WIDTH                       4
+#define ID_ISAR0_EL1_Coproc_NI                          UL(0b0000)
+#define ID_ISAR0_EL1_Coproc_MRC                         UL(0b0001)
+#define ID_ISAR0_EL1_Coproc_MRC2                        UL(0b0010)
+#define ID_ISAR0_EL1_Coproc_MRRC                        UL(0b0011)
+#define ID_ISAR0_EL1_Coproc_MRRC2                       UL(0b0100)
+
+#define ID_ISAR0_EL1_CmpBranch                          GENMASK(15, 12)
+#define ID_ISAR0_EL1_CmpBranch_MASK                     GENMASK(15, 12)
+#define ID_ISAR0_EL1_CmpBranch_SHIFT                    12
+#define ID_ISAR0_EL1_CmpBranch_WIDTH                    4
+#define ID_ISAR0_EL1_CmpBranch_SIGNED                   false
+#define ID_ISAR0_EL1_CmpBranch_NI                       UL(0b0000)
+#define ID_ISAR0_EL1_CmpBranch_IMP                      UL(0b0001)
+
+#define ID_ISAR0_EL1_BitField                           GENMASK(11, 8)
+#define ID_ISAR0_EL1_BitField_MASK                      GENMASK(11, 8)
+#define ID_ISAR0_EL1_BitField_SHIFT                     8
+#define ID_ISAR0_EL1_BitField_WIDTH                     4
+#define ID_ISAR0_EL1_BitField_SIGNED                    false
+#define ID_ISAR0_EL1_BitField_NI                        UL(0b0000)
+#define ID_ISAR0_EL1_BitField_IMP                       UL(0b0001)
+
+#define ID_ISAR0_EL1_BitCount                           GENMASK(7, 4)
+#define ID_ISAR0_EL1_BitCount_MASK                      GENMASK(7, 4)
+#define ID_ISAR0_EL1_BitCount_SHIFT                     4
+#define ID_ISAR0_EL1_BitCount_WIDTH                     4
+#define ID_ISAR0_EL1_BitCount_SIGNED                    false
+#define ID_ISAR0_EL1_BitCount_NI                        UL(0b0000)
+#define ID_ISAR0_EL1_BitCount_IMP                       UL(0b0001)
+
+#define ID_ISAR0_EL1_Swap                               GENMASK(3, 0)
+#define ID_ISAR0_EL1_Swap_MASK                          GENMASK(3, 0)
+#define ID_ISAR0_EL1_Swap_SHIFT                         0
+#define ID_ISAR0_EL1_Swap_WIDTH                         4
+#define ID_ISAR0_EL1_Swap_SIGNED                        false
+#define ID_ISAR0_EL1_Swap_NI                            UL(0b0000)
+#define ID_ISAR0_EL1_Swap_IMP                           UL(0b0001)
+
+#define ID_ISAR0_EL1_RES0                               (UL(0) | GENMASK_ULL(63, 28))
+#define ID_ISAR0_EL1_RES1                               (UL(0))
+#define ID_ISAR0_EL1_UNKN                               (UL(0))
+
+#define REG_ID_ISAR1_EL1                                S3_0_C0_C2_1
+#define SYS_ID_ISAR1_EL1                                sys_reg(3, 0, 0, 2, 1)
+#define SYS_ID_ISAR1_EL1_Op0                            3
+#define SYS_ID_ISAR1_EL1_Op1                            0
+#define SYS_ID_ISAR1_EL1_CRn                            0
+#define SYS_ID_ISAR1_EL1_CRm                            2
+#define SYS_ID_ISAR1_EL1_Op2                            1
+
+#define ID_ISAR1_EL1_Jazelle                            GENMASK(31, 28)
+#define ID_ISAR1_EL1_Jazelle_MASK                       GENMASK(31, 28)
+#define ID_ISAR1_EL1_Jazelle_SHIFT                      28
+#define ID_ISAR1_EL1_Jazelle_WIDTH                      4
+#define ID_ISAR1_EL1_Jazelle_NI                         UL(0b0000)
+#define ID_ISAR1_EL1_Jazelle_IMP                        UL(0b0001)
+
+#define ID_ISAR1_EL1_Interwork                          GENMASK(27, 24)
+#define ID_ISAR1_EL1_Interwork_MASK                     GENMASK(27, 24)
+#define ID_ISAR1_EL1_Interwork_SHIFT                    24
+#define ID_ISAR1_EL1_Interwork_WIDTH                    4
+#define ID_ISAR1_EL1_Interwork_NI                       UL(0b0000)
+#define ID_ISAR1_EL1_Interwork_BX                       UL(0b0001)
+#define ID_ISAR1_EL1_Interwork_BLX                      UL(0b0010)
+#define ID_ISAR1_EL1_Interwork_A32_BX                   UL(0b0011)
+
+#define ID_ISAR1_EL1_Immediate                          GENMASK(23, 20)
+#define ID_ISAR1_EL1_Immediate_MASK                     GENMASK(23, 20)
+#define ID_ISAR1_EL1_Immediate_SHIFT                    20
+#define ID_ISAR1_EL1_Immediate_WIDTH                    4
+#define ID_ISAR1_EL1_Immediate_NI                       UL(0b0000)
+#define ID_ISAR1_EL1_Immediate_IMP                      UL(0b0001)
+
+#define ID_ISAR1_EL1_IfThen                             GENMASK(19, 16)
+#define ID_ISAR1_EL1_IfThen_MASK                        GENMASK(19, 16)
+#define ID_ISAR1_EL1_IfThen_SHIFT                       16
+#define ID_ISAR1_EL1_IfThen_WIDTH                       4
+#define ID_ISAR1_EL1_IfThen_NI                          UL(0b0000)
+#define ID_ISAR1_EL1_IfThen_IMP                         UL(0b0001)
+
+#define ID_ISAR1_EL1_Extend                             GENMASK(15, 12)
+#define ID_ISAR1_EL1_Extend_MASK                        GENMASK(15, 12)
+#define ID_ISAR1_EL1_Extend_SHIFT                       12
+#define ID_ISAR1_EL1_Extend_WIDTH                       4
+#define ID_ISAR1_EL1_Extend_NI                          UL(0b0000)
+#define ID_ISAR1_EL1_Extend_SXTB                        UL(0b0001)
+#define ID_ISAR1_EL1_Extend_SXTB16                      UL(0b0010)
+
+#define ID_ISAR1_EL1_Except_AR                          GENMASK(11, 8)
+#define ID_ISAR1_EL1_Except_AR_MASK                     GENMASK(11, 8)
+#define ID_ISAR1_EL1_Except_AR_SHIFT                    8
+#define ID_ISAR1_EL1_Except_AR_WIDTH                    4
+#define ID_ISAR1_EL1_Except_AR_NI                       UL(0b0000)
+#define ID_ISAR1_EL1_Except_AR_IMP                      UL(0b0001)
+
+#define ID_ISAR1_EL1_Except                             GENMASK(7, 4)
+#define ID_ISAR1_EL1_Except_MASK                        GENMASK(7, 4)
+#define ID_ISAR1_EL1_Except_SHIFT                       4
+#define ID_ISAR1_EL1_Except_WIDTH                       4
+#define ID_ISAR1_EL1_Except_NI                          UL(0b0000)
+#define ID_ISAR1_EL1_Except_IMP                         UL(0b0001)
+
+#define ID_ISAR1_EL1_Endian                             GENMASK(3, 0)
+#define ID_ISAR1_EL1_Endian_MASK                        GENMASK(3, 0)
+#define ID_ISAR1_EL1_Endian_SHIFT                       0
+#define ID_ISAR1_EL1_Endian_WIDTH                       4
+#define ID_ISAR1_EL1_Endian_NI                          UL(0b0000)
+#define ID_ISAR1_EL1_Endian_IMP                         UL(0b0001)
+
+#define ID_ISAR1_EL1_RES0                               (UL(0) | GENMASK_ULL(63, 32))
+#define ID_ISAR1_EL1_RES1                               (UL(0))
+#define ID_ISAR1_EL1_UNKN                               (UL(0))
+
+#define REG_ID_ISAR2_EL1                                S3_0_C0_C2_2
+#define SYS_ID_ISAR2_EL1                                sys_reg(3, 0, 0, 2, 2)
+#define SYS_ID_ISAR2_EL1_Op0                            3
+#define SYS_ID_ISAR2_EL1_Op1                            0
+#define SYS_ID_ISAR2_EL1_CRn                            0
+#define SYS_ID_ISAR2_EL1_CRm                            2
+#define SYS_ID_ISAR2_EL1_Op2                            2
+
+#define ID_ISAR2_EL1_Reversal                           GENMASK(31, 28)
+#define ID_ISAR2_EL1_Reversal_MASK                      GENMASK(31, 28)
+#define ID_ISAR2_EL1_Reversal_SHIFT                     28
+#define ID_ISAR2_EL1_Reversal_WIDTH                     4
+#define ID_ISAR2_EL1_Reversal_NI                        UL(0b0000)
+#define ID_ISAR2_EL1_Reversal_REV                       UL(0b0001)
+#define ID_ISAR2_EL1_Reversal_RBIT                      UL(0b0010)
+
+#define ID_ISAR2_EL1_PSR_AR                             GENMASK(27, 24)
+#define ID_ISAR2_EL1_PSR_AR_MASK                        GENMASK(27, 24)
+#define ID_ISAR2_EL1_PSR_AR_SHIFT                       24
+#define ID_ISAR2_EL1_PSR_AR_WIDTH                       4
+#define ID_ISAR2_EL1_PSR_AR_NI                          UL(0b0000)
+#define ID_ISAR2_EL1_PSR_AR_IMP                         UL(0b0001)
+
+#define ID_ISAR2_EL1_MultU                              GENMASK(23, 20)
+#define ID_ISAR2_EL1_MultU_MASK                         GENMASK(23, 20)
+#define ID_ISAR2_EL1_MultU_SHIFT                        20
+#define ID_ISAR2_EL1_MultU_WIDTH                        4
+#define ID_ISAR2_EL1_MultU_NI                           UL(0b0000)
+#define ID_ISAR2_EL1_MultU_UMULL                        UL(0b0001)
+#define ID_ISAR2_EL1_MultU_UMAAL                        UL(0b0010)
+
+#define ID_ISAR2_EL1_MultS                              GENMASK(19, 16)
+#define ID_ISAR2_EL1_MultS_MASK                         GENMASK(19, 16)
+#define ID_ISAR2_EL1_MultS_SHIFT                        16
+#define ID_ISAR2_EL1_MultS_WIDTH                        4
+#define ID_ISAR2_EL1_MultS_NI                           UL(0b0000)
+#define ID_ISAR2_EL1_MultS_SMULL                        UL(0b0001)
+#define ID_ISAR2_EL1_MultS_SMLABB                       UL(0b0010)
+#define ID_ISAR2_EL1_MultS_SMLAD                        UL(0b0011)
+
+#define ID_ISAR2_EL1_Mult                               GENMASK(15, 12)
+#define ID_ISAR2_EL1_Mult_MASK                          GENMASK(15, 12)
+#define ID_ISAR2_EL1_Mult_SHIFT                         12
+#define ID_ISAR2_EL1_Mult_WIDTH                         4
+#define ID_ISAR2_EL1_Mult_NI                            UL(0b0000)
+#define ID_ISAR2_EL1_Mult_MLA                           UL(0b0001)
+#define ID_ISAR2_EL1_Mult_MLS                           UL(0b0010)
+
+#define ID_ISAR2_EL1_MultiAccessInt                     GENMASK(11, 8)
+#define ID_ISAR2_EL1_MultiAccessInt_MASK                GENMASK(11, 8)
+#define ID_ISAR2_EL1_MultiAccessInt_SHIFT               8
+#define ID_ISAR2_EL1_MultiAccessInt_WIDTH               4
+#define ID_ISAR2_EL1_MultiAccessInt_NI                  UL(0b0000)
+#define ID_ISAR2_EL1_MultiAccessInt_RESTARTABLE         UL(0b0001)
+#define ID_ISAR2_EL1_MultiAccessInt_CONTINUABLE         UL(0b0010)
+
+#define ID_ISAR2_EL1_MemHint                            GENMASK(7, 4)
+#define ID_ISAR2_EL1_MemHint_MASK                       GENMASK(7, 4)
+#define ID_ISAR2_EL1_MemHint_SHIFT                      4
+#define ID_ISAR2_EL1_MemHint_WIDTH                      4
+#define ID_ISAR2_EL1_MemHint_NI                         UL(0b0000)
+#define ID_ISAR2_EL1_MemHint_PLD                        UL(0b0001)
+#define ID_ISAR2_EL1_MemHint_PLD2                       UL(0b0010)
+#define ID_ISAR2_EL1_MemHint_PLI                        UL(0b0011)
+#define ID_ISAR2_EL1_MemHint_PLDW                       UL(0b0100)
+
+#define ID_ISAR2_EL1_LoadStore                          GENMASK(3, 0)
+#define ID_ISAR2_EL1_LoadStore_MASK                     GENMASK(3, 0)
+#define ID_ISAR2_EL1_LoadStore_SHIFT                    0
+#define ID_ISAR2_EL1_LoadStore_WIDTH                    4
+#define ID_ISAR2_EL1_LoadStore_NI                       UL(0b0000)
+#define ID_ISAR2_EL1_LoadStore_DOUBLE                   UL(0b0001)
+#define ID_ISAR2_EL1_LoadStore_ACQUIRE                  UL(0b0010)
+
+#define ID_ISAR2_EL1_RES0                               (UL(0) | GENMASK_ULL(63, 32))
+#define ID_ISAR2_EL1_RES1                               (UL(0))
+#define ID_ISAR2_EL1_UNKN                               (UL(0))
+
+#define REG_ID_ISAR3_EL1                                S3_0_C0_C2_3
+#define SYS_ID_ISAR3_EL1                                sys_reg(3, 0, 0, 2, 3)
+#define SYS_ID_ISAR3_EL1_Op0                            3
+#define SYS_ID_ISAR3_EL1_Op1                            0
+#define SYS_ID_ISAR3_EL1_CRn                            0
+#define SYS_ID_ISAR3_EL1_CRm                            2
+#define SYS_ID_ISAR3_EL1_Op2                            3
+
+#define ID_ISAR3_EL1_T32EE                              GENMASK(31, 28)
+#define ID_ISAR3_EL1_T32EE_MASK                         GENMASK(31, 28)
+#define ID_ISAR3_EL1_T32EE_SHIFT                        28
+#define ID_ISAR3_EL1_T32EE_WIDTH                        4
+#define ID_ISAR3_EL1_T32EE_NI                           UL(0b0000)
+#define ID_ISAR3_EL1_T32EE_IMP                          UL(0b0001)
+
+#define ID_ISAR3_EL1_TrueNOP                            GENMASK(27, 24)
+#define ID_ISAR3_EL1_TrueNOP_MASK                       GENMASK(27, 24)
+#define ID_ISAR3_EL1_TrueNOP_SHIFT                      24
+#define ID_ISAR3_EL1_TrueNOP_WIDTH                      4
+#define ID_ISAR3_EL1_TrueNOP_NI                         UL(0b0000)
+#define ID_ISAR3_EL1_TrueNOP_IMP                        UL(0b0001)
+
+#define ID_ISAR3_EL1_T32Copy                            GENMASK(23, 20)
+#define ID_ISAR3_EL1_T32Copy_MASK                       GENMASK(23, 20)
+#define ID_ISAR3_EL1_T32Copy_SHIFT                      20
+#define ID_ISAR3_EL1_T32Copy_WIDTH                      4
+#define ID_ISAR3_EL1_T32Copy_NI                         UL(0b0000)
+#define ID_ISAR3_EL1_T32Copy_IMP                        UL(0b0001)
+
+#define ID_ISAR3_EL1_TabBranch                          GENMASK(19, 16)
+#define ID_ISAR3_EL1_TabBranch_MASK                     GENMASK(19, 16)
+#define ID_ISAR3_EL1_TabBranch_SHIFT                    16
+#define ID_ISAR3_EL1_TabBranch_WIDTH                    4
+#define ID_ISAR3_EL1_TabBranch_NI                       UL(0b0000)
+#define ID_ISAR3_EL1_TabBranch_IMP                      UL(0b0001)
+
+#define ID_ISAR3_EL1_SynchPrim                          GENMASK(15, 12)
+#define ID_ISAR3_EL1_SynchPrim_MASK                     GENMASK(15, 12)
+#define ID_ISAR3_EL1_SynchPrim_SHIFT                    12
+#define ID_ISAR3_EL1_SynchPrim_WIDTH                    4
+#define ID_ISAR3_EL1_SynchPrim_NI                       UL(0b0000)
+#define ID_ISAR3_EL1_SynchPrim_EXCLUSIVE                UL(0b0001)
+#define ID_ISAR3_EL1_SynchPrim_DOUBLE                   UL(0b0010)
+
+#define ID_ISAR3_EL1_SVC                                GENMASK(11, 8)
+#define ID_ISAR3_EL1_SVC_MASK                           GENMASK(11, 8)
+#define ID_ISAR3_EL1_SVC_SHIFT                          8
+#define ID_ISAR3_EL1_SVC_WIDTH                          4
+#define ID_ISAR3_EL1_SVC_NI                             UL(0b0000)
+#define ID_ISAR3_EL1_SVC_IMP                            UL(0b0001)
+
+#define ID_ISAR3_EL1_SIMD                               GENMASK(7, 4)
+#define ID_ISAR3_EL1_SIMD_MASK                          GENMASK(7, 4)
+#define ID_ISAR3_EL1_SIMD_SHIFT                         4
+#define ID_ISAR3_EL1_SIMD_WIDTH                         4
+#define ID_ISAR3_EL1_SIMD_NI                            UL(0b0000)
+#define ID_ISAR3_EL1_SIMD_SSAT                          UL(0b0001)
+#define ID_ISAR3_EL1_SIMD_PKHBT                         UL(0b0011)
+
+#define ID_ISAR3_EL1_Saturate                           GENMASK(3, 0)
+#define ID_ISAR3_EL1_Saturate_MASK                      GENMASK(3, 0)
+#define ID_ISAR3_EL1_Saturate_SHIFT                     0
+#define ID_ISAR3_EL1_Saturate_WIDTH                     4
+#define ID_ISAR3_EL1_Saturate_NI                        UL(0b0000)
+#define ID_ISAR3_EL1_Saturate_IMP                       UL(0b0001)
+
+#define ID_ISAR3_EL1_RES0                               (UL(0) | GENMASK_ULL(63, 32))
+#define ID_ISAR3_EL1_RES1                               (UL(0))
+#define ID_ISAR3_EL1_UNKN                               (UL(0))
+
+#define REG_ID_ISAR4_EL1                                S3_0_C0_C2_4
+#define SYS_ID_ISAR4_EL1                                sys_reg(3, 0, 0, 2, 4)
+#define SYS_ID_ISAR4_EL1_Op0                            3
+#define SYS_ID_ISAR4_EL1_Op1                            0
+#define SYS_ID_ISAR4_EL1_CRn                            0
+#define SYS_ID_ISAR4_EL1_CRm                            2
+#define SYS_ID_ISAR4_EL1_Op2                            4
+
+#define ID_ISAR4_EL1_SWP_frac                           GENMASK(31, 28)
+#define ID_ISAR4_EL1_SWP_frac_MASK                      GENMASK(31, 28)
+#define ID_ISAR4_EL1_SWP_frac_SHIFT                     28
+#define ID_ISAR4_EL1_SWP_frac_WIDTH                     4
+#define ID_ISAR4_EL1_SWP_frac_NI                        UL(0b0000)
+#define ID_ISAR4_EL1_SWP_frac_IMP                       UL(0b0001)
+
+#define ID_ISAR4_EL1_PSR_M                              GENMASK(27, 24)
+#define ID_ISAR4_EL1_PSR_M_MASK                         GENMASK(27, 24)
+#define ID_ISAR4_EL1_PSR_M_SHIFT                        24
+#define ID_ISAR4_EL1_PSR_M_WIDTH                        4
+#define ID_ISAR4_EL1_PSR_M_NI                           UL(0b0000)
+#define ID_ISAR4_EL1_PSR_M_IMP                          UL(0b0001)
+
+#define ID_ISAR4_EL1_SynchPrim_frac                     GENMASK(23, 20)
+#define ID_ISAR4_EL1_SynchPrim_frac_MASK                GENMASK(23, 20)
+#define ID_ISAR4_EL1_SynchPrim_frac_SHIFT               20
+#define ID_ISAR4_EL1_SynchPrim_frac_WIDTH               4
+#define ID_ISAR4_EL1_SynchPrim_frac_NI                  UL(0b0000)
+#define ID_ISAR4_EL1_SynchPrim_frac_IMP                 UL(0b0011)
+
+#define ID_ISAR4_EL1_Barrier                            GENMASK(19, 16)
+#define ID_ISAR4_EL1_Barrier_MASK                       GENMASK(19, 16)
+#define ID_ISAR4_EL1_Barrier_SHIFT                      16
+#define ID_ISAR4_EL1_Barrier_WIDTH                      4
+#define ID_ISAR4_EL1_Barrier_NI                         UL(0b0000)
+#define ID_ISAR4_EL1_Barrier_IMP                        UL(0b0001)
+
+#define ID_ISAR4_EL1_SMC                                GENMASK(15, 12)
+#define ID_ISAR4_EL1_SMC_MASK                           GENMASK(15, 12)
+#define ID_ISAR4_EL1_SMC_SHIFT                          12
+#define ID_ISAR4_EL1_SMC_WIDTH                          4
+#define ID_ISAR4_EL1_SMC_NI                             UL(0b0000)
+#define ID_ISAR4_EL1_SMC_IMP                            UL(0b0001)
+
+#define ID_ISAR4_EL1_Writeback                          GENMASK(11, 8)
+#define ID_ISAR4_EL1_Writeback_MASK                     GENMASK(11, 8)
+#define ID_ISAR4_EL1_Writeback_SHIFT                    8
+#define ID_ISAR4_EL1_Writeback_WIDTH                    4
+#define ID_ISAR4_EL1_Writeback_NI                       UL(0b0000)
+#define ID_ISAR4_EL1_Writeback_IMP                      UL(0b0001)
+
+#define ID_ISAR4_EL1_WithShifts                         GENMASK(7, 4)
+#define ID_ISAR4_EL1_WithShifts_MASK                    GENMASK(7, 4)
+#define ID_ISAR4_EL1_WithShifts_SHIFT                   4
+#define ID_ISAR4_EL1_WithShifts_WIDTH                   4
+#define ID_ISAR4_EL1_WithShifts_NI                      UL(0b0000)
+#define ID_ISAR4_EL1_WithShifts_LSL3                    UL(0b0001)
+#define ID_ISAR4_EL1_WithShifts_LS                      UL(0b0011)
+#define ID_ISAR4_EL1_WithShifts_REG                     UL(0b0100)
+
+#define ID_ISAR4_EL1_Unpriv                             GENMASK(3, 0)
+#define ID_ISAR4_EL1_Unpriv_MASK                        GENMASK(3, 0)
+#define ID_ISAR4_EL1_Unpriv_SHIFT                       0
+#define ID_ISAR4_EL1_Unpriv_WIDTH                       4
+#define ID_ISAR4_EL1_Unpriv_NI                          UL(0b0000)
+#define ID_ISAR4_EL1_Unpriv_REG_BYTE                    UL(0b0001)
+#define ID_ISAR4_EL1_Unpriv_SIGNED_HALFWORD             UL(0b0010)
+
+#define ID_ISAR4_EL1_RES0                               (UL(0) | GENMASK_ULL(63, 32))
+#define ID_ISAR4_EL1_RES1                               (UL(0))
+#define ID_ISAR4_EL1_UNKN                               (UL(0))
+
+#define REG_ID_ISAR5_EL1                                S3_0_C0_C2_5
+#define SYS_ID_ISAR5_EL1                                sys_reg(3, 0, 0, 2, 5)
+#define SYS_ID_ISAR5_EL1_Op0                            3
+#define SYS_ID_ISAR5_EL1_Op1                            0
+#define SYS_ID_ISAR5_EL1_CRn                            0
+#define SYS_ID_ISAR5_EL1_CRm                            2
+#define SYS_ID_ISAR5_EL1_Op2                            5
+
+#define ID_ISAR5_EL1_VCMA                               GENMASK(31, 28)
+#define ID_ISAR5_EL1_VCMA_MASK                          GENMASK(31, 28)
+#define ID_ISAR5_EL1_VCMA_SHIFT                         28
+#define ID_ISAR5_EL1_VCMA_WIDTH                         4
+#define ID_ISAR5_EL1_VCMA_SIGNED                        false
+#define ID_ISAR5_EL1_VCMA_NI                            UL(0b0000)
+#define ID_ISAR5_EL1_VCMA_IMP                           UL(0b0001)
+
+#define ID_ISAR5_EL1_RDM                                GENMASK(27, 24)
+#define ID_ISAR5_EL1_RDM_MASK                           GENMASK(27, 24)
+#define ID_ISAR5_EL1_RDM_SHIFT                          24
+#define ID_ISAR5_EL1_RDM_WIDTH                          4
+#define ID_ISAR5_EL1_RDM_SIGNED                         false
+#define ID_ISAR5_EL1_RDM_NI                             UL(0b0000)
+#define ID_ISAR5_EL1_RDM_IMP                            UL(0b0001)
+
+#define ID_ISAR5_EL1_CRC32                              GENMASK(19, 16)
+#define ID_ISAR5_EL1_CRC32_MASK                         GENMASK(19, 16)
+#define ID_ISAR5_EL1_CRC32_SHIFT                        16
+#define ID_ISAR5_EL1_CRC32_WIDTH                        4
+#define ID_ISAR5_EL1_CRC32_SIGNED                       false
+#define ID_ISAR5_EL1_CRC32_NI                           UL(0b0000)
+#define ID_ISAR5_EL1_CRC32_IMP                          UL(0b0001)
+
+#define ID_ISAR5_EL1_SHA2                               GENMASK(15, 12)
+#define ID_ISAR5_EL1_SHA2_MASK                          GENMASK(15, 12)
+#define ID_ISAR5_EL1_SHA2_SHIFT                         12
+#define ID_ISAR5_EL1_SHA2_WIDTH                         4
+#define ID_ISAR5_EL1_SHA2_SIGNED                        false
+#define ID_ISAR5_EL1_SHA2_NI                            UL(0b0000)
+#define ID_ISAR5_EL1_SHA2_IMP                           UL(0b0001)
+
+#define ID_ISAR5_EL1_SHA1                               GENMASK(11, 8)
+#define ID_ISAR5_EL1_SHA1_MASK                          GENMASK(11, 8)
+#define ID_ISAR5_EL1_SHA1_SHIFT                         8
+#define ID_ISAR5_EL1_SHA1_WIDTH                         4
+#define ID_ISAR5_EL1_SHA1_SIGNED                        false
+#define ID_ISAR5_EL1_SHA1_NI                            UL(0b0000)
+#define ID_ISAR5_EL1_SHA1_IMP                           UL(0b0001)
+
+#define ID_ISAR5_EL1_AES                                GENMASK(7, 4)
+#define ID_ISAR5_EL1_AES_MASK                           GENMASK(7, 4)
+#define ID_ISAR5_EL1_AES_SHIFT                          4
+#define ID_ISAR5_EL1_AES_WIDTH                          4
+#define ID_ISAR5_EL1_AES_SIGNED                         false
+#define ID_ISAR5_EL1_AES_NI                             UL(0b0000)
+#define ID_ISAR5_EL1_AES_IMP                            UL(0b0001)
+#define ID_ISAR5_EL1_AES_VMULL                          UL(0b0010)
+
+#define ID_ISAR5_EL1_SEVL                               GENMASK(3, 0)
+#define ID_ISAR5_EL1_SEVL_MASK                          GENMASK(3, 0)
+#define ID_ISAR5_EL1_SEVL_SHIFT                         0
+#define ID_ISAR5_EL1_SEVL_WIDTH                         4
+#define ID_ISAR5_EL1_SEVL_SIGNED                        false
+#define ID_ISAR5_EL1_SEVL_NI                            UL(0b0000)
+#define ID_ISAR5_EL1_SEVL_IMP                           UL(0b0001)
+
+#define ID_ISAR5_EL1_RES0                               (UL(0) | GENMASK_ULL(63, 32) | GENMASK_ULL(23, 20))
+#define ID_ISAR5_EL1_RES1                               (UL(0))
+#define ID_ISAR5_EL1_UNKN                               (UL(0))
+
+#define REG_ID_ISAR6_EL1                                S3_0_C0_C2_7
+#define SYS_ID_ISAR6_EL1                                sys_reg(3, 0, 0, 2, 7)
+#define SYS_ID_ISAR6_EL1_Op0                            3
+#define SYS_ID_ISAR6_EL1_Op1                            0
+#define SYS_ID_ISAR6_EL1_CRn                            0
+#define SYS_ID_ISAR6_EL1_CRm                            2
+#define SYS_ID_ISAR6_EL1_Op2                            7
+
+#define ID_ISAR6_EL1_I8MM                               GENMASK(27, 24)
+#define ID_ISAR6_EL1_I8MM_MASK                          GENMASK(27, 24)
+#define ID_ISAR6_EL1_I8MM_SHIFT                         24
+#define ID_ISAR6_EL1_I8MM_WIDTH                         4
+#define ID_ISAR6_EL1_I8MM_SIGNED                        false
+#define ID_ISAR6_EL1_I8MM_NI                            UL(0b0000)
+#define ID_ISAR6_EL1_I8MM_IMP                           UL(0b0001)
+
+#define ID_ISAR6_EL1_BF16                               GENMASK(23, 20)
+#define ID_ISAR6_EL1_BF16_MASK                          GENMASK(23, 20)
+#define ID_ISAR6_EL1_BF16_SHIFT                         20
+#define ID_ISAR6_EL1_BF16_WIDTH                         4
+#define ID_ISAR6_EL1_BF16_SIGNED                        false
+#define ID_ISAR6_EL1_BF16_NI                            UL(0b0000)
+#define ID_ISAR6_EL1_BF16_IMP                           UL(0b0001)
+
+#define ID_ISAR6_EL1_SPECRES                            GENMASK(19, 16)
+#define ID_ISAR6_EL1_SPECRES_MASK                       GENMASK(19, 16)
+#define ID_ISAR6_EL1_SPECRES_SHIFT                      16
+#define ID_ISAR6_EL1_SPECRES_WIDTH                      4
+#define ID_ISAR6_EL1_SPECRES_SIGNED                     false
+#define ID_ISAR6_EL1_SPECRES_NI                         UL(0b0000)
+#define ID_ISAR6_EL1_SPECRES_IMP                        UL(0b0001)
+
+#define ID_ISAR6_EL1_SB                                 GENMASK(15, 12)
+#define ID_ISAR6_EL1_SB_MASK                            GENMASK(15, 12)
+#define ID_ISAR6_EL1_SB_SHIFT                           12
+#define ID_ISAR6_EL1_SB_WIDTH                           4
+#define ID_ISAR6_EL1_SB_SIGNED                          false
+#define ID_ISAR6_EL1_SB_NI                              UL(0b0000)
+#define ID_ISAR6_EL1_SB_IMP                             UL(0b0001)
+
+#define ID_ISAR6_EL1_FHM                                GENMASK(11, 8)
+#define ID_ISAR6_EL1_FHM_MASK                           GENMASK(11, 8)
+#define ID_ISAR6_EL1_FHM_SHIFT                          8
+#define ID_ISAR6_EL1_FHM_WIDTH                          4
+#define ID_ISAR6_EL1_FHM_SIGNED                         false
+#define ID_ISAR6_EL1_FHM_NI                             UL(0b0000)
+#define ID_ISAR6_EL1_FHM_IMP                            UL(0b0001)
+
+#define ID_ISAR6_EL1_DP                                 GENMASK(7, 4)
+#define ID_ISAR6_EL1_DP_MASK                            GENMASK(7, 4)
+#define ID_ISAR6_EL1_DP_SHIFT                           4
+#define ID_ISAR6_EL1_DP_WIDTH                           4
+#define ID_ISAR6_EL1_DP_SIGNED                          false
+#define ID_ISAR6_EL1_DP_NI                              UL(0b0000)
+#define ID_ISAR6_EL1_DP_IMP                             UL(0b0001)
+
+#define ID_ISAR6_EL1_JSCVT                              GENMASK(3, 0)
+#define ID_ISAR6_EL1_JSCVT_MASK                         GENMASK(3, 0)
+#define ID_ISAR6_EL1_JSCVT_SHIFT                        0
+#define ID_ISAR6_EL1_JSCVT_WIDTH                        4
+#define ID_ISAR6_EL1_JSCVT_SIGNED                       false
+#define ID_ISAR6_EL1_JSCVT_NI                           UL(0b0000)
+#define ID_ISAR6_EL1_JSCVT_IMP                          UL(0b0001)
+
+#define ID_ISAR6_EL1_RES0                               (UL(0) | GENMASK_ULL(63, 28))
+#define ID_ISAR6_EL1_RES1                               (UL(0))
+#define ID_ISAR6_EL1_UNKN                               (UL(0))
+
+#define REG_ID_MMFR4_EL1                                S3_0_C0_C2_6
+#define SYS_ID_MMFR4_EL1                                sys_reg(3, 0, 0, 2, 6)
+#define SYS_ID_MMFR4_EL1_Op0                            3
+#define SYS_ID_MMFR4_EL1_Op1                            0
+#define SYS_ID_MMFR4_EL1_CRn                            0
+#define SYS_ID_MMFR4_EL1_CRm                            2
+#define SYS_ID_MMFR4_EL1_Op2                            6
+
+#define ID_MMFR4_EL1_EVT                                GENMASK(31, 28)
+#define ID_MMFR4_EL1_EVT_MASK                           GENMASK(31, 28)
+#define ID_MMFR4_EL1_EVT_SHIFT                          28
+#define ID_MMFR4_EL1_EVT_WIDTH                          4
+#define ID_MMFR4_EL1_EVT_SIGNED                         false
+#define ID_MMFR4_EL1_EVT_NI                             UL(0b0000)
+#define ID_MMFR4_EL1_EVT_NO_TLBIS                       UL(0b0001)
+#define ID_MMFR4_EL1_EVT_TLBIS                          UL(0b0010)
+
+#define ID_MMFR4_EL1_CCIDX                              GENMASK(27, 24)
+#define ID_MMFR4_EL1_CCIDX_MASK                         GENMASK(27, 24)
+#define ID_MMFR4_EL1_CCIDX_SHIFT                        24
+#define ID_MMFR4_EL1_CCIDX_WIDTH                        4
+#define ID_MMFR4_EL1_CCIDX_SIGNED                       false
+#define ID_MMFR4_EL1_CCIDX_NI                           UL(0b0000)
+#define ID_MMFR4_EL1_CCIDX_IMP                          UL(0b0001)
+
+#define ID_MMFR4_EL1_LSM                                GENMASK(23, 20)
+#define ID_MMFR4_EL1_LSM_MASK                           GENMASK(23, 20)
+#define ID_MMFR4_EL1_LSM_SHIFT                          20
+#define ID_MMFR4_EL1_LSM_WIDTH                          4
+#define ID_MMFR4_EL1_LSM_SIGNED                         false
+#define ID_MMFR4_EL1_LSM_NI                             UL(0b0000)
+#define ID_MMFR4_EL1_LSM_IMP                            UL(0b0001)
+
+#define ID_MMFR4_EL1_HPDS                               GENMASK(19, 16)
+#define ID_MMFR4_EL1_HPDS_MASK                          GENMASK(19, 16)
+#define ID_MMFR4_EL1_HPDS_SHIFT                         16
+#define ID_MMFR4_EL1_HPDS_WIDTH                         4
+#define ID_MMFR4_EL1_HPDS_SIGNED                        false
+#define ID_MMFR4_EL1_HPDS_NI                            UL(0b0000)
+#define ID_MMFR4_EL1_HPDS_AA32HPD                       UL(0b0001)
+#define ID_MMFR4_EL1_HPDS_HPDS2                         UL(0b0010)
+
+#define ID_MMFR4_EL1_CnP                                GENMASK(15, 12)
+#define ID_MMFR4_EL1_CnP_MASK                           GENMASK(15, 12)
+#define ID_MMFR4_EL1_CnP_SHIFT                          12
+#define ID_MMFR4_EL1_CnP_WIDTH                          4
+#define ID_MMFR4_EL1_CnP_SIGNED                         false
+#define ID_MMFR4_EL1_CnP_NI                             UL(0b0000)
+#define ID_MMFR4_EL1_CnP_IMP                            UL(0b0001)
+
+#define ID_MMFR4_EL1_XNX                                GENMASK(11, 8)
+#define ID_MMFR4_EL1_XNX_MASK                           GENMASK(11, 8)
+#define ID_MMFR4_EL1_XNX_SHIFT                          8
+#define ID_MMFR4_EL1_XNX_WIDTH                          4
+#define ID_MMFR4_EL1_XNX_SIGNED                         false
+#define ID_MMFR4_EL1_XNX_NI                             UL(0b0000)
+#define ID_MMFR4_EL1_XNX_IMP                            UL(0b0001)
+
+#define ID_MMFR4_EL1_AC2                                GENMASK(7, 4)
+#define ID_MMFR4_EL1_AC2_MASK                           GENMASK(7, 4)
+#define ID_MMFR4_EL1_AC2_SHIFT                          4
+#define ID_MMFR4_EL1_AC2_WIDTH                          4
+#define ID_MMFR4_EL1_AC2_SIGNED                         false
+#define ID_MMFR4_EL1_AC2_NI                             UL(0b0000)
+#define ID_MMFR4_EL1_AC2_IMP                            UL(0b0001)
+
+#define ID_MMFR4_EL1_SpecSEI                            GENMASK(3, 0)
+#define ID_MMFR4_EL1_SpecSEI_MASK                       GENMASK(3, 0)
+#define ID_MMFR4_EL1_SpecSEI_SHIFT                      0
+#define ID_MMFR4_EL1_SpecSEI_WIDTH                      4
+#define ID_MMFR4_EL1_SpecSEI_SIGNED                     false
+#define ID_MMFR4_EL1_SpecSEI_NI                         UL(0b0000)
+#define ID_MMFR4_EL1_SpecSEI_IMP                        UL(0b0001)
+
+#define ID_MMFR4_EL1_RES0                               (UL(0) | GENMASK_ULL(63, 32))
+#define ID_MMFR4_EL1_RES1                               (UL(0))
+#define ID_MMFR4_EL1_UNKN                               (UL(0))
+
+#define REG_MVFR0_EL1                                   S3_0_C0_C3_0
+#define SYS_MVFR0_EL1                                   sys_reg(3, 0, 0, 3, 0)
+#define SYS_MVFR0_EL1_Op0                               3
+#define SYS_MVFR0_EL1_Op1                               0
+#define SYS_MVFR0_EL1_CRn                               0
+#define SYS_MVFR0_EL1_CRm                               3
+#define SYS_MVFR0_EL1_Op2                               0
+
+#define MVFR0_EL1_FPRound                               GENMASK(31, 28)
+#define MVFR0_EL1_FPRound_MASK                          GENMASK(31, 28)
+#define MVFR0_EL1_FPRound_SHIFT                         28
+#define MVFR0_EL1_FPRound_WIDTH                         4
+#define MVFR0_EL1_FPRound_SIGNED                        false
+#define MVFR0_EL1_FPRound_NI                            UL(0b0000)
+#define MVFR0_EL1_FPRound_IMP                           UL(0b0001)
+
+#define MVFR0_EL1_FPShVec                               GENMASK(27, 24)
+#define MVFR0_EL1_FPShVec_MASK                          GENMASK(27, 24)
+#define MVFR0_EL1_FPShVec_SHIFT                         24
+#define MVFR0_EL1_FPShVec_WIDTH                         4
+#define MVFR0_EL1_FPShVec_SIGNED                        false
+#define MVFR0_EL1_FPShVec_NI                            UL(0b0000)
+#define MVFR0_EL1_FPShVec_IMP                           UL(0b0001)
+
+#define MVFR0_EL1_FPSqrt                                GENMASK(23, 20)
+#define MVFR0_EL1_FPSqrt_MASK                           GENMASK(23, 20)
+#define MVFR0_EL1_FPSqrt_SHIFT                          20
+#define MVFR0_EL1_FPSqrt_WIDTH                          4
+#define MVFR0_EL1_FPSqrt_SIGNED                         false
+#define MVFR0_EL1_FPSqrt_NI                             UL(0b0000)
+#define MVFR0_EL1_FPSqrt_IMP                            UL(0b0001)
+
+#define MVFR0_EL1_FPDivide                              GENMASK(19, 16)
+#define MVFR0_EL1_FPDivide_MASK                         GENMASK(19, 16)
+#define MVFR0_EL1_FPDivide_SHIFT                        16
+#define MVFR0_EL1_FPDivide_WIDTH                        4
+#define MVFR0_EL1_FPDivide_SIGNED                       false
+#define MVFR0_EL1_FPDivide_NI                           UL(0b0000)
+#define MVFR0_EL1_FPDivide_IMP                          UL(0b0001)
+
+#define MVFR0_EL1_FPTrap                                GENMASK(15, 12)
+#define MVFR0_EL1_FPTrap_MASK                           GENMASK(15, 12)
+#define MVFR0_EL1_FPTrap_SHIFT                          12
+#define MVFR0_EL1_FPTrap_WIDTH                          4
+#define MVFR0_EL1_FPTrap_SIGNED                         false
+#define MVFR0_EL1_FPTrap_NI                             UL(0b0000)
+#define MVFR0_EL1_FPTrap_IMP                            UL(0b0001)
+
+#define MVFR0_EL1_FPDP                                  GENMASK(11, 8)
+#define MVFR0_EL1_FPDP_MASK                             GENMASK(11, 8)
+#define MVFR0_EL1_FPDP_SHIFT                            8
+#define MVFR0_EL1_FPDP_WIDTH                            4
+#define MVFR0_EL1_FPDP_SIGNED                           false
+#define MVFR0_EL1_FPDP_NI                               UL(0b0000)
+#define MVFR0_EL1_FPDP_VFPv2                            UL(0b0001)
+#define MVFR0_EL1_FPDP_VFPv3                            UL(0b0010)
+
+#define MVFR0_EL1_FPSP                                  GENMASK(7, 4)
+#define MVFR0_EL1_FPSP_MASK                             GENMASK(7, 4)
+#define MVFR0_EL1_FPSP_SHIFT                            4
+#define MVFR0_EL1_FPSP_WIDTH                            4
+#define MVFR0_EL1_FPSP_SIGNED                           false
+#define MVFR0_EL1_FPSP_NI                               UL(0b0000)
+#define MVFR0_EL1_FPSP_VFPv2                            UL(0b0001)
+#define MVFR0_EL1_FPSP_VFPv3                            UL(0b0010)
+
+#define MVFR0_EL1_SIMDReg                               GENMASK(3, 0)
+#define MVFR0_EL1_SIMDReg_MASK                          GENMASK(3, 0)
+#define MVFR0_EL1_SIMDReg_SHIFT                         0
+#define MVFR0_EL1_SIMDReg_WIDTH                         4
+#define MVFR0_EL1_SIMDReg_NI                            UL(0b0000)
+#define MVFR0_EL1_SIMDReg_IMP_16x64                     UL(0b0001)
+#define MVFR0_EL1_SIMDReg_IMP_32x64                     UL(0b0010)
+
+#define MVFR0_EL1_RES0                                  (UL(0) | GENMASK_ULL(63, 32))
+#define MVFR0_EL1_RES1                                  (UL(0))
+#define MVFR0_EL1_UNKN                                  (UL(0))
+
+#define REG_MVFR1_EL1                                   S3_0_C0_C3_1
+#define SYS_MVFR1_EL1                                   sys_reg(3, 0, 0, 3, 1)
+#define SYS_MVFR1_EL1_Op0                               3
+#define SYS_MVFR1_EL1_Op1                               0
+#define SYS_MVFR1_EL1_CRn                               0
+#define SYS_MVFR1_EL1_CRm                               3
+#define SYS_MVFR1_EL1_Op2                               1
+
+#define MVFR1_EL1_SIMDFMAC                              GENMASK(31, 28)
+#define MVFR1_EL1_SIMDFMAC_MASK                         GENMASK(31, 28)
+#define MVFR1_EL1_SIMDFMAC_SHIFT                        28
+#define MVFR1_EL1_SIMDFMAC_WIDTH                        4
+#define MVFR1_EL1_SIMDFMAC_SIGNED                       false
+#define MVFR1_EL1_SIMDFMAC_NI                           UL(0b0000)
+#define MVFR1_EL1_SIMDFMAC_IMP                          UL(0b0001)
+
+#define MVFR1_EL1_FPHP                                  GENMASK(27, 24)
+#define MVFR1_EL1_FPHP_MASK                             GENMASK(27, 24)
+#define MVFR1_EL1_FPHP_SHIFT                            24
+#define MVFR1_EL1_FPHP_WIDTH                            4
+#define MVFR1_EL1_FPHP_SIGNED                           false
+#define MVFR1_EL1_FPHP_NI                               UL(0b0000)
+#define MVFR1_EL1_FPHP_FPHP                             UL(0b0001)
+#define MVFR1_EL1_FPHP_FPHP_CONV                        UL(0b0010)
+#define MVFR1_EL1_FPHP_FP16                             UL(0b0011)
+
+#define MVFR1_EL1_SIMDHP                                GENMASK(23, 20)
+#define MVFR1_EL1_SIMDHP_MASK                           GENMASK(23, 20)
+#define MVFR1_EL1_SIMDHP_SHIFT                          20
+#define MVFR1_EL1_SIMDHP_WIDTH                          4
+#define MVFR1_EL1_SIMDHP_SIGNED                         false
+#define MVFR1_EL1_SIMDHP_NI                             UL(0b0000)
+#define MVFR1_EL1_SIMDHP_SIMDHP                         UL(0b0001)
+#define MVFR1_EL1_SIMDHP_SIMDHP_FLOAT                   UL(0b0010)
+
+#define MVFR1_EL1_SIMDSP                                GENMASK(19, 16)
+#define MVFR1_EL1_SIMDSP_MASK                           GENMASK(19, 16)
+#define MVFR1_EL1_SIMDSP_SHIFT                          16
+#define MVFR1_EL1_SIMDSP_WIDTH                          4
+#define MVFR1_EL1_SIMDSP_SIGNED                         false
+#define MVFR1_EL1_SIMDSP_NI                             UL(0b0000)
+#define MVFR1_EL1_SIMDSP_IMP                            UL(0b0001)
+
+#define MVFR1_EL1_SIMDInt                               GENMASK(15, 12)
+#define MVFR1_EL1_SIMDInt_MASK                          GENMASK(15, 12)
+#define MVFR1_EL1_SIMDInt_SHIFT                         12
+#define MVFR1_EL1_SIMDInt_WIDTH                         4
+#define MVFR1_EL1_SIMDInt_SIGNED                        false
+#define MVFR1_EL1_SIMDInt_NI                            UL(0b0000)
+#define MVFR1_EL1_SIMDInt_IMP                           UL(0b0001)
+
+#define MVFR1_EL1_SIMDLS                                GENMASK(11, 8)
+#define MVFR1_EL1_SIMDLS_MASK                           GENMASK(11, 8)
+#define MVFR1_EL1_SIMDLS_SHIFT                          8
+#define MVFR1_EL1_SIMDLS_WIDTH                          4
+#define MVFR1_EL1_SIMDLS_SIGNED                         false
+#define MVFR1_EL1_SIMDLS_NI                             UL(0b0000)
+#define MVFR1_EL1_SIMDLS_IMP                            UL(0b0001)
+
+#define MVFR1_EL1_FPDNaN                                GENMASK(7, 4)
+#define MVFR1_EL1_FPDNaN_MASK                           GENMASK(7, 4)
+#define MVFR1_EL1_FPDNaN_SHIFT                          4
+#define MVFR1_EL1_FPDNaN_WIDTH                          4
+#define MVFR1_EL1_FPDNaN_SIGNED                         false
+#define MVFR1_EL1_FPDNaN_NI                             UL(0b0000)
+#define MVFR1_EL1_FPDNaN_IMP                            UL(0b0001)
+
+#define MVFR1_EL1_FPFtZ                                 GENMASK(3, 0)
+#define MVFR1_EL1_FPFtZ_MASK                            GENMASK(3, 0)
+#define MVFR1_EL1_FPFtZ_SHIFT                           0
+#define MVFR1_EL1_FPFtZ_WIDTH                           4
+#define MVFR1_EL1_FPFtZ_SIGNED                          false
+#define MVFR1_EL1_FPFtZ_NI                              UL(0b0000)
+#define MVFR1_EL1_FPFtZ_IMP                             UL(0b0001)
+
+#define MVFR1_EL1_RES0                                  (UL(0) | GENMASK_ULL(63, 32))
+#define MVFR1_EL1_RES1                                  (UL(0))
+#define MVFR1_EL1_UNKN                                  (UL(0))
+
+#define REG_MVFR2_EL1                                   S3_0_C0_C3_2
+#define SYS_MVFR2_EL1                                   sys_reg(3, 0, 0, 3, 2)
+#define SYS_MVFR2_EL1_Op0                               3
+#define SYS_MVFR2_EL1_Op1                               0
+#define SYS_MVFR2_EL1_CRn                               0
+#define SYS_MVFR2_EL1_CRm                               3
+#define SYS_MVFR2_EL1_Op2                               2
+
+#define MVFR2_EL1_FPMisc                                GENMASK(7, 4)
+#define MVFR2_EL1_FPMisc_MASK                           GENMASK(7, 4)
+#define MVFR2_EL1_FPMisc_SHIFT                          4
+#define MVFR2_EL1_FPMisc_WIDTH                          4
+#define MVFR2_EL1_FPMisc_NI                             UL(0b0000)
+#define MVFR2_EL1_FPMisc_FP                             UL(0b0001)
+#define MVFR2_EL1_FPMisc_FP_DIRECTED_ROUNDING           UL(0b0010)
+#define MVFR2_EL1_FPMisc_FP_ROUNDING                    UL(0b0011)
+#define MVFR2_EL1_FPMisc_FP_MAX_MIN                     UL(0b0100)
+
+#define MVFR2_EL1_SIMDMisc                              GENMASK(3, 0)
+#define MVFR2_EL1_SIMDMisc_MASK                         GENMASK(3, 0)
+#define MVFR2_EL1_SIMDMisc_SHIFT                        0
+#define MVFR2_EL1_SIMDMisc_WIDTH                        4
+#define MVFR2_EL1_SIMDMisc_NI                           UL(0b0000)
+#define MVFR2_EL1_SIMDMisc_SIMD_DIRECTED_ROUNDING       UL(0b0001)
+#define MVFR2_EL1_SIMDMisc_SIMD_ROUNDING                UL(0b0010)
+#define MVFR2_EL1_SIMDMisc_SIMD_MAX_MIN                 UL(0b0011)
+
+#define MVFR2_EL1_RES0                                  (UL(0) | GENMASK_ULL(63, 8))
+#define MVFR2_EL1_RES1                                  (UL(0))
+#define MVFR2_EL1_UNKN                                  (UL(0))
+
+#define REG_ID_PFR2_EL1                                 S3_0_C0_C3_4
+#define SYS_ID_PFR2_EL1                                 sys_reg(3, 0, 0, 3, 4)
+#define SYS_ID_PFR2_EL1_Op0                             3
+#define SYS_ID_PFR2_EL1_Op1                             0
+#define SYS_ID_PFR2_EL1_CRn                             0
+#define SYS_ID_PFR2_EL1_CRm                             3
+#define SYS_ID_PFR2_EL1_Op2                             4
+
+#define ID_PFR2_EL1_RAS_frac                            GENMASK(11, 8)
+#define ID_PFR2_EL1_RAS_frac_MASK                       GENMASK(11, 8)
+#define ID_PFR2_EL1_RAS_frac_SHIFT                      8
+#define ID_PFR2_EL1_RAS_frac_WIDTH                      4
+#define ID_PFR2_EL1_RAS_frac_SIGNED                     false
+#define ID_PFR2_EL1_RAS_frac_NI                         UL(0b0000)
+#define ID_PFR2_EL1_RAS_frac_RASv1p1                    UL(0b0001)
+
+#define ID_PFR2_EL1_SSBS                                GENMASK(7, 4)
+#define ID_PFR2_EL1_SSBS_MASK                           GENMASK(7, 4)
+#define ID_PFR2_EL1_SSBS_SHIFT                          4
+#define ID_PFR2_EL1_SSBS_WIDTH                          4
+#define ID_PFR2_EL1_SSBS_SIGNED                         false
+#define ID_PFR2_EL1_SSBS_NI                             UL(0b0000)
+#define ID_PFR2_EL1_SSBS_IMP                            UL(0b0001)
+
+#define ID_PFR2_EL1_CSV3                                GENMASK(3, 0)
+#define ID_PFR2_EL1_CSV3_MASK                           GENMASK(3, 0)
+#define ID_PFR2_EL1_CSV3_SHIFT                          0
+#define ID_PFR2_EL1_CSV3_WIDTH                          4
+#define ID_PFR2_EL1_CSV3_SIGNED                         false
+#define ID_PFR2_EL1_CSV3_NI                             UL(0b0000)
+#define ID_PFR2_EL1_CSV3_IMP                            UL(0b0001)
+
+#define ID_PFR2_EL1_RES0                                (UL(0) | GENMASK_ULL(63, 12))
+#define ID_PFR2_EL1_RES1                                (UL(0))
+#define ID_PFR2_EL1_UNKN                                (UL(0))
+
+#define REG_ID_DFR1_EL1                                 S3_0_C0_C3_5
+#define SYS_ID_DFR1_EL1                                 sys_reg(3, 0, 0, 3, 5)
+#define SYS_ID_DFR1_EL1_Op0                             3
+#define SYS_ID_DFR1_EL1_Op1                             0
+#define SYS_ID_DFR1_EL1_CRn                             0
+#define SYS_ID_DFR1_EL1_CRm                             3
+#define SYS_ID_DFR1_EL1_Op2                             5
+
+#define ID_DFR1_EL1_HPMN0                               GENMASK(7, 4)
+#define ID_DFR1_EL1_HPMN0_MASK                          GENMASK(7, 4)
+#define ID_DFR1_EL1_HPMN0_SHIFT                         4
+#define ID_DFR1_EL1_HPMN0_WIDTH                         4
+#define ID_DFR1_EL1_HPMN0_SIGNED                        false
+#define ID_DFR1_EL1_HPMN0_NI                            UL(0b0000)
+#define ID_DFR1_EL1_HPMN0_IMP                           UL(0b0001)
+
+#define ID_DFR1_EL1_MTPMU                               GENMASK(3, 0)
+#define ID_DFR1_EL1_MTPMU_MASK                          GENMASK(3, 0)
+#define ID_DFR1_EL1_MTPMU_SHIFT                         0
+#define ID_DFR1_EL1_MTPMU_WIDTH                         4
+#define ID_DFR1_EL1_MTPMU_IMPDEF                        UL(0b0000)
+#define ID_DFR1_EL1_MTPMU_IMP                           UL(0b0001)
+#define ID_DFR1_EL1_MTPMU_NI                            UL(0b1111)
+
+#define ID_DFR1_EL1_RES0                                (UL(0) | GENMASK_ULL(63, 8))
+#define ID_DFR1_EL1_RES1                                (UL(0))
+#define ID_DFR1_EL1_UNKN                                (UL(0))
+
+#define REG_ID_MMFR5_EL1                                S3_0_C0_C3_6
+#define SYS_ID_MMFR5_EL1                                sys_reg(3, 0, 0, 3, 6)
+#define SYS_ID_MMFR5_EL1_Op0                            3
+#define SYS_ID_MMFR5_EL1_Op1                            0
+#define SYS_ID_MMFR5_EL1_CRn                            0
+#define SYS_ID_MMFR5_EL1_CRm                            3
+#define SYS_ID_MMFR5_EL1_Op2                            6
+
+#define ID_MMFR5_EL1_nTLBPA                             GENMASK(7, 4)
+#define ID_MMFR5_EL1_nTLBPA_MASK                        GENMASK(7, 4)
+#define ID_MMFR5_EL1_nTLBPA_SHIFT                       4
+#define ID_MMFR5_EL1_nTLBPA_WIDTH                       4
+#define ID_MMFR5_EL1_nTLBPA_SIGNED                      false
+#define ID_MMFR5_EL1_nTLBPA_NI                          UL(0b0000)
+#define ID_MMFR5_EL1_nTLBPA_IMP                         UL(0b0001)
+
+#define ID_MMFR5_EL1_ETS                                GENMASK(3, 0)
+#define ID_MMFR5_EL1_ETS_MASK                           GENMASK(3, 0)
+#define ID_MMFR5_EL1_ETS_SHIFT                          0
+#define ID_MMFR5_EL1_ETS_WIDTH                          4
+#define ID_MMFR5_EL1_ETS_SIGNED                         false
+#define ID_MMFR5_EL1_ETS_NI                             UL(0b0000)
+#define ID_MMFR5_EL1_ETS_IMP                            UL(0b0001)
+
+#define ID_MMFR5_EL1_RES0                               (UL(0) | GENMASK_ULL(63, 8))
+#define ID_MMFR5_EL1_RES1                               (UL(0))
+#define ID_MMFR5_EL1_UNKN                               (UL(0))
+
+#define REG_ID_AA64PFR0_EL1                             S3_0_C0_C4_0
+#define SYS_ID_AA64PFR0_EL1                             sys_reg(3, 0, 0, 4, 0)
+#define SYS_ID_AA64PFR0_EL1_Op0                         3
+#define SYS_ID_AA64PFR0_EL1_Op1                         0
+#define SYS_ID_AA64PFR0_EL1_CRn                         0
+#define SYS_ID_AA64PFR0_EL1_CRm                         4
+#define SYS_ID_AA64PFR0_EL1_Op2                         0
+
+#define ID_AA64PFR0_EL1_CSV3                            GENMASK(63, 60)
+#define ID_AA64PFR0_EL1_CSV3_MASK                       GENMASK(63, 60)
+#define ID_AA64PFR0_EL1_CSV3_SHIFT                      60
+#define ID_AA64PFR0_EL1_CSV3_WIDTH                      4
+#define ID_AA64PFR0_EL1_CSV3_SIGNED                     false
+#define ID_AA64PFR0_EL1_CSV3_NI                         UL(0b0000)
+#define ID_AA64PFR0_EL1_CSV3_IMP                        UL(0b0001)
+
+#define ID_AA64PFR0_EL1_CSV2                            GENMASK(59, 56)
+#define ID_AA64PFR0_EL1_CSV2_MASK                       GENMASK(59, 56)
+#define ID_AA64PFR0_EL1_CSV2_SHIFT                      56
+#define ID_AA64PFR0_EL1_CSV2_WIDTH                      4
+#define ID_AA64PFR0_EL1_CSV2_SIGNED                     false
+#define ID_AA64PFR0_EL1_CSV2_NI                         UL(0b0000)
+#define ID_AA64PFR0_EL1_CSV2_IMP                        UL(0b0001)
+#define ID_AA64PFR0_EL1_CSV2_CSV2_2                     UL(0b0010)
+#define ID_AA64PFR0_EL1_CSV2_CSV2_3                     UL(0b0011)
+
+#define ID_AA64PFR0_EL1_RME                             GENMASK(55, 52)
+#define ID_AA64PFR0_EL1_RME_MASK                        GENMASK(55, 52)
+#define ID_AA64PFR0_EL1_RME_SHIFT                       52
+#define ID_AA64PFR0_EL1_RME_WIDTH                       4
+#define ID_AA64PFR0_EL1_RME_SIGNED                      false
+#define ID_AA64PFR0_EL1_RME_NI                          UL(0b0000)
+#define ID_AA64PFR0_EL1_RME_IMP                         UL(0b0001)
+
+#define ID_AA64PFR0_EL1_DIT                             GENMASK(51, 48)
+#define ID_AA64PFR0_EL1_DIT_MASK                        GENMASK(51, 48)
+#define ID_AA64PFR0_EL1_DIT_SHIFT                       48
+#define ID_AA64PFR0_EL1_DIT_WIDTH                       4
+#define ID_AA64PFR0_EL1_DIT_SIGNED                      false
+#define ID_AA64PFR0_EL1_DIT_NI                          UL(0b0000)
+#define ID_AA64PFR0_EL1_DIT_IMP                         UL(0b0001)
+
+#define ID_AA64PFR0_EL1_AMU                             GENMASK(47, 44)
+#define ID_AA64PFR0_EL1_AMU_MASK                        GENMASK(47, 44)
+#define ID_AA64PFR0_EL1_AMU_SHIFT                       44
+#define ID_AA64PFR0_EL1_AMU_WIDTH                       4
+#define ID_AA64PFR0_EL1_AMU_SIGNED                      false
+#define ID_AA64PFR0_EL1_AMU_NI                          UL(0b0000)
+#define ID_AA64PFR0_EL1_AMU_IMP                         UL(0b0001)
+#define ID_AA64PFR0_EL1_AMU_V1P1                        UL(0b0010)
+
+#define ID_AA64PFR0_EL1_MPAM                            GENMASK(43, 40)
+#define ID_AA64PFR0_EL1_MPAM_MASK                       GENMASK(43, 40)
+#define ID_AA64PFR0_EL1_MPAM_SHIFT                      40
+#define ID_AA64PFR0_EL1_MPAM_WIDTH                      4
+#define ID_AA64PFR0_EL1_MPAM_SIGNED                     false
+#define ID_AA64PFR0_EL1_MPAM_0                          UL(0b0000)
+#define ID_AA64PFR0_EL1_MPAM_1                          UL(0b0001)
+
+#define ID_AA64PFR0_EL1_SEL2                            GENMASK(39, 36)
+#define ID_AA64PFR0_EL1_SEL2_MASK                       GENMASK(39, 36)
+#define ID_AA64PFR0_EL1_SEL2_SHIFT                      36
+#define ID_AA64PFR0_EL1_SEL2_WIDTH                      4
+#define ID_AA64PFR0_EL1_SEL2_SIGNED                     false
+#define ID_AA64PFR0_EL1_SEL2_NI                         UL(0b0000)
+#define ID_AA64PFR0_EL1_SEL2_IMP                        UL(0b0001)
+
+#define ID_AA64PFR0_EL1_SVE                             GENMASK(35, 32)
+#define ID_AA64PFR0_EL1_SVE_MASK                        GENMASK(35, 32)
+#define ID_AA64PFR0_EL1_SVE_SHIFT                       32
+#define ID_AA64PFR0_EL1_SVE_WIDTH                       4
+#define ID_AA64PFR0_EL1_SVE_SIGNED                      false
+#define ID_AA64PFR0_EL1_SVE_NI                          UL(0b0000)
+#define ID_AA64PFR0_EL1_SVE_IMP                         UL(0b0001)
+
+#define ID_AA64PFR0_EL1_RAS                             GENMASK(31, 28)
+#define ID_AA64PFR0_EL1_RAS_MASK                        GENMASK(31, 28)
+#define ID_AA64PFR0_EL1_RAS_SHIFT                       28
+#define ID_AA64PFR0_EL1_RAS_WIDTH                       4
+#define ID_AA64PFR0_EL1_RAS_SIGNED                      false
+#define ID_AA64PFR0_EL1_RAS_NI                          UL(0b0000)
+#define ID_AA64PFR0_EL1_RAS_IMP                         UL(0b0001)
+#define ID_AA64PFR0_EL1_RAS_V1P1                        UL(0b0010)
+
+#define ID_AA64PFR0_EL1_GIC                             GENMASK(27, 24)
+#define ID_AA64PFR0_EL1_GIC_MASK                        GENMASK(27, 24)
+#define ID_AA64PFR0_EL1_GIC_SHIFT                       24
+#define ID_AA64PFR0_EL1_GIC_WIDTH                       4
+#define ID_AA64PFR0_EL1_GIC_SIGNED                      false
+#define ID_AA64PFR0_EL1_GIC_NI                          UL(0b0000)
+#define ID_AA64PFR0_EL1_GIC_IMP                         UL(0b0001)
+#define ID_AA64PFR0_EL1_GIC_V4P1                        UL(0b0010)
+
+#define ID_AA64PFR0_EL1_AdvSIMD                         GENMASK(23, 20)
+#define ID_AA64PFR0_EL1_AdvSIMD_MASK                    GENMASK(23, 20)
+#define ID_AA64PFR0_EL1_AdvSIMD_SHIFT                   20
+#define ID_AA64PFR0_EL1_AdvSIMD_WIDTH                   4
+#define ID_AA64PFR0_EL1_AdvSIMD_SIGNED                  true
+#define ID_AA64PFR0_EL1_AdvSIMD_IMP                     UL(0b0000)
+#define ID_AA64PFR0_EL1_AdvSIMD_FP16                    UL(0b0001)
+#define ID_AA64PFR0_EL1_AdvSIMD_NI                      UL(0b1111)
+
+#define ID_AA64PFR0_EL1_FP                              GENMASK(19, 16)
+#define ID_AA64PFR0_EL1_FP_MASK                         GENMASK(19, 16)
+#define ID_AA64PFR0_EL1_FP_SHIFT                        16
+#define ID_AA64PFR0_EL1_FP_WIDTH                        4
+#define ID_AA64PFR0_EL1_FP_SIGNED                       true
+#define ID_AA64PFR0_EL1_FP_IMP                          UL(0b0000)
+#define ID_AA64PFR0_EL1_FP_FP16                         UL(0b0001)
+#define ID_AA64PFR0_EL1_FP_NI                           UL(0b1111)
+
+#define ID_AA64PFR0_EL1_EL3                             GENMASK(15, 12)
+#define ID_AA64PFR0_EL1_EL3_MASK                        GENMASK(15, 12)
+#define ID_AA64PFR0_EL1_EL3_SHIFT                       12
+#define ID_AA64PFR0_EL1_EL3_WIDTH                       4
+#define ID_AA64PFR0_EL1_EL3_SIGNED                      false
+#define ID_AA64PFR0_EL1_EL3_NI                          UL(0b0000)
+#define ID_AA64PFR0_EL1_EL3_IMP                         UL(0b0001)
+#define ID_AA64PFR0_EL1_EL3_AARCH32                     UL(0b0010)
+
+#define ID_AA64PFR0_EL1_EL2                             GENMASK(11, 8)
+#define ID_AA64PFR0_EL1_EL2_MASK                        GENMASK(11, 8)
+#define ID_AA64PFR0_EL1_EL2_SHIFT                       8
+#define ID_AA64PFR0_EL1_EL2_WIDTH                       4
+#define ID_AA64PFR0_EL1_EL2_SIGNED                      false
+#define ID_AA64PFR0_EL1_EL2_NI                          UL(0b0000)
+#define ID_AA64PFR0_EL1_EL2_IMP                         UL(0b0001)
+#define ID_AA64PFR0_EL1_EL2_AARCH32                     UL(0b0010)
+
+#define ID_AA64PFR0_EL1_EL1                             GENMASK(7, 4)
+#define ID_AA64PFR0_EL1_EL1_MASK                        GENMASK(7, 4)
+#define ID_AA64PFR0_EL1_EL1_SHIFT                       4
+#define ID_AA64PFR0_EL1_EL1_WIDTH                       4
+#define ID_AA64PFR0_EL1_EL1_SIGNED                      false
+#define ID_AA64PFR0_EL1_EL1_IMP                         UL(0b0001)
+#define ID_AA64PFR0_EL1_EL1_AARCH32                     UL(0b0010)
+
+#define ID_AA64PFR0_EL1_EL0                             GENMASK(3, 0)
+#define ID_AA64PFR0_EL1_EL0_MASK                        GENMASK(3, 0)
+#define ID_AA64PFR0_EL1_EL0_SHIFT                       0
+#define ID_AA64PFR0_EL1_EL0_WIDTH                       4
+#define ID_AA64PFR0_EL1_EL0_SIGNED                      false
+#define ID_AA64PFR0_EL1_EL0_IMP                         UL(0b0001)
+#define ID_AA64PFR0_EL1_EL0_AARCH32                     UL(0b0010)
+
+#define ID_AA64PFR0_EL1_RES0                            (UL(0))
+#define ID_AA64PFR0_EL1_RES1                            (UL(0))
+#define ID_AA64PFR0_EL1_UNKN                            (UL(0))
+
+#define REG_ID_AA64PFR1_EL1                             S3_0_C0_C4_1
+#define SYS_ID_AA64PFR1_EL1                             sys_reg(3, 0, 0, 4, 1)
+#define SYS_ID_AA64PFR1_EL1_Op0                         3
+#define SYS_ID_AA64PFR1_EL1_Op1                         0
+#define SYS_ID_AA64PFR1_EL1_CRn                         0
+#define SYS_ID_AA64PFR1_EL1_CRm                         4
+#define SYS_ID_AA64PFR1_EL1_Op2                         1
+
+#define ID_AA64PFR1_EL1_PFAR                            GENMASK(63, 60)
+#define ID_AA64PFR1_EL1_PFAR_MASK                       GENMASK(63, 60)
+#define ID_AA64PFR1_EL1_PFAR_SHIFT                      60
+#define ID_AA64PFR1_EL1_PFAR_WIDTH                      4
+#define ID_AA64PFR1_EL1_PFAR_SIGNED                     false
+#define ID_AA64PFR1_EL1_PFAR_NI                         UL(0b0000)
+#define ID_AA64PFR1_EL1_PFAR_IMP                        UL(0b0001)
+
+#define ID_AA64PFR1_EL1_DF2                             GENMASK(59, 56)
+#define ID_AA64PFR1_EL1_DF2_MASK                        GENMASK(59, 56)
+#define ID_AA64PFR1_EL1_DF2_SHIFT                       56
+#define ID_AA64PFR1_EL1_DF2_WIDTH                       4
+#define ID_AA64PFR1_EL1_DF2_SIGNED                      false
+#define ID_AA64PFR1_EL1_DF2_NI                          UL(0b0000)
+#define ID_AA64PFR1_EL1_DF2_IMP                         UL(0b0001)
+
+#define ID_AA64PFR1_EL1_MTEX                            GENMASK(55, 52)
+#define ID_AA64PFR1_EL1_MTEX_MASK                       GENMASK(55, 52)
+#define ID_AA64PFR1_EL1_MTEX_SHIFT                      52
+#define ID_AA64PFR1_EL1_MTEX_WIDTH                      4
+#define ID_AA64PFR1_EL1_MTEX_SIGNED                     false
+#define ID_AA64PFR1_EL1_MTEX_MTE                        UL(0b0000)
+#define ID_AA64PFR1_EL1_MTEX_MTE4                       UL(0b0001)
+
+#define ID_AA64PFR1_EL1_THE                             GENMASK(51, 48)
+#define ID_AA64PFR1_EL1_THE_MASK                        GENMASK(51, 48)
+#define ID_AA64PFR1_EL1_THE_SHIFT                       48
+#define ID_AA64PFR1_EL1_THE_WIDTH                       4
+#define ID_AA64PFR1_EL1_THE_SIGNED                      false
+#define ID_AA64PFR1_EL1_THE_NI                          UL(0b0000)
+#define ID_AA64PFR1_EL1_THE_IMP                         UL(0b0001)
+
+#define ID_AA64PFR1_EL1_GCS                             GENMASK(47, 44)
+#define ID_AA64PFR1_EL1_GCS_MASK                        GENMASK(47, 44)
+#define ID_AA64PFR1_EL1_GCS_SHIFT                       44
+#define ID_AA64PFR1_EL1_GCS_WIDTH                       4
+#define ID_AA64PFR1_EL1_GCS_SIGNED                      false
+#define ID_AA64PFR1_EL1_GCS_NI                          UL(0b0000)
+#define ID_AA64PFR1_EL1_GCS_IMP                         UL(0b0001)
+
+#define ID_AA64PFR1_EL1_MTE_frac                        GENMASK(43, 40)
+#define ID_AA64PFR1_EL1_MTE_frac_MASK                   GENMASK(43, 40)
+#define ID_AA64PFR1_EL1_MTE_frac_SHIFT                  40
+#define ID_AA64PFR1_EL1_MTE_frac_WIDTH                  4
+#define ID_AA64PFR1_EL1_MTE_frac_ASYNC                  UL(0b0000)
+#define ID_AA64PFR1_EL1_MTE_frac_NI                     UL(0b1111)
+
+#define ID_AA64PFR1_EL1_NMI                             GENMASK(39, 36)
+#define ID_AA64PFR1_EL1_NMI_MASK                        GENMASK(39, 36)
+#define ID_AA64PFR1_EL1_NMI_SHIFT                       36
+#define ID_AA64PFR1_EL1_NMI_WIDTH                       4
+#define ID_AA64PFR1_EL1_NMI_SIGNED                      false
+#define ID_AA64PFR1_EL1_NMI_NI                          UL(0b0000)
+#define ID_AA64PFR1_EL1_NMI_IMP                         UL(0b0001)
+
+#define ID_AA64PFR1_EL1_CSV2_frac                       GENMASK(35, 32)
+#define ID_AA64PFR1_EL1_CSV2_frac_MASK                  GENMASK(35, 32)
+#define ID_AA64PFR1_EL1_CSV2_frac_SHIFT                 32
+#define ID_AA64PFR1_EL1_CSV2_frac_WIDTH                 4
+#define ID_AA64PFR1_EL1_CSV2_frac_SIGNED                false
+#define ID_AA64PFR1_EL1_CSV2_frac_NI                    UL(0b0000)
+#define ID_AA64PFR1_EL1_CSV2_frac_CSV2_1p1              UL(0b0001)
+#define ID_AA64PFR1_EL1_CSV2_frac_CSV2_1p2              UL(0b0010)
+
+#define ID_AA64PFR1_EL1_RNDR_trap                       GENMASK(31, 28)
+#define ID_AA64PFR1_EL1_RNDR_trap_MASK                  GENMASK(31, 28)
+#define ID_AA64PFR1_EL1_RNDR_trap_SHIFT                 28
+#define ID_AA64PFR1_EL1_RNDR_trap_WIDTH                 4
+#define ID_AA64PFR1_EL1_RNDR_trap_SIGNED                false
+#define ID_AA64PFR1_EL1_RNDR_trap_NI                    UL(0b0000)
+#define ID_AA64PFR1_EL1_RNDR_trap_IMP                   UL(0b0001)
+
+#define ID_AA64PFR1_EL1_SME                             GENMASK(27, 24)
+#define ID_AA64PFR1_EL1_SME_MASK                        GENMASK(27, 24)
+#define ID_AA64PFR1_EL1_SME_SHIFT                       24
+#define ID_AA64PFR1_EL1_SME_WIDTH                       4
+#define ID_AA64PFR1_EL1_SME_SIGNED                      false
+#define ID_AA64PFR1_EL1_SME_NI                          UL(0b0000)
+#define ID_AA64PFR1_EL1_SME_IMP                         UL(0b0001)
+#define ID_AA64PFR1_EL1_SME_SME2                        UL(0b0010)
+
+#define ID_AA64PFR1_EL1_MPAM_frac                       GENMASK(19, 16)
+#define ID_AA64PFR1_EL1_MPAM_frac_MASK                  GENMASK(19, 16)
+#define ID_AA64PFR1_EL1_MPAM_frac_SHIFT                 16
+#define ID_AA64PFR1_EL1_MPAM_frac_WIDTH                 4
+#define ID_AA64PFR1_EL1_MPAM_frac_SIGNED                false
+#define ID_AA64PFR1_EL1_MPAM_frac_MINOR_0               UL(0b0000)
+#define ID_AA64PFR1_EL1_MPAM_frac_MINOR_1               UL(0b0001)
+
+#define ID_AA64PFR1_EL1_RAS_frac                        GENMASK(15, 12)
+#define ID_AA64PFR1_EL1_RAS_frac_MASK                   GENMASK(15, 12)
+#define ID_AA64PFR1_EL1_RAS_frac_SHIFT                  12
+#define ID_AA64PFR1_EL1_RAS_frac_WIDTH                  4
+#define ID_AA64PFR1_EL1_RAS_frac_SIGNED                 false
+#define ID_AA64PFR1_EL1_RAS_frac_NI                     UL(0b0000)
+#define ID_AA64PFR1_EL1_RAS_frac_RASv1p1                UL(0b0001)
+
+#define ID_AA64PFR1_EL1_MTE                             GENMASK(11, 8)
+#define ID_AA64PFR1_EL1_MTE_MASK                        GENMASK(11, 8)
+#define ID_AA64PFR1_EL1_MTE_SHIFT                       8
+#define ID_AA64PFR1_EL1_MTE_WIDTH                       4
+#define ID_AA64PFR1_EL1_MTE_SIGNED                      false
+#define ID_AA64PFR1_EL1_MTE_NI                          UL(0b0000)
+#define ID_AA64PFR1_EL1_MTE_IMP                         UL(0b0001)
+#define ID_AA64PFR1_EL1_MTE_MTE2                        UL(0b0010)
+#define ID_AA64PFR1_EL1_MTE_MTE3                        UL(0b0011)
+
+#define ID_AA64PFR1_EL1_SSBS                            GENMASK(7, 4)
+#define ID_AA64PFR1_EL1_SSBS_MASK                       GENMASK(7, 4)
+#define ID_AA64PFR1_EL1_SSBS_SHIFT                      4
+#define ID_AA64PFR1_EL1_SSBS_WIDTH                      4
+#define ID_AA64PFR1_EL1_SSBS_SIGNED                     false
+#define ID_AA64PFR1_EL1_SSBS_NI                         UL(0b0000)
+#define ID_AA64PFR1_EL1_SSBS_IMP                        UL(0b0001)
+#define ID_AA64PFR1_EL1_SSBS_SSBS2                      UL(0b0010)
+
+#define ID_AA64PFR1_EL1_BT                              GENMASK(3, 0)
+#define ID_AA64PFR1_EL1_BT_MASK                         GENMASK(3, 0)
+#define ID_AA64PFR1_EL1_BT_SHIFT                        0
+#define ID_AA64PFR1_EL1_BT_WIDTH                        4
+#define ID_AA64PFR1_EL1_BT_SIGNED                       false
+#define ID_AA64PFR1_EL1_BT_NI                           UL(0b0000)
+#define ID_AA64PFR1_EL1_BT_IMP                          UL(0b0001)
+
+#define ID_AA64PFR1_EL1_RES0                            (UL(0) | GENMASK_ULL(23, 20))
+#define ID_AA64PFR1_EL1_RES1                            (UL(0))
+#define ID_AA64PFR1_EL1_UNKN                            (UL(0))
+
+#define REG_ID_AA64ZFR0_EL1                             S3_0_C0_C4_4
+#define SYS_ID_AA64ZFR0_EL1                             sys_reg(3, 0, 0, 4, 4)
+#define SYS_ID_AA64ZFR0_EL1_Op0                         3
+#define SYS_ID_AA64ZFR0_EL1_Op1                         0
+#define SYS_ID_AA64ZFR0_EL1_CRn                         0
+#define SYS_ID_AA64ZFR0_EL1_CRm                         4
+#define SYS_ID_AA64ZFR0_EL1_Op2                         4
+
+#define ID_AA64ZFR0_EL1_F64MM                           GENMASK(59, 56)
+#define ID_AA64ZFR0_EL1_F64MM_MASK                      GENMASK(59, 56)
+#define ID_AA64ZFR0_EL1_F64MM_SHIFT                     56
+#define ID_AA64ZFR0_EL1_F64MM_WIDTH                     4
+#define ID_AA64ZFR0_EL1_F64MM_SIGNED                    false
+#define ID_AA64ZFR0_EL1_F64MM_NI                        UL(0b0000)
+#define ID_AA64ZFR0_EL1_F64MM_IMP                       UL(0b0001)
+
+#define ID_AA64ZFR0_EL1_F32MM                           GENMASK(55, 52)
+#define ID_AA64ZFR0_EL1_F32MM_MASK                      GENMASK(55, 52)
+#define ID_AA64ZFR0_EL1_F32MM_SHIFT                     52
+#define ID_AA64ZFR0_EL1_F32MM_WIDTH                     4
+#define ID_AA64ZFR0_EL1_F32MM_SIGNED                    false
+#define ID_AA64ZFR0_EL1_F32MM_NI                        UL(0b0000)
+#define ID_AA64ZFR0_EL1_F32MM_IMP                       UL(0b0001)
+
+#define ID_AA64ZFR0_EL1_I8MM                            GENMASK(47, 44)
+#define ID_AA64ZFR0_EL1_I8MM_MASK                       GENMASK(47, 44)
+#define ID_AA64ZFR0_EL1_I8MM_SHIFT                      44
+#define ID_AA64ZFR0_EL1_I8MM_WIDTH                      4
+#define ID_AA64ZFR0_EL1_I8MM_SIGNED                     false
+#define ID_AA64ZFR0_EL1_I8MM_NI                         UL(0b0000)
+#define ID_AA64ZFR0_EL1_I8MM_IMP                        UL(0b0001)
+
+#define ID_AA64ZFR0_EL1_SM4                             GENMASK(43, 40)
+#define ID_AA64ZFR0_EL1_SM4_MASK                        GENMASK(43, 40)
+#define ID_AA64ZFR0_EL1_SM4_SHIFT                       40
+#define ID_AA64ZFR0_EL1_SM4_WIDTH                       4
+#define ID_AA64ZFR0_EL1_SM4_SIGNED                      false
+#define ID_AA64ZFR0_EL1_SM4_NI                          UL(0b0000)
+#define ID_AA64ZFR0_EL1_SM4_IMP                         UL(0b0001)
+
+#define ID_AA64ZFR0_EL1_SHA3                            GENMASK(35, 32)
+#define ID_AA64ZFR0_EL1_SHA3_MASK                       GENMASK(35, 32)
+#define ID_AA64ZFR0_EL1_SHA3_SHIFT                      32
+#define ID_AA64ZFR0_EL1_SHA3_WIDTH                      4
+#define ID_AA64ZFR0_EL1_SHA3_SIGNED                     false
+#define ID_AA64ZFR0_EL1_SHA3_NI                         UL(0b0000)
+#define ID_AA64ZFR0_EL1_SHA3_IMP                        UL(0b0001)
+
+#define ID_AA64ZFR0_EL1_BF16                            GENMASK(23, 20)
+#define ID_AA64ZFR0_EL1_BF16_MASK                       GENMASK(23, 20)
+#define ID_AA64ZFR0_EL1_BF16_SHIFT                      20
+#define ID_AA64ZFR0_EL1_BF16_WIDTH                      4
+#define ID_AA64ZFR0_EL1_BF16_SIGNED                     false
+#define ID_AA64ZFR0_EL1_BF16_NI                         UL(0b0000)
+#define ID_AA64ZFR0_EL1_BF16_IMP                        UL(0b0001)
+#define ID_AA64ZFR0_EL1_BF16_EBF16                      UL(0b0010)
+
+#define ID_AA64ZFR0_EL1_BitPerm                         GENMASK(19, 16)
+#define ID_AA64ZFR0_EL1_BitPerm_MASK                    GENMASK(19, 16)
+#define ID_AA64ZFR0_EL1_BitPerm_SHIFT                   16
+#define ID_AA64ZFR0_EL1_BitPerm_WIDTH                   4
+#define ID_AA64ZFR0_EL1_BitPerm_SIGNED                  false
+#define ID_AA64ZFR0_EL1_BitPerm_NI                      UL(0b0000)
+#define ID_AA64ZFR0_EL1_BitPerm_IMP                     UL(0b0001)
+
+#define ID_AA64ZFR0_EL1_AES                             GENMASK(7, 4)
+#define ID_AA64ZFR0_EL1_AES_MASK                        GENMASK(7, 4)
+#define ID_AA64ZFR0_EL1_AES_SHIFT                       4
+#define ID_AA64ZFR0_EL1_AES_WIDTH                       4
+#define ID_AA64ZFR0_EL1_AES_SIGNED                      false
+#define ID_AA64ZFR0_EL1_AES_NI                          UL(0b0000)
+#define ID_AA64ZFR0_EL1_AES_IMP                         UL(0b0001)
+#define ID_AA64ZFR0_EL1_AES_PMULL128                    UL(0b0010)
+
+#define ID_AA64ZFR0_EL1_SVEver                          GENMASK(3, 0)
+#define ID_AA64ZFR0_EL1_SVEver_MASK                     GENMASK(3, 0)
+#define ID_AA64ZFR0_EL1_SVEver_SHIFT                    0
+#define ID_AA64ZFR0_EL1_SVEver_WIDTH                    4
+#define ID_AA64ZFR0_EL1_SVEver_SIGNED                   false
+#define ID_AA64ZFR0_EL1_SVEver_IMP                      UL(0b0000)
+#define ID_AA64ZFR0_EL1_SVEver_SVE2                     UL(0b0001)
+#define ID_AA64ZFR0_EL1_SVEver_SVE2p1                   UL(0b0010)
+
+#define ID_AA64ZFR0_EL1_RES0                            (UL(0) | GENMASK_ULL(63, 60) | GENMASK_ULL(51, 48) | GENMASK_ULL(39, 36) | GENMASK_ULL(31, 24) | GENMASK_ULL(15, 8))
+#define ID_AA64ZFR0_EL1_RES1                            (UL(0))
+#define ID_AA64ZFR0_EL1_UNKN                            (UL(0))
+
+#define REG_ID_AA64SMFR0_EL1                            S3_0_C0_C4_5
+#define SYS_ID_AA64SMFR0_EL1                            sys_reg(3, 0, 0, 4, 5)
+#define SYS_ID_AA64SMFR0_EL1_Op0                        3
+#define SYS_ID_AA64SMFR0_EL1_Op1                        0
+#define SYS_ID_AA64SMFR0_EL1_CRn                        0
+#define SYS_ID_AA64SMFR0_EL1_CRm                        4
+#define SYS_ID_AA64SMFR0_EL1_Op2                        5
+
+#define ID_AA64SMFR0_EL1_FA64                           GENMASK(63, 63)
+#define ID_AA64SMFR0_EL1_FA64_MASK                      GENMASK(63, 63)
+#define ID_AA64SMFR0_EL1_FA64_SHIFT                     63
+#define ID_AA64SMFR0_EL1_FA64_WIDTH                     1
+#define ID_AA64SMFR0_EL1_FA64_SIGNED                    false
+#define ID_AA64SMFR0_EL1_FA64_NI                        UL(0b0)
+#define ID_AA64SMFR0_EL1_FA64_IMP                       UL(0b1)
+
+#define ID_AA64SMFR0_EL1_SMEver                         GENMASK(59, 56)
+#define ID_AA64SMFR0_EL1_SMEver_MASK                    GENMASK(59, 56)
+#define ID_AA64SMFR0_EL1_SMEver_SHIFT                   56
+#define ID_AA64SMFR0_EL1_SMEver_WIDTH                   4
+#define ID_AA64SMFR0_EL1_SMEver_SIGNED                  false
+#define ID_AA64SMFR0_EL1_SMEver_SME                     UL(0b0000)
+#define ID_AA64SMFR0_EL1_SMEver_SME2                    UL(0b0001)
+#define ID_AA64SMFR0_EL1_SMEver_SME2p1                  UL(0b0010)
+#define ID_AA64SMFR0_EL1_SMEver_IMP                     UL(0b0000)
+
+#define ID_AA64SMFR0_EL1_I16I64                         GENMASK(55, 52)
+#define ID_AA64SMFR0_EL1_I16I64_MASK                    GENMASK(55, 52)
+#define ID_AA64SMFR0_EL1_I16I64_SHIFT                   52
+#define ID_AA64SMFR0_EL1_I16I64_WIDTH                   4
+#define ID_AA64SMFR0_EL1_I16I64_SIGNED                  false
+#define ID_AA64SMFR0_EL1_I16I64_NI                      UL(0b0000)
+#define ID_AA64SMFR0_EL1_I16I64_IMP                     UL(0b1111)
+
+#define ID_AA64SMFR0_EL1_F64F64                         GENMASK(48, 48)
+#define ID_AA64SMFR0_EL1_F64F64_MASK                    GENMASK(48, 48)
+#define ID_AA64SMFR0_EL1_F64F64_SHIFT                   48
+#define ID_AA64SMFR0_EL1_F64F64_WIDTH                   1
+#define ID_AA64SMFR0_EL1_F64F64_SIGNED                  false
+#define ID_AA64SMFR0_EL1_F64F64_NI                      UL(0b0)
+#define ID_AA64SMFR0_EL1_F64F64_IMP                     UL(0b1)
+
+#define ID_AA64SMFR0_EL1_I16I32                         GENMASK(47, 44)
+#define ID_AA64SMFR0_EL1_I16I32_MASK                    GENMASK(47, 44)
+#define ID_AA64SMFR0_EL1_I16I32_SHIFT                   44
+#define ID_AA64SMFR0_EL1_I16I32_WIDTH                   4
+#define ID_AA64SMFR0_EL1_I16I32_SIGNED                  false
+#define ID_AA64SMFR0_EL1_I16I32_NI                      UL(0b0000)
+#define ID_AA64SMFR0_EL1_I16I32_IMP                     UL(0b0101)
+
+#define ID_AA64SMFR0_EL1_B16B16                         GENMASK(43, 43)
+#define ID_AA64SMFR0_EL1_B16B16_MASK                    GENMASK(43, 43)
+#define ID_AA64SMFR0_EL1_B16B16_SHIFT                   43
+#define ID_AA64SMFR0_EL1_B16B16_WIDTH                   1
+#define ID_AA64SMFR0_EL1_B16B16_SIGNED                  false
+#define ID_AA64SMFR0_EL1_B16B16_NI                      UL(0b0)
+#define ID_AA64SMFR0_EL1_B16B16_IMP                     UL(0b1)
+
+#define ID_AA64SMFR0_EL1_F16F16                         GENMASK(42, 42)
+#define ID_AA64SMFR0_EL1_F16F16_MASK                    GENMASK(42, 42)
+#define ID_AA64SMFR0_EL1_F16F16_SHIFT                   42
+#define ID_AA64SMFR0_EL1_F16F16_WIDTH                   1
+#define ID_AA64SMFR0_EL1_F16F16_SIGNED                  false
+#define ID_AA64SMFR0_EL1_F16F16_NI                      UL(0b0)
+#define ID_AA64SMFR0_EL1_F16F16_IMP                     UL(0b1)
+
+#define ID_AA64SMFR0_EL1_I8I32                          GENMASK(39, 36)
+#define ID_AA64SMFR0_EL1_I8I32_MASK                     GENMASK(39, 36)
+#define ID_AA64SMFR0_EL1_I8I32_SHIFT                    36
+#define ID_AA64SMFR0_EL1_I8I32_WIDTH                    4
+#define ID_AA64SMFR0_EL1_I8I32_SIGNED                   false
+#define ID_AA64SMFR0_EL1_I8I32_NI                       UL(0b0000)
+#define ID_AA64SMFR0_EL1_I8I32_IMP                      UL(0b1111)
+
+#define ID_AA64SMFR0_EL1_F16F32                         GENMASK(35, 35)
+#define ID_AA64SMFR0_EL1_F16F32_MASK                    GENMASK(35, 35)
+#define ID_AA64SMFR0_EL1_F16F32_SHIFT                   35
+#define ID_AA64SMFR0_EL1_F16F32_WIDTH                   1
+#define ID_AA64SMFR0_EL1_F16F32_SIGNED                  false
+#define ID_AA64SMFR0_EL1_F16F32_NI                      UL(0b0)
+#define ID_AA64SMFR0_EL1_F16F32_IMP                     UL(0b1)
+
+#define ID_AA64SMFR0_EL1_B16F32                         GENMASK(34, 34)
+#define ID_AA64SMFR0_EL1_B16F32_MASK                    GENMASK(34, 34)
+#define ID_AA64SMFR0_EL1_B16F32_SHIFT                   34
+#define ID_AA64SMFR0_EL1_B16F32_WIDTH                   1
+#define ID_AA64SMFR0_EL1_B16F32_SIGNED                  false
+#define ID_AA64SMFR0_EL1_B16F32_NI                      UL(0b0)
+#define ID_AA64SMFR0_EL1_B16F32_IMP                     UL(0b1)
+
+#define ID_AA64SMFR0_EL1_BI32I32                        GENMASK(33, 33)
+#define ID_AA64SMFR0_EL1_BI32I32_MASK                   GENMASK(33, 33)
+#define ID_AA64SMFR0_EL1_BI32I32_SHIFT                  33
+#define ID_AA64SMFR0_EL1_BI32I32_WIDTH                  1
+#define ID_AA64SMFR0_EL1_BI32I32_SIGNED                 false
+#define ID_AA64SMFR0_EL1_BI32I32_NI                     UL(0b0)
+#define ID_AA64SMFR0_EL1_BI32I32_IMP                    UL(0b1)
+
+#define ID_AA64SMFR0_EL1_F32F32                         GENMASK(32, 32)
+#define ID_AA64SMFR0_EL1_F32F32_MASK                    GENMASK(32, 32)
+#define ID_AA64SMFR0_EL1_F32F32_SHIFT                   32
+#define ID_AA64SMFR0_EL1_F32F32_WIDTH                   1
+#define ID_AA64SMFR0_EL1_F32F32_SIGNED                  false
+#define ID_AA64SMFR0_EL1_F32F32_NI                      UL(0b0)
+#define ID_AA64SMFR0_EL1_F32F32_IMP                     UL(0b1)
+
+#define ID_AA64SMFR0_EL1_RES0                           (UL(0) | GENMASK_ULL(62, 60) | GENMASK_ULL(51, 49) | GENMASK_ULL(41, 40) | GENMASK_ULL(31, 0))
+#define ID_AA64SMFR0_EL1_RES1                           (UL(0))
+#define ID_AA64SMFR0_EL1_UNKN                           (UL(0))
+
+#define REG_ID_AA64DFR0_EL1                             S3_0_C0_C5_0
+#define SYS_ID_AA64DFR0_EL1                             sys_reg(3, 0, 0, 5, 0)
+#define SYS_ID_AA64DFR0_EL1_Op0                         3
+#define SYS_ID_AA64DFR0_EL1_Op1                         0
+#define SYS_ID_AA64DFR0_EL1_CRn                         0
+#define SYS_ID_AA64DFR0_EL1_CRm                         5
+#define SYS_ID_AA64DFR0_EL1_Op2                         0
+
+#define ID_AA64DFR0_EL1_HPMN0                           GENMASK(63, 60)
+#define ID_AA64DFR0_EL1_HPMN0_MASK                      GENMASK(63, 60)
+#define ID_AA64DFR0_EL1_HPMN0_SHIFT                     60
+#define ID_AA64DFR0_EL1_HPMN0_WIDTH                     4
+#define ID_AA64DFR0_EL1_HPMN0_UNPREDICTABLE             UL(0b0000)
+#define ID_AA64DFR0_EL1_HPMN0_DEF                       UL(0b0001)
+
+#define ID_AA64DFR0_EL1_BRBE                            GENMASK(55, 52)
+#define ID_AA64DFR0_EL1_BRBE_MASK                       GENMASK(55, 52)
+#define ID_AA64DFR0_EL1_BRBE_SHIFT                      52
+#define ID_AA64DFR0_EL1_BRBE_WIDTH                      4
+#define ID_AA64DFR0_EL1_BRBE_SIGNED                     false
+#define ID_AA64DFR0_EL1_BRBE_NI                         UL(0b0000)
+#define ID_AA64DFR0_EL1_BRBE_IMP                        UL(0b0001)
+#define ID_AA64DFR0_EL1_BRBE_BRBE_V1P1                  UL(0b0010)
+
+#define ID_AA64DFR0_EL1_MTPMU                           GENMASK(51, 48)
+#define ID_AA64DFR0_EL1_MTPMU_MASK                      GENMASK(51, 48)
+#define ID_AA64DFR0_EL1_MTPMU_SHIFT                     48
+#define ID_AA64DFR0_EL1_MTPMU_WIDTH                     4
+#define ID_AA64DFR0_EL1_MTPMU_NI_IMPDEF                 UL(0b0000)
+#define ID_AA64DFR0_EL1_MTPMU_IMP                       UL(0b0001)
+#define ID_AA64DFR0_EL1_MTPMU_NI                        UL(0b1111)
+
+#define ID_AA64DFR0_EL1_TraceBuffer                     GENMASK(47, 44)
+#define ID_AA64DFR0_EL1_TraceBuffer_MASK                GENMASK(47, 44)
+#define ID_AA64DFR0_EL1_TraceBuffer_SHIFT               44
+#define ID_AA64DFR0_EL1_TraceBuffer_WIDTH               4
+#define ID_AA64DFR0_EL1_TraceBuffer_SIGNED              false
+#define ID_AA64DFR0_EL1_TraceBuffer_NI                  UL(0b0000)
+#define ID_AA64DFR0_EL1_TraceBuffer_IMP                 UL(0b0001)
+
+#define ID_AA64DFR0_EL1_TraceFilt                       GENMASK(43, 40)
+#define ID_AA64DFR0_EL1_TraceFilt_MASK                  GENMASK(43, 40)
+#define ID_AA64DFR0_EL1_TraceFilt_SHIFT                 40
+#define ID_AA64DFR0_EL1_TraceFilt_WIDTH                 4
+#define ID_AA64DFR0_EL1_TraceFilt_SIGNED                false
+#define ID_AA64DFR0_EL1_TraceFilt_NI                    UL(0b0000)
+#define ID_AA64DFR0_EL1_TraceFilt_IMP                   UL(0b0001)
+
+#define ID_AA64DFR0_EL1_DoubleLock                      GENMASK(39, 36)
+#define ID_AA64DFR0_EL1_DoubleLock_MASK                 GENMASK(39, 36)
+#define ID_AA64DFR0_EL1_DoubleLock_SHIFT                36
+#define ID_AA64DFR0_EL1_DoubleLock_WIDTH                4
+#define ID_AA64DFR0_EL1_DoubleLock_SIGNED               false
+#define ID_AA64DFR0_EL1_DoubleLock_IMP                  UL(0b0000)
+#define ID_AA64DFR0_EL1_DoubleLock_NI                   UL(0b1111)
+
+#define ID_AA64DFR0_EL1_PMSVer                          GENMASK(35, 32)
+#define ID_AA64DFR0_EL1_PMSVer_MASK                     GENMASK(35, 32)
+#define ID_AA64DFR0_EL1_PMSVer_SHIFT                    32
+#define ID_AA64DFR0_EL1_PMSVer_WIDTH                    4
+#define ID_AA64DFR0_EL1_PMSVer_SIGNED                   false
+#define ID_AA64DFR0_EL1_PMSVer_NI                       UL(0b0000)
+#define ID_AA64DFR0_EL1_PMSVer_IMP                      UL(0b0001)
+#define ID_AA64DFR0_EL1_PMSVer_V1P1                     UL(0b0010)
+#define ID_AA64DFR0_EL1_PMSVer_V1P2                     UL(0b0011)
+#define ID_AA64DFR0_EL1_PMSVer_V1P3                     UL(0b0100)
+
+#define ID_AA64DFR0_EL1_CTX_CMPs                        GENMASK(31, 28)
+#define ID_AA64DFR0_EL1_CTX_CMPs_MASK                   GENMASK(31, 28)
+#define ID_AA64DFR0_EL1_CTX_CMPs_SHIFT                  28
+#define ID_AA64DFR0_EL1_CTX_CMPs_WIDTH                  4
+
+#define ID_AA64DFR0_EL1_WRPs                            GENMASK(23, 20)
+#define ID_AA64DFR0_EL1_WRPs_MASK                       GENMASK(23, 20)
+#define ID_AA64DFR0_EL1_WRPs_SHIFT                      20
+#define ID_AA64DFR0_EL1_WRPs_WIDTH                      4
+
+#define ID_AA64DFR0_EL1_BRPs                            GENMASK(15, 12)
+#define ID_AA64DFR0_EL1_BRPs_MASK                       GENMASK(15, 12)
+#define ID_AA64DFR0_EL1_BRPs_SHIFT                      12
+#define ID_AA64DFR0_EL1_BRPs_WIDTH                      4
+
+#define ID_AA64DFR0_EL1_PMUVer                          GENMASK(11, 8)
+#define ID_AA64DFR0_EL1_PMUVer_MASK                     GENMASK(11, 8)
+#define ID_AA64DFR0_EL1_PMUVer_SHIFT                    8
+#define ID_AA64DFR0_EL1_PMUVer_WIDTH                    4
+#define ID_AA64DFR0_EL1_PMUVer_SIGNED                   false
+#define ID_AA64DFR0_EL1_PMUVer_NI                       UL(0b0000)
+#define ID_AA64DFR0_EL1_PMUVer_IMP                      UL(0b0001)
+#define ID_AA64DFR0_EL1_PMUVer_V3P1                     UL(0b0100)
+#define ID_AA64DFR0_EL1_PMUVer_V3P4                     UL(0b0101)
+#define ID_AA64DFR0_EL1_PMUVer_V3P5                     UL(0b0110)
+#define ID_AA64DFR0_EL1_PMUVer_V3P7                     UL(0b0111)
+#define ID_AA64DFR0_EL1_PMUVer_V3P8                     UL(0b1000)
+#define ID_AA64DFR0_EL1_PMUVer_IMP_DEF                  UL(0b1111)
+
+#define ID_AA64DFR0_EL1_TraceVer                        GENMASK(7, 4)
+#define ID_AA64DFR0_EL1_TraceVer_MASK                   GENMASK(7, 4)
+#define ID_AA64DFR0_EL1_TraceVer_SHIFT                  4
+#define ID_AA64DFR0_EL1_TraceVer_WIDTH                  4
+#define ID_AA64DFR0_EL1_TraceVer_SIGNED                 false
+#define ID_AA64DFR0_EL1_TraceVer_NI                     UL(0b0000)
+#define ID_AA64DFR0_EL1_TraceVer_IMP                    UL(0b0001)
+
+#define ID_AA64DFR0_EL1_DebugVer                        GENMASK(3, 0)
+#define ID_AA64DFR0_EL1_DebugVer_MASK                   GENMASK(3, 0)
+#define ID_AA64DFR0_EL1_DebugVer_SHIFT                  0
+#define ID_AA64DFR0_EL1_DebugVer_WIDTH                  4
+#define ID_AA64DFR0_EL1_DebugVer_SIGNED                 false
+#define ID_AA64DFR0_EL1_DebugVer_IMP                    UL(0b0110)
+#define ID_AA64DFR0_EL1_DebugVer_VHE                    UL(0b0111)
+#define ID_AA64DFR0_EL1_DebugVer_V8P2                   UL(0b1000)
+#define ID_AA64DFR0_EL1_DebugVer_V8P4                   UL(0b1001)
+#define ID_AA64DFR0_EL1_DebugVer_V8P8                   UL(0b1010)
+
+#define ID_AA64DFR0_EL1_RES0                            (UL(0) | GENMASK_ULL(59, 56) | GENMASK_ULL(27, 24) | GENMASK_ULL(19, 16))
+#define ID_AA64DFR0_EL1_RES1                            (UL(0))
+#define ID_AA64DFR0_EL1_UNKN                            (UL(0))
+
+#define REG_ID_AA64DFR1_EL1                             S3_0_C0_C5_1
+#define SYS_ID_AA64DFR1_EL1                             sys_reg(3, 0, 0, 5, 1)
+#define SYS_ID_AA64DFR1_EL1_Op0                         3
+#define SYS_ID_AA64DFR1_EL1_Op1                         0
+#define SYS_ID_AA64DFR1_EL1_CRn                         0
+#define SYS_ID_AA64DFR1_EL1_CRm                         5
+#define SYS_ID_AA64DFR1_EL1_Op2                         1
+
+#define ID_AA64DFR1_EL1_RES0                            (UL(0) | GENMASK_ULL(63, 0))
+#define ID_AA64DFR1_EL1_RES1                            (UL(0))
+#define ID_AA64DFR1_EL1_UNKN                            (UL(0))
+
+#define REG_ID_AA64AFR0_EL1                             S3_0_C0_C5_4
+#define SYS_ID_AA64AFR0_EL1                             sys_reg(3, 0, 0, 5, 4)
+#define SYS_ID_AA64AFR0_EL1_Op0                         3
+#define SYS_ID_AA64AFR0_EL1_Op1                         0
+#define SYS_ID_AA64AFR0_EL1_CRn                         0
+#define SYS_ID_AA64AFR0_EL1_CRm                         5
+#define SYS_ID_AA64AFR0_EL1_Op2                         4
+
+#define ID_AA64AFR0_EL1_IMPDEF7                         GENMASK(31, 28)
+#define ID_AA64AFR0_EL1_IMPDEF7_MASK                    GENMASK(31, 28)
+#define ID_AA64AFR0_EL1_IMPDEF7_SHIFT                   28
+#define ID_AA64AFR0_EL1_IMPDEF7_WIDTH                   4
+
+#define ID_AA64AFR0_EL1_IMPDEF6                         GENMASK(27, 24)
+#define ID_AA64AFR0_EL1_IMPDEF6_MASK                    GENMASK(27, 24)
+#define ID_AA64AFR0_EL1_IMPDEF6_SHIFT                   24
+#define ID_AA64AFR0_EL1_IMPDEF6_WIDTH                   4
+
+#define ID_AA64AFR0_EL1_IMPDEF5                         GENMASK(23, 20)
+#define ID_AA64AFR0_EL1_IMPDEF5_MASK                    GENMASK(23, 20)
+#define ID_AA64AFR0_EL1_IMPDEF5_SHIFT                   20
+#define ID_AA64AFR0_EL1_IMPDEF5_WIDTH                   4
+
+#define ID_AA64AFR0_EL1_IMPDEF4                         GENMASK(19, 16)
+#define ID_AA64AFR0_EL1_IMPDEF4_MASK                    GENMASK(19, 16)
+#define ID_AA64AFR0_EL1_IMPDEF4_SHIFT                   16
+#define ID_AA64AFR0_EL1_IMPDEF4_WIDTH                   4
+
+#define ID_AA64AFR0_EL1_IMPDEF3                         GENMASK(15, 12)
+#define ID_AA64AFR0_EL1_IMPDEF3_MASK                    GENMASK(15, 12)
+#define ID_AA64AFR0_EL1_IMPDEF3_SHIFT                   12
+#define ID_AA64AFR0_EL1_IMPDEF3_WIDTH                   4
+
+#define ID_AA64AFR0_EL1_IMPDEF2                         GENMASK(11, 8)
+#define ID_AA64AFR0_EL1_IMPDEF2_MASK                    GENMASK(11, 8)
+#define ID_AA64AFR0_EL1_IMPDEF2_SHIFT                   8
+#define ID_AA64AFR0_EL1_IMPDEF2_WIDTH                   4
+
+#define ID_AA64AFR0_EL1_IMPDEF1                         GENMASK(7, 4)
+#define ID_AA64AFR0_EL1_IMPDEF1_MASK                    GENMASK(7, 4)
+#define ID_AA64AFR0_EL1_IMPDEF1_SHIFT                   4
+#define ID_AA64AFR0_EL1_IMPDEF1_WIDTH                   4
+
+#define ID_AA64AFR0_EL1_IMPDEF0                         GENMASK(3, 0)
+#define ID_AA64AFR0_EL1_IMPDEF0_MASK                    GENMASK(3, 0)
+#define ID_AA64AFR0_EL1_IMPDEF0_SHIFT                   0
+#define ID_AA64AFR0_EL1_IMPDEF0_WIDTH                   4
+
+#define ID_AA64AFR0_EL1_RES0                            (UL(0) | GENMASK_ULL(63, 32))
+#define ID_AA64AFR0_EL1_RES1                            (UL(0))
+#define ID_AA64AFR0_EL1_UNKN                            (UL(0))
+
+#define REG_ID_AA64AFR1_EL1                             S3_0_C0_C5_5
+#define SYS_ID_AA64AFR1_EL1                             sys_reg(3, 0, 0, 5, 5)
+#define SYS_ID_AA64AFR1_EL1_Op0                         3
+#define SYS_ID_AA64AFR1_EL1_Op1                         0
+#define SYS_ID_AA64AFR1_EL1_CRn                         0
+#define SYS_ID_AA64AFR1_EL1_CRm                         5
+#define SYS_ID_AA64AFR1_EL1_Op2                         5
+
+#define ID_AA64AFR1_EL1_RES0                            (UL(0) | GENMASK_ULL(63, 0))
+#define ID_AA64AFR1_EL1_RES1                            (UL(0))
+#define ID_AA64AFR1_EL1_UNKN                            (UL(0))
+
+#define REG_ID_AA64ISAR0_EL1                            S3_0_C0_C6_0
+#define SYS_ID_AA64ISAR0_EL1                            sys_reg(3, 0, 0, 6, 0)
+#define SYS_ID_AA64ISAR0_EL1_Op0                        3
+#define SYS_ID_AA64ISAR0_EL1_Op1                        0
+#define SYS_ID_AA64ISAR0_EL1_CRn                        0
+#define SYS_ID_AA64ISAR0_EL1_CRm                        6
+#define SYS_ID_AA64ISAR0_EL1_Op2                        0
+
+#define ID_AA64ISAR0_EL1_RNDR                           GENMASK(63, 60)
+#define ID_AA64ISAR0_EL1_RNDR_MASK                      GENMASK(63, 60)
+#define ID_AA64ISAR0_EL1_RNDR_SHIFT                     60
+#define ID_AA64ISAR0_EL1_RNDR_WIDTH                     4
+#define ID_AA64ISAR0_EL1_RNDR_SIGNED                    false
+#define ID_AA64ISAR0_EL1_RNDR_NI                        UL(0b0000)
+#define ID_AA64ISAR0_EL1_RNDR_IMP                       UL(0b0001)
+
+#define ID_AA64ISAR0_EL1_TLB                            GENMASK(59, 56)
+#define ID_AA64ISAR0_EL1_TLB_MASK                       GENMASK(59, 56)
+#define ID_AA64ISAR0_EL1_TLB_SHIFT                      56
+#define ID_AA64ISAR0_EL1_TLB_WIDTH                      4
+#define ID_AA64ISAR0_EL1_TLB_SIGNED                     false
+#define ID_AA64ISAR0_EL1_TLB_NI                         UL(0b0000)
+#define ID_AA64ISAR0_EL1_TLB_OS                         UL(0b0001)
+#define ID_AA64ISAR0_EL1_TLB_RANGE                      UL(0b0010)
+
+#define ID_AA64ISAR0_EL1_TS                             GENMASK(55, 52)
+#define ID_AA64ISAR0_EL1_TS_MASK                        GENMASK(55, 52)
+#define ID_AA64ISAR0_EL1_TS_SHIFT                       52
+#define ID_AA64ISAR0_EL1_TS_WIDTH                       4
+#define ID_AA64ISAR0_EL1_TS_SIGNED                      false
+#define ID_AA64ISAR0_EL1_TS_NI                          UL(0b0000)
+#define ID_AA64ISAR0_EL1_TS_FLAGM                       UL(0b0001)
+#define ID_AA64ISAR0_EL1_TS_FLAGM2                      UL(0b0010)
+
+#define ID_AA64ISAR0_EL1_FHM                            GENMASK(51, 48)
+#define ID_AA64ISAR0_EL1_FHM_MASK                       GENMASK(51, 48)
+#define ID_AA64ISAR0_EL1_FHM_SHIFT                      48
+#define ID_AA64ISAR0_EL1_FHM_WIDTH                      4
+#define ID_AA64ISAR0_EL1_FHM_SIGNED                     false
+#define ID_AA64ISAR0_EL1_FHM_NI                         UL(0b0000)
+#define ID_AA64ISAR0_EL1_FHM_IMP                        UL(0b0001)
+
+#define ID_AA64ISAR0_EL1_DP                             GENMASK(47, 44)
+#define ID_AA64ISAR0_EL1_DP_MASK                        GENMASK(47, 44)
+#define ID_AA64ISAR0_EL1_DP_SHIFT                       44
+#define ID_AA64ISAR0_EL1_DP_WIDTH                       4
+#define ID_AA64ISAR0_EL1_DP_SIGNED                      false
+#define ID_AA64ISAR0_EL1_DP_NI                          UL(0b0000)
+#define ID_AA64ISAR0_EL1_DP_IMP                         UL(0b0001)
+
+#define ID_AA64ISAR0_EL1_SM4                            GENMASK(43, 40)
+#define ID_AA64ISAR0_EL1_SM4_MASK                       GENMASK(43, 40)
+#define ID_AA64ISAR0_EL1_SM4_SHIFT                      40
+#define ID_AA64ISAR0_EL1_SM4_WIDTH                      4
+#define ID_AA64ISAR0_EL1_SM4_SIGNED                     false
+#define ID_AA64ISAR0_EL1_SM4_NI                         UL(0b0000)
+#define ID_AA64ISAR0_EL1_SM4_IMP                        UL(0b0001)
+
+#define ID_AA64ISAR0_EL1_SM3                            GENMASK(39, 36)
+#define ID_AA64ISAR0_EL1_SM3_MASK                       GENMASK(39, 36)
+#define ID_AA64ISAR0_EL1_SM3_SHIFT                      36
+#define ID_AA64ISAR0_EL1_SM3_WIDTH                      4
+#define ID_AA64ISAR0_EL1_SM3_SIGNED                     false
+#define ID_AA64ISAR0_EL1_SM3_NI                         UL(0b0000)
+#define ID_AA64ISAR0_EL1_SM3_IMP                        UL(0b0001)
+
+#define ID_AA64ISAR0_EL1_SHA3                           GENMASK(35, 32)
+#define ID_AA64ISAR0_EL1_SHA3_MASK                      GENMASK(35, 32)
+#define ID_AA64ISAR0_EL1_SHA3_SHIFT                     32
+#define ID_AA64ISAR0_EL1_SHA3_WIDTH                     4
+#define ID_AA64ISAR0_EL1_SHA3_SIGNED                    false
+#define ID_AA64ISAR0_EL1_SHA3_NI                        UL(0b0000)
+#define ID_AA64ISAR0_EL1_SHA3_IMP                       UL(0b0001)
+
+#define ID_AA64ISAR0_EL1_RDM                            GENMASK(31, 28)
+#define ID_AA64ISAR0_EL1_RDM_MASK                       GENMASK(31, 28)
+#define ID_AA64ISAR0_EL1_RDM_SHIFT                      28
+#define ID_AA64ISAR0_EL1_RDM_WIDTH                      4
+#define ID_AA64ISAR0_EL1_RDM_SIGNED                     false
+#define ID_AA64ISAR0_EL1_RDM_NI                         UL(0b0000)
+#define ID_AA64ISAR0_EL1_RDM_IMP                        UL(0b0001)
+
+#define ID_AA64ISAR0_EL1_TME                            GENMASK(27, 24)
+#define ID_AA64ISAR0_EL1_TME_MASK                       GENMASK(27, 24)
+#define ID_AA64ISAR0_EL1_TME_SHIFT                      24
+#define ID_AA64ISAR0_EL1_TME_WIDTH                      4
+#define ID_AA64ISAR0_EL1_TME_SIGNED                     false
+#define ID_AA64ISAR0_EL1_TME_NI                         UL(0b0000)
+#define ID_AA64ISAR0_EL1_TME_IMP                        UL(0b0001)
+
+#define ID_AA64ISAR0_EL1_ATOMIC                         GENMASK(23, 20)
+#define ID_AA64ISAR0_EL1_ATOMIC_MASK                    GENMASK(23, 20)
+#define ID_AA64ISAR0_EL1_ATOMIC_SHIFT                   20
+#define ID_AA64ISAR0_EL1_ATOMIC_WIDTH                   4
+#define ID_AA64ISAR0_EL1_ATOMIC_SIGNED                  false
+#define ID_AA64ISAR0_EL1_ATOMIC_NI                      UL(0b0000)
+#define ID_AA64ISAR0_EL1_ATOMIC_IMP                     UL(0b0010)
+
+#define ID_AA64ISAR0_EL1_CRC32                          GENMASK(19, 16)
+#define ID_AA64ISAR0_EL1_CRC32_MASK                     GENMASK(19, 16)
+#define ID_AA64ISAR0_EL1_CRC32_SHIFT                    16
+#define ID_AA64ISAR0_EL1_CRC32_WIDTH                    4
+#define ID_AA64ISAR0_EL1_CRC32_SIGNED                   false
+#define ID_AA64ISAR0_EL1_CRC32_NI                       UL(0b0000)
+#define ID_AA64ISAR0_EL1_CRC32_IMP                      UL(0b0001)
+
+#define ID_AA64ISAR0_EL1_SHA2                           GENMASK(15, 12)
+#define ID_AA64ISAR0_EL1_SHA2_MASK                      GENMASK(15, 12)
+#define ID_AA64ISAR0_EL1_SHA2_SHIFT                     12
+#define ID_AA64ISAR0_EL1_SHA2_WIDTH                     4
+#define ID_AA64ISAR0_EL1_SHA2_SIGNED                    false
+#define ID_AA64ISAR0_EL1_SHA2_NI                        UL(0b0000)
+#define ID_AA64ISAR0_EL1_SHA2_SHA256                    UL(0b0001)
+#define ID_AA64ISAR0_EL1_SHA2_SHA512                    UL(0b0010)
+
+#define ID_AA64ISAR0_EL1_SHA1                           GENMASK(11, 8)
+#define ID_AA64ISAR0_EL1_SHA1_MASK                      GENMASK(11, 8)
+#define ID_AA64ISAR0_EL1_SHA1_SHIFT                     8
+#define ID_AA64ISAR0_EL1_SHA1_WIDTH                     4
+#define ID_AA64ISAR0_EL1_SHA1_SIGNED                    false
+#define ID_AA64ISAR0_EL1_SHA1_NI                        UL(0b0000)
+#define ID_AA64ISAR0_EL1_SHA1_IMP                       UL(0b0001)
+
+#define ID_AA64ISAR0_EL1_AES                            GENMASK(7, 4)
+#define ID_AA64ISAR0_EL1_AES_MASK                       GENMASK(7, 4)
+#define ID_AA64ISAR0_EL1_AES_SHIFT                      4
+#define ID_AA64ISAR0_EL1_AES_WIDTH                      4
+#define ID_AA64ISAR0_EL1_AES_SIGNED                     false
+#define ID_AA64ISAR0_EL1_AES_NI                         UL(0b0000)
+#define ID_AA64ISAR0_EL1_AES_AES                        UL(0b0001)
+#define ID_AA64ISAR0_EL1_AES_PMULL                      UL(0b0010)
+
+#define ID_AA64ISAR0_EL1_RES0                           (UL(0) | GENMASK_ULL(3, 0))
+#define ID_AA64ISAR0_EL1_RES1                           (UL(0))
+#define ID_AA64ISAR0_EL1_UNKN                           (UL(0))
+
+#define REG_ID_AA64ISAR1_EL1                            S3_0_C0_C6_1
+#define SYS_ID_AA64ISAR1_EL1                            sys_reg(3, 0, 0, 6, 1)
+#define SYS_ID_AA64ISAR1_EL1_Op0                        3
+#define SYS_ID_AA64ISAR1_EL1_Op1                        0
+#define SYS_ID_AA64ISAR1_EL1_CRn                        0
+#define SYS_ID_AA64ISAR1_EL1_CRm                        6
+#define SYS_ID_AA64ISAR1_EL1_Op2                        1
+
+#define ID_AA64ISAR1_EL1_LS64                           GENMASK(63, 60)
+#define ID_AA64ISAR1_EL1_LS64_MASK                      GENMASK(63, 60)
+#define ID_AA64ISAR1_EL1_LS64_SHIFT                     60
+#define ID_AA64ISAR1_EL1_LS64_WIDTH                     4
+#define ID_AA64ISAR1_EL1_LS64_SIGNED                    false
+#define ID_AA64ISAR1_EL1_LS64_NI                        UL(0b0000)
+#define ID_AA64ISAR1_EL1_LS64_LS64                      UL(0b0001)
+#define ID_AA64ISAR1_EL1_LS64_LS64_V                    UL(0b0010)
+#define ID_AA64ISAR1_EL1_LS64_LS64_ACCDATA              UL(0b0011)
+
+#define ID_AA64ISAR1_EL1_XS                             GENMASK(59, 56)
+#define ID_AA64ISAR1_EL1_XS_MASK                        GENMASK(59, 56)
+#define ID_AA64ISAR1_EL1_XS_SHIFT                       56
+#define ID_AA64ISAR1_EL1_XS_WIDTH                       4
+#define ID_AA64ISAR1_EL1_XS_SIGNED                      false
+#define ID_AA64ISAR1_EL1_XS_NI                          UL(0b0000)
+#define ID_AA64ISAR1_EL1_XS_IMP                         UL(0b0001)
+
+#define ID_AA64ISAR1_EL1_I8MM                           GENMASK(55, 52)
+#define ID_AA64ISAR1_EL1_I8MM_MASK                      GENMASK(55, 52)
+#define ID_AA64ISAR1_EL1_I8MM_SHIFT                     52
+#define ID_AA64ISAR1_EL1_I8MM_WIDTH                     4
+#define ID_AA64ISAR1_EL1_I8MM_SIGNED                    false
+#define ID_AA64ISAR1_EL1_I8MM_NI                        UL(0b0000)
+#define ID_AA64ISAR1_EL1_I8MM_IMP                       UL(0b0001)
+
+#define ID_AA64ISAR1_EL1_DGH                            GENMASK(51, 48)
+#define ID_AA64ISAR1_EL1_DGH_MASK                       GENMASK(51, 48)
+#define ID_AA64ISAR1_EL1_DGH_SHIFT                      48
+#define ID_AA64ISAR1_EL1_DGH_WIDTH                      4
+#define ID_AA64ISAR1_EL1_DGH_SIGNED                     false
+#define ID_AA64ISAR1_EL1_DGH_NI                         UL(0b0000)
+#define ID_AA64ISAR1_EL1_DGH_IMP                        UL(0b0001)
+
+#define ID_AA64ISAR1_EL1_BF16                           GENMASK(47, 44)
+#define ID_AA64ISAR1_EL1_BF16_MASK                      GENMASK(47, 44)
+#define ID_AA64ISAR1_EL1_BF16_SHIFT                     44
+#define ID_AA64ISAR1_EL1_BF16_WIDTH                     4
+#define ID_AA64ISAR1_EL1_BF16_SIGNED                    false
+#define ID_AA64ISAR1_EL1_BF16_NI                        UL(0b0000)
+#define ID_AA64ISAR1_EL1_BF16_IMP                       UL(0b0001)
+#define ID_AA64ISAR1_EL1_BF16_EBF16                     UL(0b0010)
+
+#define ID_AA64ISAR1_EL1_SPECRES                        GENMASK(43, 40)
+#define ID_AA64ISAR1_EL1_SPECRES_MASK                   GENMASK(43, 40)
+#define ID_AA64ISAR1_EL1_SPECRES_SHIFT                  40
+#define ID_AA64ISAR1_EL1_SPECRES_WIDTH                  4
+#define ID_AA64ISAR1_EL1_SPECRES_SIGNED                 false
+#define ID_AA64ISAR1_EL1_SPECRES_NI                     UL(0b0000)
+#define ID_AA64ISAR1_EL1_SPECRES_IMP                    UL(0b0001)
+
+#define ID_AA64ISAR1_EL1_SB                             GENMASK(39, 36)
+#define ID_AA64ISAR1_EL1_SB_MASK                        GENMASK(39, 36)
+#define ID_AA64ISAR1_EL1_SB_SHIFT                       36
+#define ID_AA64ISAR1_EL1_SB_WIDTH                       4
+#define ID_AA64ISAR1_EL1_SB_SIGNED                      false
+#define ID_AA64ISAR1_EL1_SB_NI                          UL(0b0000)
+#define ID_AA64ISAR1_EL1_SB_IMP                         UL(0b0001)
+
+#define ID_AA64ISAR1_EL1_FRINTTS                        GENMASK(35, 32)
+#define ID_AA64ISAR1_EL1_FRINTTS_MASK                   GENMASK(35, 32)
+#define ID_AA64ISAR1_EL1_FRINTTS_SHIFT                  32
+#define ID_AA64ISAR1_EL1_FRINTTS_WIDTH                  4
+#define ID_AA64ISAR1_EL1_FRINTTS_SIGNED                 false
+#define ID_AA64ISAR1_EL1_FRINTTS_NI                     UL(0b0000)
+#define ID_AA64ISAR1_EL1_FRINTTS_IMP                    UL(0b0001)
+
+#define ID_AA64ISAR1_EL1_GPI                            GENMASK(31, 28)
+#define ID_AA64ISAR1_EL1_GPI_MASK                       GENMASK(31, 28)
+#define ID_AA64ISAR1_EL1_GPI_SHIFT                      28
+#define ID_AA64ISAR1_EL1_GPI_WIDTH                      4
+#define ID_AA64ISAR1_EL1_GPI_SIGNED                     false
+#define ID_AA64ISAR1_EL1_GPI_NI                         UL(0b0000)
+#define ID_AA64ISAR1_EL1_GPI_IMP                        UL(0b0001)
+
+#define ID_AA64ISAR1_EL1_GPA                            GENMASK(27, 24)
+#define ID_AA64ISAR1_EL1_GPA_MASK                       GENMASK(27, 24)
+#define ID_AA64ISAR1_EL1_GPA_SHIFT                      24
+#define ID_AA64ISAR1_EL1_GPA_WIDTH                      4
+#define ID_AA64ISAR1_EL1_GPA_SIGNED                     false
+#define ID_AA64ISAR1_EL1_GPA_NI                         UL(0b0000)
+#define ID_AA64ISAR1_EL1_GPA_IMP                        UL(0b0001)
+
+#define ID_AA64ISAR1_EL1_LRCPC                          GENMASK(23, 20)
+#define ID_AA64ISAR1_EL1_LRCPC_MASK                     GENMASK(23, 20)
+#define ID_AA64ISAR1_EL1_LRCPC_SHIFT                    20
+#define ID_AA64ISAR1_EL1_LRCPC_WIDTH                    4
+#define ID_AA64ISAR1_EL1_LRCPC_SIGNED                   false
+#define ID_AA64ISAR1_EL1_LRCPC_NI                       UL(0b0000)
+#define ID_AA64ISAR1_EL1_LRCPC_IMP                      UL(0b0001)
+#define ID_AA64ISAR1_EL1_LRCPC_LRCPC2                   UL(0b0010)
+
+#define ID_AA64ISAR1_EL1_FCMA                           GENMASK(19, 16)
+#define ID_AA64ISAR1_EL1_FCMA_MASK                      GENMASK(19, 16)
+#define ID_AA64ISAR1_EL1_FCMA_SHIFT                     16
+#define ID_AA64ISAR1_EL1_FCMA_WIDTH                     4
+#define ID_AA64ISAR1_EL1_FCMA_SIGNED                    false
+#define ID_AA64ISAR1_EL1_FCMA_NI                        UL(0b0000)
+#define ID_AA64ISAR1_EL1_FCMA_IMP                       UL(0b0001)
+
+#define ID_AA64ISAR1_EL1_JSCVT                          GENMASK(15, 12)
+#define ID_AA64ISAR1_EL1_JSCVT_MASK                     GENMASK(15, 12)
+#define ID_AA64ISAR1_EL1_JSCVT_SHIFT                    12
+#define ID_AA64ISAR1_EL1_JSCVT_WIDTH                    4
+#define ID_AA64ISAR1_EL1_JSCVT_SIGNED                   false
+#define ID_AA64ISAR1_EL1_JSCVT_NI                       UL(0b0000)
+#define ID_AA64ISAR1_EL1_JSCVT_IMP                      UL(0b0001)
+
+#define ID_AA64ISAR1_EL1_API                            GENMASK(11, 8)
+#define ID_AA64ISAR1_EL1_API_MASK                       GENMASK(11, 8)
+#define ID_AA64ISAR1_EL1_API_SHIFT                      8
+#define ID_AA64ISAR1_EL1_API_WIDTH                      4
+#define ID_AA64ISAR1_EL1_API_SIGNED                     false
+#define ID_AA64ISAR1_EL1_API_NI                         UL(0b0000)
+#define ID_AA64ISAR1_EL1_API_PAuth                      UL(0b0001)
+#define ID_AA64ISAR1_EL1_API_EPAC                       UL(0b0010)
+#define ID_AA64ISAR1_EL1_API_PAuth2                     UL(0b0011)
+#define ID_AA64ISAR1_EL1_API_FPAC                       UL(0b0100)
+#define ID_AA64ISAR1_EL1_API_FPACCOMBINE                UL(0b0101)
+
+#define ID_AA64ISAR1_EL1_APA                            GENMASK(7, 4)
+#define ID_AA64ISAR1_EL1_APA_MASK                       GENMASK(7, 4)
+#define ID_AA64ISAR1_EL1_APA_SHIFT                      4
+#define ID_AA64ISAR1_EL1_APA_WIDTH                      4
+#define ID_AA64ISAR1_EL1_APA_SIGNED                     false
+#define ID_AA64ISAR1_EL1_APA_NI                         UL(0b0000)
+#define ID_AA64ISAR1_EL1_APA_PAuth                      UL(0b0001)
+#define ID_AA64ISAR1_EL1_APA_EPAC                       UL(0b0010)
+#define ID_AA64ISAR1_EL1_APA_PAuth2                     UL(0b0011)
+#define ID_AA64ISAR1_EL1_APA_FPAC                       UL(0b0100)
+#define ID_AA64ISAR1_EL1_APA_FPACCOMBINE                UL(0b0101)
+
+#define ID_AA64ISAR1_EL1_DPB                            GENMASK(3, 0)
+#define ID_AA64ISAR1_EL1_DPB_MASK                       GENMASK(3, 0)
+#define ID_AA64ISAR1_EL1_DPB_SHIFT                      0
+#define ID_AA64ISAR1_EL1_DPB_WIDTH                      4
+#define ID_AA64ISAR1_EL1_DPB_SIGNED                     false
+#define ID_AA64ISAR1_EL1_DPB_NI                         UL(0b0000)
+#define ID_AA64ISAR1_EL1_DPB_IMP                        UL(0b0001)
+#define ID_AA64ISAR1_EL1_DPB_DPB2                       UL(0b0010)
+
+#define ID_AA64ISAR1_EL1_RES0                           (UL(0))
+#define ID_AA64ISAR1_EL1_RES1                           (UL(0))
+#define ID_AA64ISAR1_EL1_UNKN                           (UL(0))
+
+#define REG_ID_AA64ISAR2_EL1                            S3_0_C0_C6_2
+#define SYS_ID_AA64ISAR2_EL1                            sys_reg(3, 0, 0, 6, 2)
+#define SYS_ID_AA64ISAR2_EL1_Op0                        3
+#define SYS_ID_AA64ISAR2_EL1_Op1                        0
+#define SYS_ID_AA64ISAR2_EL1_CRn                        0
+#define SYS_ID_AA64ISAR2_EL1_CRm                        6
+#define SYS_ID_AA64ISAR2_EL1_Op2                        2
+
+#define ID_AA64ISAR2_EL1_CSSC                           GENMASK(55, 52)
+#define ID_AA64ISAR2_EL1_CSSC_MASK                      GENMASK(55, 52)
+#define ID_AA64ISAR2_EL1_CSSC_SHIFT                     52
+#define ID_AA64ISAR2_EL1_CSSC_WIDTH                     4
+#define ID_AA64ISAR2_EL1_CSSC_SIGNED                    false
+#define ID_AA64ISAR2_EL1_CSSC_NI                        UL(0b0000)
+#define ID_AA64ISAR2_EL1_CSSC_IMP                       UL(0b0001)
+
+#define ID_AA64ISAR2_EL1_RPRFM                          GENMASK(51, 48)
+#define ID_AA64ISAR2_EL1_RPRFM_MASK                     GENMASK(51, 48)
+#define ID_AA64ISAR2_EL1_RPRFM_SHIFT                    48
+#define ID_AA64ISAR2_EL1_RPRFM_WIDTH                    4
+#define ID_AA64ISAR2_EL1_RPRFM_SIGNED                   false
+#define ID_AA64ISAR2_EL1_RPRFM_NI                       UL(0b0000)
+#define ID_AA64ISAR2_EL1_RPRFM_IMP                      UL(0b0001)
+
+#define ID_AA64ISAR2_EL1_CLRBHB                         GENMASK(31, 28)
+#define ID_AA64ISAR2_EL1_CLRBHB_MASK                    GENMASK(31, 28)
+#define ID_AA64ISAR2_EL1_CLRBHB_SHIFT                   28
+#define ID_AA64ISAR2_EL1_CLRBHB_WIDTH                   4
+#define ID_AA64ISAR2_EL1_CLRBHB_SIGNED                  false
+#define ID_AA64ISAR2_EL1_CLRBHB_NI                      UL(0b0000)
+#define ID_AA64ISAR2_EL1_CLRBHB_IMP                     UL(0b0001)
+
+#define ID_AA64ISAR2_EL1_PAC_frac                       GENMASK(27, 24)
+#define ID_AA64ISAR2_EL1_PAC_frac_MASK                  GENMASK(27, 24)
+#define ID_AA64ISAR2_EL1_PAC_frac_SHIFT                 24
+#define ID_AA64ISAR2_EL1_PAC_frac_WIDTH                 4
+#define ID_AA64ISAR2_EL1_PAC_frac_SIGNED                false
+#define ID_AA64ISAR2_EL1_PAC_frac_NI                    UL(0b0000)
+#define ID_AA64ISAR2_EL1_PAC_frac_IMP                   UL(0b0001)
+
+#define ID_AA64ISAR2_EL1_BC                             GENMASK(23, 20)
+#define ID_AA64ISAR2_EL1_BC_MASK                        GENMASK(23, 20)
+#define ID_AA64ISAR2_EL1_BC_SHIFT                       20
+#define ID_AA64ISAR2_EL1_BC_WIDTH                       4
+#define ID_AA64ISAR2_EL1_BC_SIGNED                      false
+#define ID_AA64ISAR2_EL1_BC_NI                          UL(0b0000)
+#define ID_AA64ISAR2_EL1_BC_IMP                         UL(0b0001)
+
+#define ID_AA64ISAR2_EL1_MOPS                           GENMASK(19, 16)
+#define ID_AA64ISAR2_EL1_MOPS_MASK                      GENMASK(19, 16)
+#define ID_AA64ISAR2_EL1_MOPS_SHIFT                     16
+#define ID_AA64ISAR2_EL1_MOPS_WIDTH                     4
+#define ID_AA64ISAR2_EL1_MOPS_SIGNED                    false
+#define ID_AA64ISAR2_EL1_MOPS_NI                        UL(0b0000)
+#define ID_AA64ISAR2_EL1_MOPS_IMP                       UL(0b0001)
+
+#define ID_AA64ISAR2_EL1_APA3                           GENMASK(15, 12)
+#define ID_AA64ISAR2_EL1_APA3_MASK                      GENMASK(15, 12)
+#define ID_AA64ISAR2_EL1_APA3_SHIFT                     12
+#define ID_AA64ISAR2_EL1_APA3_WIDTH                     4
+#define ID_AA64ISAR2_EL1_APA3_SIGNED                    false
+#define ID_AA64ISAR2_EL1_APA3_NI                        UL(0b0000)
+#define ID_AA64ISAR2_EL1_APA3_PAuth                     UL(0b0001)
+#define ID_AA64ISAR2_EL1_APA3_EPAC                      UL(0b0010)
+#define ID_AA64ISAR2_EL1_APA3_PAuth2                    UL(0b0011)
+#define ID_AA64ISAR2_EL1_APA3_FPAC                      UL(0b0100)
+#define ID_AA64ISAR2_EL1_APA3_FPACCOMBINE               UL(0b0101)
+
+#define ID_AA64ISAR2_EL1_GPA3                           GENMASK(11, 8)
+#define ID_AA64ISAR2_EL1_GPA3_MASK                      GENMASK(11, 8)
+#define ID_AA64ISAR2_EL1_GPA3_SHIFT                     8
+#define ID_AA64ISAR2_EL1_GPA3_WIDTH                     4
+#define ID_AA64ISAR2_EL1_GPA3_SIGNED                    false
+#define ID_AA64ISAR2_EL1_GPA3_NI                        UL(0b0000)
+#define ID_AA64ISAR2_EL1_GPA3_IMP                       UL(0b0001)
+
+#define ID_AA64ISAR2_EL1_RPRES                          GENMASK(7, 4)
+#define ID_AA64ISAR2_EL1_RPRES_MASK                     GENMASK(7, 4)
+#define ID_AA64ISAR2_EL1_RPRES_SHIFT                    4
+#define ID_AA64ISAR2_EL1_RPRES_WIDTH                    4
+#define ID_AA64ISAR2_EL1_RPRES_SIGNED                   false
+#define ID_AA64ISAR2_EL1_RPRES_NI                       UL(0b0000)
+#define ID_AA64ISAR2_EL1_RPRES_IMP                      UL(0b0001)
+
+#define ID_AA64ISAR2_EL1_WFxT                           GENMASK(3, 0)
+#define ID_AA64ISAR2_EL1_WFxT_MASK                      GENMASK(3, 0)
+#define ID_AA64ISAR2_EL1_WFxT_SHIFT                     0
+#define ID_AA64ISAR2_EL1_WFxT_WIDTH                     4
+#define ID_AA64ISAR2_EL1_WFxT_SIGNED                    false
+#define ID_AA64ISAR2_EL1_WFxT_NI                        UL(0b0000)
+#define ID_AA64ISAR2_EL1_WFxT_IMP                       UL(0b0010)
+
+#define ID_AA64ISAR2_EL1_RES0                           (UL(0) | GENMASK_ULL(63, 56) | GENMASK_ULL(47, 32))
+#define ID_AA64ISAR2_EL1_RES1                           (UL(0))
+#define ID_AA64ISAR2_EL1_UNKN                           (UL(0))
+
+#define REG_ID_AA64MMFR0_EL1                            S3_0_C0_C7_0
+#define SYS_ID_AA64MMFR0_EL1                            sys_reg(3, 0, 0, 7, 0)
+#define SYS_ID_AA64MMFR0_EL1_Op0                        3
+#define SYS_ID_AA64MMFR0_EL1_Op1                        0
+#define SYS_ID_AA64MMFR0_EL1_CRn                        0
+#define SYS_ID_AA64MMFR0_EL1_CRm                        7
+#define SYS_ID_AA64MMFR0_EL1_Op2                        0
+
+#define ID_AA64MMFR0_EL1_ECV                            GENMASK(63, 60)
+#define ID_AA64MMFR0_EL1_ECV_MASK                       GENMASK(63, 60)
+#define ID_AA64MMFR0_EL1_ECV_SHIFT                      60
+#define ID_AA64MMFR0_EL1_ECV_WIDTH                      4
+#define ID_AA64MMFR0_EL1_ECV_SIGNED                     false
+#define ID_AA64MMFR0_EL1_ECV_NI                         UL(0b0000)
+#define ID_AA64MMFR0_EL1_ECV_IMP                        UL(0b0001)
+#define ID_AA64MMFR0_EL1_ECV_CNTPOFF                    UL(0b0010)
+
+#define ID_AA64MMFR0_EL1_FGT                            GENMASK(59, 56)
+#define ID_AA64MMFR0_EL1_FGT_MASK                       GENMASK(59, 56)
+#define ID_AA64MMFR0_EL1_FGT_SHIFT                      56
+#define ID_AA64MMFR0_EL1_FGT_WIDTH                      4
+#define ID_AA64MMFR0_EL1_FGT_SIGNED                     false
+#define ID_AA64MMFR0_EL1_FGT_NI                         UL(0b0000)
+#define ID_AA64MMFR0_EL1_FGT_IMP                        UL(0b0001)
+
+#define ID_AA64MMFR0_EL1_EXS                            GENMASK(47, 44)
+#define ID_AA64MMFR0_EL1_EXS_MASK                       GENMASK(47, 44)
+#define ID_AA64MMFR0_EL1_EXS_SHIFT                      44
+#define ID_AA64MMFR0_EL1_EXS_WIDTH                      4
+#define ID_AA64MMFR0_EL1_EXS_SIGNED                     false
+#define ID_AA64MMFR0_EL1_EXS_NI                         UL(0b0000)
+#define ID_AA64MMFR0_EL1_EXS_IMP                        UL(0b0001)
+
+#define ID_AA64MMFR0_EL1_TGRAN4_2                       GENMASK(43, 40)
+#define ID_AA64MMFR0_EL1_TGRAN4_2_MASK                  GENMASK(43, 40)
+#define ID_AA64MMFR0_EL1_TGRAN4_2_SHIFT                 40
+#define ID_AA64MMFR0_EL1_TGRAN4_2_WIDTH                 4
+#define ID_AA64MMFR0_EL1_TGRAN4_2_TGRAN4                UL(0b0000)
+#define ID_AA64MMFR0_EL1_TGRAN4_2_NI                    UL(0b0001)
+#define ID_AA64MMFR0_EL1_TGRAN4_2_IMP                   UL(0b0010)
+#define ID_AA64MMFR0_EL1_TGRAN4_2_52_BIT                UL(0b0011)
+
+#define ID_AA64MMFR0_EL1_TGRAN64_2                      GENMASK(39, 36)
+#define ID_AA64MMFR0_EL1_TGRAN64_2_MASK                 GENMASK(39, 36)
+#define ID_AA64MMFR0_EL1_TGRAN64_2_SHIFT                36
+#define ID_AA64MMFR0_EL1_TGRAN64_2_WIDTH                4
+#define ID_AA64MMFR0_EL1_TGRAN64_2_TGRAN64              UL(0b0000)
+#define ID_AA64MMFR0_EL1_TGRAN64_2_NI                   UL(0b0001)
+#define ID_AA64MMFR0_EL1_TGRAN64_2_IMP                  UL(0b0010)
+
+#define ID_AA64MMFR0_EL1_TGRAN16_2                      GENMASK(35, 32)
+#define ID_AA64MMFR0_EL1_TGRAN16_2_MASK                 GENMASK(35, 32)
+#define ID_AA64MMFR0_EL1_TGRAN16_2_SHIFT                32
+#define ID_AA64MMFR0_EL1_TGRAN16_2_WIDTH                4
+#define ID_AA64MMFR0_EL1_TGRAN16_2_TGRAN16              UL(0b0000)
+#define ID_AA64MMFR0_EL1_TGRAN16_2_NI                   UL(0b0001)
+#define ID_AA64MMFR0_EL1_TGRAN16_2_IMP                  UL(0b0010)
+#define ID_AA64MMFR0_EL1_TGRAN16_2_52_BIT               UL(0b0011)
+
+#define ID_AA64MMFR0_EL1_TGRAN4                         GENMASK(31, 28)
+#define ID_AA64MMFR0_EL1_TGRAN4_MASK                    GENMASK(31, 28)
+#define ID_AA64MMFR0_EL1_TGRAN4_SHIFT                   28
+#define ID_AA64MMFR0_EL1_TGRAN4_WIDTH                   4
+#define ID_AA64MMFR0_EL1_TGRAN4_IMP                     UL(0b0000)
+#define ID_AA64MMFR0_EL1_TGRAN4_52_BIT                  UL(0b0001)
+#define ID_AA64MMFR0_EL1_TGRAN4_NI                      UL(0b1111)
+
+#define ID_AA64MMFR0_EL1_TGRAN64                        GENMASK(27, 24)
+#define ID_AA64MMFR0_EL1_TGRAN64_MASK                   GENMASK(27, 24)
+#define ID_AA64MMFR0_EL1_TGRAN64_SHIFT                  24
+#define ID_AA64MMFR0_EL1_TGRAN64_WIDTH                  4
+#define ID_AA64MMFR0_EL1_TGRAN64_IMP                    UL(0b0000)
+#define ID_AA64MMFR0_EL1_TGRAN64_NI                     UL(0b1111)
+
+#define ID_AA64MMFR0_EL1_TGRAN16                        GENMASK(23, 20)
+#define ID_AA64MMFR0_EL1_TGRAN16_MASK                   GENMASK(23, 20)
+#define ID_AA64MMFR0_EL1_TGRAN16_SHIFT                  20
+#define ID_AA64MMFR0_EL1_TGRAN16_WIDTH                  4
+#define ID_AA64MMFR0_EL1_TGRAN16_NI                     UL(0b0000)
+#define ID_AA64MMFR0_EL1_TGRAN16_IMP                    UL(0b0001)
+#define ID_AA64MMFR0_EL1_TGRAN16_52_BIT                 UL(0b0010)
+
+#define ID_AA64MMFR0_EL1_BIGENDEL0                      GENMASK(19, 16)
+#define ID_AA64MMFR0_EL1_BIGENDEL0_MASK                 GENMASK(19, 16)
+#define ID_AA64MMFR0_EL1_BIGENDEL0_SHIFT                16
+#define ID_AA64MMFR0_EL1_BIGENDEL0_WIDTH                4
+#define ID_AA64MMFR0_EL1_BIGENDEL0_SIGNED               false
+#define ID_AA64MMFR0_EL1_BIGENDEL0_NI                   UL(0b0000)
+#define ID_AA64MMFR0_EL1_BIGENDEL0_IMP                  UL(0b0001)
+
+#define ID_AA64MMFR0_EL1_SNSMEM                         GENMASK(15, 12)
+#define ID_AA64MMFR0_EL1_SNSMEM_MASK                    GENMASK(15, 12)
+#define ID_AA64MMFR0_EL1_SNSMEM_SHIFT                   12
+#define ID_AA64MMFR0_EL1_SNSMEM_WIDTH                   4
+#define ID_AA64MMFR0_EL1_SNSMEM_SIGNED                  false
+#define ID_AA64MMFR0_EL1_SNSMEM_NI                      UL(0b0000)
+#define ID_AA64MMFR0_EL1_SNSMEM_IMP                     UL(0b0001)
+
+#define ID_AA64MMFR0_EL1_BIGEND                         GENMASK(11, 8)
+#define ID_AA64MMFR0_EL1_BIGEND_MASK                    GENMASK(11, 8)
+#define ID_AA64MMFR0_EL1_BIGEND_SHIFT                   8
+#define ID_AA64MMFR0_EL1_BIGEND_WIDTH                   4
+#define ID_AA64MMFR0_EL1_BIGEND_SIGNED                  false
+#define ID_AA64MMFR0_EL1_BIGEND_NI                      UL(0b0000)
+#define ID_AA64MMFR0_EL1_BIGEND_IMP                     UL(0b0001)
+
+#define ID_AA64MMFR0_EL1_ASIDBITS                       GENMASK(7, 4)
+#define ID_AA64MMFR0_EL1_ASIDBITS_MASK                  GENMASK(7, 4)
+#define ID_AA64MMFR0_EL1_ASIDBITS_SHIFT                 4
+#define ID_AA64MMFR0_EL1_ASIDBITS_WIDTH                 4
+#define ID_AA64MMFR0_EL1_ASIDBITS_8                     UL(0b0000)
+#define ID_AA64MMFR0_EL1_ASIDBITS_16                    UL(0b0010)
+
+#define ID_AA64MMFR0_EL1_PARANGE                        GENMASK(3, 0)
+#define ID_AA64MMFR0_EL1_PARANGE_MASK                   GENMASK(3, 0)
+#define ID_AA64MMFR0_EL1_PARANGE_SHIFT                  0
+#define ID_AA64MMFR0_EL1_PARANGE_WIDTH                  4
+#define ID_AA64MMFR0_EL1_PARANGE_32                     UL(0b0000)
+#define ID_AA64MMFR0_EL1_PARANGE_36                     UL(0b0001)
+#define ID_AA64MMFR0_EL1_PARANGE_40                     UL(0b0010)
+#define ID_AA64MMFR0_EL1_PARANGE_42                     UL(0b0011)
+#define ID_AA64MMFR0_EL1_PARANGE_44                     UL(0b0100)
+#define ID_AA64MMFR0_EL1_PARANGE_48                     UL(0b0101)
+#define ID_AA64MMFR0_EL1_PARANGE_52                     UL(0b0110)
+
+#define ID_AA64MMFR0_EL1_RES0                           (UL(0) | GENMASK_ULL(55, 48))
+#define ID_AA64MMFR0_EL1_RES1                           (UL(0))
+#define ID_AA64MMFR0_EL1_UNKN                           (UL(0))
+
+#define REG_ID_AA64MMFR1_EL1                            S3_0_C0_C7_1
+#define SYS_ID_AA64MMFR1_EL1                            sys_reg(3, 0, 0, 7, 1)
+#define SYS_ID_AA64MMFR1_EL1_Op0                        3
+#define SYS_ID_AA64MMFR1_EL1_Op1                        0
+#define SYS_ID_AA64MMFR1_EL1_CRn                        0
+#define SYS_ID_AA64MMFR1_EL1_CRm                        7
+#define SYS_ID_AA64MMFR1_EL1_Op2                        1
+
+#define ID_AA64MMFR1_EL1_ECBHB                          GENMASK(63, 60)
+#define ID_AA64MMFR1_EL1_ECBHB_MASK                     GENMASK(63, 60)
+#define ID_AA64MMFR1_EL1_ECBHB_SHIFT                    60
+#define ID_AA64MMFR1_EL1_ECBHB_WIDTH                    4
+#define ID_AA64MMFR1_EL1_ECBHB_SIGNED                   false
+#define ID_AA64MMFR1_EL1_ECBHB_NI                       UL(0b0000)
+#define ID_AA64MMFR1_EL1_ECBHB_IMP                      UL(0b0001)
+
+#define ID_AA64MMFR1_EL1_CMOW                           GENMASK(59, 56)
+#define ID_AA64MMFR1_EL1_CMOW_MASK                      GENMASK(59, 56)
+#define ID_AA64MMFR1_EL1_CMOW_SHIFT                     56
+#define ID_AA64MMFR1_EL1_CMOW_WIDTH                     4
+#define ID_AA64MMFR1_EL1_CMOW_SIGNED                    false
+#define ID_AA64MMFR1_EL1_CMOW_NI                        UL(0b0000)
+#define ID_AA64MMFR1_EL1_CMOW_IMP                       UL(0b0001)
+
+#define ID_AA64MMFR1_EL1_TIDCP1                         GENMASK(55, 52)
+#define ID_AA64MMFR1_EL1_TIDCP1_MASK                    GENMASK(55, 52)
+#define ID_AA64MMFR1_EL1_TIDCP1_SHIFT                   52
+#define ID_AA64MMFR1_EL1_TIDCP1_WIDTH                   4
+#define ID_AA64MMFR1_EL1_TIDCP1_SIGNED                  false
+#define ID_AA64MMFR1_EL1_TIDCP1_NI                      UL(0b0000)
+#define ID_AA64MMFR1_EL1_TIDCP1_IMP                     UL(0b0001)
+
+#define ID_AA64MMFR1_EL1_nTLBPA                         GENMASK(51, 48)
+#define ID_AA64MMFR1_EL1_nTLBPA_MASK                    GENMASK(51, 48)
+#define ID_AA64MMFR1_EL1_nTLBPA_SHIFT                   48
+#define ID_AA64MMFR1_EL1_nTLBPA_WIDTH                   4
+#define ID_AA64MMFR1_EL1_nTLBPA_SIGNED                  false
+#define ID_AA64MMFR1_EL1_nTLBPA_NI                      UL(0b0000)
+#define ID_AA64MMFR1_EL1_nTLBPA_IMP                     UL(0b0001)
+
+#define ID_AA64MMFR1_EL1_AFP                            GENMASK(47, 44)
+#define ID_AA64MMFR1_EL1_AFP_MASK                       GENMASK(47, 44)
+#define ID_AA64MMFR1_EL1_AFP_SHIFT                      44
+#define ID_AA64MMFR1_EL1_AFP_WIDTH                      4
+#define ID_AA64MMFR1_EL1_AFP_SIGNED                     false
+#define ID_AA64MMFR1_EL1_AFP_NI                         UL(0b0000)
+#define ID_AA64MMFR1_EL1_AFP_IMP                        UL(0b0001)
+
+#define ID_AA64MMFR1_EL1_HCX                            GENMASK(43, 40)
+#define ID_AA64MMFR1_EL1_HCX_MASK                       GENMASK(43, 40)
+#define ID_AA64MMFR1_EL1_HCX_SHIFT                      40
+#define ID_AA64MMFR1_EL1_HCX_WIDTH                      4
+#define ID_AA64MMFR1_EL1_HCX_SIGNED                     false
+#define ID_AA64MMFR1_EL1_HCX_NI                         UL(0b0000)
+#define ID_AA64MMFR1_EL1_HCX_IMP                        UL(0b0001)
+
+#define ID_AA64MMFR1_EL1_ETS                            GENMASK(39, 36)
+#define ID_AA64MMFR1_EL1_ETS_MASK                       GENMASK(39, 36)
+#define ID_AA64MMFR1_EL1_ETS_SHIFT                      36
+#define ID_AA64MMFR1_EL1_ETS_WIDTH                      4
+#define ID_AA64MMFR1_EL1_ETS_SIGNED                     false
+#define ID_AA64MMFR1_EL1_ETS_NI                         UL(0b0000)
+#define ID_AA64MMFR1_EL1_ETS_IMP                        UL(0b0001)
+
+#define ID_AA64MMFR1_EL1_TWED                           GENMASK(35, 32)
+#define ID_AA64MMFR1_EL1_TWED_MASK                      GENMASK(35, 32)
+#define ID_AA64MMFR1_EL1_TWED_SHIFT                     32
+#define ID_AA64MMFR1_EL1_TWED_WIDTH                     4
+#define ID_AA64MMFR1_EL1_TWED_SIGNED                    false
+#define ID_AA64MMFR1_EL1_TWED_NI                        UL(0b0000)
+#define ID_AA64MMFR1_EL1_TWED_IMP                       UL(0b0001)
+
+#define ID_AA64MMFR1_EL1_XNX                            GENMASK(31, 28)
+#define ID_AA64MMFR1_EL1_XNX_MASK                       GENMASK(31, 28)
+#define ID_AA64MMFR1_EL1_XNX_SHIFT                      28
+#define ID_AA64MMFR1_EL1_XNX_WIDTH                      4
+#define ID_AA64MMFR1_EL1_XNX_SIGNED                     false
+#define ID_AA64MMFR1_EL1_XNX_NI                         UL(0b0000)
+#define ID_AA64MMFR1_EL1_XNX_IMP                        UL(0b0001)
+
+#define ID_AA64MMFR1_EL1_SpecSEI                        GENMASK(27, 24)
+#define ID_AA64MMFR1_EL1_SpecSEI_MASK                   GENMASK(27, 24)
+#define ID_AA64MMFR1_EL1_SpecSEI_SHIFT                  24
+#define ID_AA64MMFR1_EL1_SpecSEI_WIDTH                  4
+#define ID_AA64MMFR1_EL1_SpecSEI_SIGNED                 false
+#define ID_AA64MMFR1_EL1_SpecSEI_NI                     UL(0b0000)
+#define ID_AA64MMFR1_EL1_SpecSEI_IMP                    UL(0b0001)
+
+#define ID_AA64MMFR1_EL1_PAN                            GENMASK(23, 20)
+#define ID_AA64MMFR1_EL1_PAN_MASK                       GENMASK(23, 20)
+#define ID_AA64MMFR1_EL1_PAN_SHIFT                      20
+#define ID_AA64MMFR1_EL1_PAN_WIDTH                      4
+#define ID_AA64MMFR1_EL1_PAN_SIGNED                     false
+#define ID_AA64MMFR1_EL1_PAN_NI                         UL(0b0000)
+#define ID_AA64MMFR1_EL1_PAN_IMP                        UL(0b0001)
+#define ID_AA64MMFR1_EL1_PAN_PAN2                       UL(0b0010)
+#define ID_AA64MMFR1_EL1_PAN_PAN3                       UL(0b0011)
+
+#define ID_AA64MMFR1_EL1_LO                             GENMASK(19, 16)
+#define ID_AA64MMFR1_EL1_LO_MASK                        GENMASK(19, 16)
+#define ID_AA64MMFR1_EL1_LO_SHIFT                       16
+#define ID_AA64MMFR1_EL1_LO_WIDTH                       4
+#define ID_AA64MMFR1_EL1_LO_SIGNED                      false
+#define ID_AA64MMFR1_EL1_LO_NI                          UL(0b0000)
+#define ID_AA64MMFR1_EL1_LO_IMP                         UL(0b0001)
+
+#define ID_AA64MMFR1_EL1_HPDS                           GENMASK(15, 12)
+#define ID_AA64MMFR1_EL1_HPDS_MASK                      GENMASK(15, 12)
+#define ID_AA64MMFR1_EL1_HPDS_SHIFT                     12
+#define ID_AA64MMFR1_EL1_HPDS_WIDTH                     4
+#define ID_AA64MMFR1_EL1_HPDS_SIGNED                    false
+#define ID_AA64MMFR1_EL1_HPDS_NI                        UL(0b0000)
+#define ID_AA64MMFR1_EL1_HPDS_IMP                       UL(0b0001)
+#define ID_AA64MMFR1_EL1_HPDS_HPDS2                     UL(0b0010)
+
+#define ID_AA64MMFR1_EL1_VH                             GENMASK(11, 8)
+#define ID_AA64MMFR1_EL1_VH_MASK                        GENMASK(11, 8)
+#define ID_AA64MMFR1_EL1_VH_SHIFT                       8
+#define ID_AA64MMFR1_EL1_VH_WIDTH                       4
+#define ID_AA64MMFR1_EL1_VH_SIGNED                      false
+#define ID_AA64MMFR1_EL1_VH_NI                          UL(0b0000)
+#define ID_AA64MMFR1_EL1_VH_IMP                         UL(0b0001)
+
+#define ID_AA64MMFR1_EL1_VMIDBits                       GENMASK(7, 4)
+#define ID_AA64MMFR1_EL1_VMIDBits_MASK                  GENMASK(7, 4)
+#define ID_AA64MMFR1_EL1_VMIDBits_SHIFT                 4
+#define ID_AA64MMFR1_EL1_VMIDBits_WIDTH                 4
+#define ID_AA64MMFR1_EL1_VMIDBits_8                     UL(0b0000)
+#define ID_AA64MMFR1_EL1_VMIDBits_16                    UL(0b0010)
+
+#define ID_AA64MMFR1_EL1_HAFDBS                         GENMASK(3, 0)
+#define ID_AA64MMFR1_EL1_HAFDBS_MASK                    GENMASK(3, 0)
+#define ID_AA64MMFR1_EL1_HAFDBS_SHIFT                   0
+#define ID_AA64MMFR1_EL1_HAFDBS_WIDTH                   4
+#define ID_AA64MMFR1_EL1_HAFDBS_SIGNED                  false
+#define ID_AA64MMFR1_EL1_HAFDBS_NI                      UL(0b0000)
+#define ID_AA64MMFR1_EL1_HAFDBS_AF                      UL(0b0001)
+#define ID_AA64MMFR1_EL1_HAFDBS_DBM                     UL(0b0010)
+
+#define ID_AA64MMFR1_EL1_RES0                           (UL(0))
+#define ID_AA64MMFR1_EL1_RES1                           (UL(0))
+#define ID_AA64MMFR1_EL1_UNKN                           (UL(0))
+
+#define REG_ID_AA64MMFR2_EL1                            S3_0_C0_C7_2
+#define SYS_ID_AA64MMFR2_EL1                            sys_reg(3, 0, 0, 7, 2)
+#define SYS_ID_AA64MMFR2_EL1_Op0                        3
+#define SYS_ID_AA64MMFR2_EL1_Op1                        0
+#define SYS_ID_AA64MMFR2_EL1_CRn                        0
+#define SYS_ID_AA64MMFR2_EL1_CRm                        7
+#define SYS_ID_AA64MMFR2_EL1_Op2                        2
+
+#define ID_AA64MMFR2_EL1_E0PD                           GENMASK(63, 60)
+#define ID_AA64MMFR2_EL1_E0PD_MASK                      GENMASK(63, 60)
+#define ID_AA64MMFR2_EL1_E0PD_SHIFT                     60
+#define ID_AA64MMFR2_EL1_E0PD_WIDTH                     4
+#define ID_AA64MMFR2_EL1_E0PD_SIGNED                    false
+#define ID_AA64MMFR2_EL1_E0PD_NI                        UL(0b0000)
+#define ID_AA64MMFR2_EL1_E0PD_IMP                       UL(0b0001)
+
+#define ID_AA64MMFR2_EL1_EVT                            GENMASK(59, 56)
+#define ID_AA64MMFR2_EL1_EVT_MASK                       GENMASK(59, 56)
+#define ID_AA64MMFR2_EL1_EVT_SHIFT                      56
+#define ID_AA64MMFR2_EL1_EVT_WIDTH                      4
+#define ID_AA64MMFR2_EL1_EVT_SIGNED                     false
+#define ID_AA64MMFR2_EL1_EVT_NI                         UL(0b0000)
+#define ID_AA64MMFR2_EL1_EVT_IMP                        UL(0b0001)
+#define ID_AA64MMFR2_EL1_EVT_TTLBxS                     UL(0b0010)
+
+#define ID_AA64MMFR2_EL1_BBM                            GENMASK(55, 52)
+#define ID_AA64MMFR2_EL1_BBM_MASK                       GENMASK(55, 52)
+#define ID_AA64MMFR2_EL1_BBM_SHIFT                      52
+#define ID_AA64MMFR2_EL1_BBM_WIDTH                      4
+#define ID_AA64MMFR2_EL1_BBM_SIGNED                     false
+#define ID_AA64MMFR2_EL1_BBM_0                          UL(0b0000)
+#define ID_AA64MMFR2_EL1_BBM_1                          UL(0b0001)
+#define ID_AA64MMFR2_EL1_BBM_2                          UL(0b0010)
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.42.0.609.gbb76f46606-goog

Part of the diff is not shown here. View the raw message.

#2 lore raw

Re: [PATCH 1/2] tools: arm64: Add a copy of sysreg-defs.h generated from the kernel

Quoted 11 lines · Oliver Upton

Wiring up the build infrastructure necessary to generate the sysreg definitions for dependent targets (e.g. perf, KVM selftests) is a bit of an undertaking with near zero benefit. Just take what the kernel generated instead.

---
 tools/arch/arm64/include/asm/sysreg-defs.h | 6806 ++++++++++++++++++++
 1 file changed, 6806 insertions(+)
 create mode 100644 tools/arch/arm64/include/asm/sysreg-defs.h

If we're going to go with this approach we should probably script the syncing of the generated file and ideally have something that detects if there is a generated copy in the main kernel build with differences to what's here. There are regular syncs which I'm guessing are automated somehow, and I see that perf has some tooling to notice differences in the checked in files alraedy.

That said I'm not 100% clear why this isn't being added to "make headers" and/or the perf build stuff? Surely if perf is happy to peer into the main kernel source it could just as well do the generation as part of the build? There's no great obstacle to having a target which runs the generation script that I can see.

#3 lore raw

Re: [PATCH 1/2] tools: arm64: Add a copy of sysreg-defs.h generated from the kernel

Quoted 14 lines · Mark Brown
Quoted 11 lines · Oliver Upton

Wiring up the build infrastructure necessary to generate the sysreg definitions for dependent targets (e.g. perf, KVM selftests) is a bit of an undertaking with near zero benefit. Just take what the kernel generated instead.

---
 tools/arch/arm64/include/asm/sysreg-defs.h | 6806 ++++++++++++++++++++
 1 file changed, 6806 insertions(+)
 create mode 100644 tools/arch/arm64/include/asm/sysreg-defs.h
Quoted 6 lines

If we're going to go with this approach we should probably script the syncing of the generated file and ideally have something that detects if there is a generated copy in the main kernel build with differences to what's here. There are regular syncs which I'm guessing are automated somehow, and I see that perf has some tooling to notice differences in the checked in files alraedy.

Yeah, I see no reason why this can't plug in to the check-headers script to look at the output from the kernel side of the show.

Quoted 2 lines

That said I'm not 100% clear why this isn't being added to "make headers" and/or the perf build stuff?

Isn't 'make headers' just for UAPI headers though? Also, perf is just an incidental user of this via cputype.h, KVM selftests is what's taking the direct dependency.

Quoted 4 lines

Surely if perf is happy to peer into the main kernel source it could just as well do the generation as part of the build? There's no great obstacle to having a target which runs the generation script that I can see.

That'd be less than ideal, IMO. tools maintaining a separate set of kernel headers from the authoritative source avoids the need to coordinate changes across kernel and tools. To keep things that way we either need to copy the script+encoding or the header output. The latter isn't that bothersome if/when we need an update.

Signature · 2 lines
Thanks,
Oliver
#4 lore raw

Re: [PATCH 1/2] tools: arm64: Add a copy of sysreg-defs.h generated from the kernel

Quoted 6 lines · Oliver Upton
Quoted 2 lines · Mark Brown

That said I'm not 100% clear why this isn't being added to "make headers" and/or the perf build stuff?

Isn't 'make headers' just for UAPI headers though? Also, perf is just an

Possibly, I didn't look closely. It'd certainly be more tasteful.

Quoted 2 lines

incidental user of this via cputype.h, KVM selftests is what's taking the direct dependency.

If perf doesn't care perhaps just restructure things so it doesn't pull it in and do whatever you were doing originally then?

Quoted 10 lines
Quoted 4 lines

Surely if perf is happy to peer into the main kernel source it could just as well do the generation as part of the build? There's no great obstacle to having a target which runs the generation script that I can see.

That'd be less than ideal, IMO. tools maintaining a separate set of kernel headers from the authoritative source avoids the need to coordinate changes across kernel and tools. To keep things that way we either need to copy the script+encoding or the header output. The latter isn't that bothersome if/when we need an update.

The error Stephen found was:

| In file included from util/../../arch/arm64/include/asm/cputype.h:201,
|                  from util/arm-spe.c:37:
| tools/arch/arm64/include/asm/sysreg.h:132:10: fatal error: asm/sysreg-defs.h: No such file or directory

so that's already happening - see perf's arm-spe.c. You could also fix perf by avoiding spelunking in the main kernel source like it's currently doing.

#5 lore raw

Re: [PATCH 1/2] tools: arm64: Add a copy of sysreg-defs.h generated from the kernel

Quoted 2 lines · Mark Brown
Quoted 1 line · Oliver Upton

On Fri, Oct 06, 2023 at 01:23:08AM +0100, Mark Brown wrote:

[...]

Quoted 5 lines
Quoted 2 lines

incidental user of this via cputype.h, KVM selftests is what's taking the direct dependency.

If perf doesn't care perhaps just restructure things so it doesn't pull it in and do whatever you were doing originally then?

The only option would be to use yet another set of headers that are specific to KVM selftests, which I feel would only complicate things further.

Quoted 13 lines
Quoted 10 lines
Quoted 4 lines

Surely if perf is happy to peer into the main kernel source it could just as well do the generation as part of the build? There's no great obstacle to having a target which runs the generation script that I can see.

That'd be less than ideal, IMO. tools maintaining a separate set of kernel headers from the authoritative source avoids the need to coordinate changes across kernel and tools. To keep things that way we either need to copy the script+encoding or the header output. The latter isn't that bothersome if/when we need an update.

The error Stephen found was:

Quoted 7 lines
| In file included from util/../../arch/arm64/include/asm/cputype.h:201,
|                  from util/arm-spe.c:37:
| tools/arch/arm64/include/asm/sysreg.h:132:10: fatal error: asm/sysreg-defs.h: No such file or directory

so that's already happening - see perf's arm-spe.c. You could also fix perf by avoiding spelunking in the main kernel source like it's currently doing.

My interpretation of that relative path is tools/arch/arm64/include/asm/cputype.h

The include path in tools/perf/Makefile.config is using tools/ headers as well:

  INC_FLAGS += -I$(src-perf)/util/include
  INC_FLAGS += -I$(src-perf)/arch/$(SRCARCH)/include
  INC_FLAGS += -I$(srctree)/tools/include/
  INC_FLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/include/uapi
  INC_FLAGS += -I$(srctree)/tools/include/uapi
  INC_FLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/include/
  INC_FLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/

perf + KVM selftests aren't directly using kernel headers, and I'd rather not revisit that just for handling the sysreg definitions. So then if we must periodically copy things out of the kernel tree anyway, what value do we derive from copying the script as opposed to just lifting the generated output?

We must do _something_ about this, as updates to sysreg.h are blocked until the handling of generated headers gets worked out.

Signature · 2 lines
Thanks,
Oliver
#6 lore raw

Re: [PATCH 1/2] tools: arm64: Add a copy of sysreg-defs.h generated from the kernel

Quoted 7 lines · Oliver Upton
Quoted 5 lines · Mark Brown
Quoted 4 lines · Oliver Upton

On Fri, Oct 06, 2023 at 01:23:08AM +0100, Mark Brown wrote:

incidental user of this via cputype.h, KVM selftests is what's taking the direct dependency.

Quoted 6 lines
Quoted 2 lines

If perf doesn't care perhaps just restructure things so it doesn't pull it in and do whatever you were doing originally then?

The only option would be to use yet another set of headers that are specific to KVM selftests, which I feel would only complicate things further.

I don't see that it needs to be a different copy? It'd just be perf skipping the generation part of things which AIUI it doesn't actually need.

Quoted 9 lines
Quoted 7 lines
| In file included from util/../../arch/arm64/include/asm/cputype.h:201,
|                  from util/arm-spe.c:37:
| tools/arch/arm64/include/asm/sysreg.h:132:10: fatal error: asm/sysreg-defs.h: No such file or directory

so that's already happening - see perf's arm-spe.c. You could also fix perf by avoiding spelunking in the main kernel source like it's currently doing.

My interpretation of that relative path is tools/arch/arm64/include/asm/cputype.h

Ugh, right - that directory of fun :( It's not exactly copies of the kernel internal headers, it's separate thing that happens to look at lot like them but isn't always the same - most of the files are straight copies but there's also some independent implementations in there.

Quoted 5 lines

perf + KVM selftests aren't directly using kernel headers, and I'd rather not revisit that just for handling the sysreg definitions. So then if we must periodically copy things out of the kernel tree anyway, what value do we derive from copying the script as opposed to just lifting the generated output?

The original code was generating things during the build so I'm really confused as to why that's now completely off the table? It does seem like the obvious approach, it feels like I'm missing some of the analysis here. Doing generation makes keeping things in sync marginally easier (you don't have to do do an arch specific build) and the source smaller, and makes it clear that this is actually duplication.

Quoted 2 lines

We must do _something_ about this, as updates to sysreg.h are blocked until the handling of generated headers gets worked out.

So then the original code seems like the obvious thing surely, it just put the Makefile fragment doing the generation in the wrong place (or perhaps should have duplicated it in the perf Makefile given that there's no obviously sensible shared place already, it's just a couple of lines)? Or like I said previously tweaked things so that perf isn't pulling in the generated file in the first place and doesn't need to worry about it.

TBH when doing generation I'm not sure I see the value in doing a copy in the first place, I'm not sure people ever actually pull the tools directory out of the kernel source and build it independently so we can just skip the effort of keeping a copy in sync entirely. With copying the headers we gain control of exactly which headers tools are looking at, plus there's the cases where the headers diverge. If we need explicit rules to generate and don't expect to ever diverge then we get both properties as part of the generation process with just the duplication of the rules. There might be use cases where tools/ needs to be actually free standing though.

In any case I don't think we should just check a raw copy of the generated file in with nothing to automate the drift detection and sync parts of things which is what the current patch does.

#7 lore raw

PATCH 2/2 tools: arm64: Sync sysreg.h with the kernel source

In reply to Oliver Upton

From: Jing Zhang <[email protected]>

Update sysreg.h to align with the canonical kernel source now that there's a header that approximates the generated sysreg definitions. While at it, fix KVM selftests that use macros which suffered a rename.

---
 tools/arch/arm64/include/asm/gpr-num.h        |  26 +
 tools/arch/arm64/include/asm/sysreg.h         | 839 ++++--------------
 .../selftests/kvm/aarch64/aarch32_id_regs.c   |   4 +-
 .../selftests/kvm/aarch64/debug-exceptions.c  |  12 +-
 .../selftests/kvm/aarch64/page_fault_test.c   |   6 +-
 .../selftests/kvm/lib/aarch64/processor.c     |   6 +-
 6 files changed, 232 insertions(+), 661 deletions(-)
 create mode 100644 tools/arch/arm64/include/asm/gpr-num.h
tools/arch/arm64/include/asm/gpr-num.h new file +26 -0
new file mode 100644
index 000000000000..05da4a7c5788
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef __ASM_GPR_NUM_H
+#define __ASM_GPR_NUM_H
+
+#ifdef __ASSEMBLY__
+
+	.irp	num,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30
+	.equ	.L__gpr_num_x\num, \num
+	.equ	.L__gpr_num_w\num, \num
+	.endr
+	.equ	.L__gpr_num_xzr, 31
+	.equ	.L__gpr_num_wzr, 31
+
+#else /* __ASSEMBLY__ */
+
+#define __DEFINE_ASM_GPR_NUMS					\
+"	.irp	num,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30\n" \
+"	.equ	.L__gpr_num_x\\num, \\num\n"			\
+"	.equ	.L__gpr_num_w\\num, \\num\n"			\
+"	.endr\n"						\
+"	.equ	.L__gpr_num_xzr, 31\n"				\
+"	.equ	.L__gpr_num_wzr, 31\n"
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* __ASM_GPR_NUM_H */
tools/arch/arm64/include/asm/sysreg.h +192 -647

1,107 lines not on this page · raw message

tools/testing/selftests/kvm/aarch64/aarch32_id_regs.c +2 -2
index b90580840b22..8e5bd07a3727 100644
@@ -146,8 +146,8 @@ static bool vcpu_aarch64_only(struct kvm_vcpu *vcpu)
 
 	vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_ID_AA64PFR0_EL1), &val);
 
-	el0 = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64PFR0_EL0), val);
-	return el0 == ID_AA64PFR0_ELx_64BIT_ONLY;
+	el0 = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_EL0), val);
+	return el0 == ID_AA64PFR0_EL1_ELx_64BIT_ONLY;
 }
 
 int main(void)
tools/testing/selftests/kvm/aarch64/debug-exceptions.c +6 -6
index f5b6cb3a0019..866002917441 100644
@@ -116,12 +116,12 @@ static void reset_debug_state(void)
 
 	/* Reset all bcr/bvr/wcr/wvr registers */
 	dfr0 = read_sysreg(id_aa64dfr0_el1);
-	brps = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_BRPS), dfr0);
+	brps = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_EL1_BRPs), dfr0);
 	for (i = 0; i <= brps; i++) {
 		write_dbgbcr(i, 0);
 		write_dbgbvr(i, 0);
 	}
-	wrps = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_WRPS), dfr0);
+	wrps = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_EL1_WRPs), dfr0);
 	for (i = 0; i <= wrps; i++) {
 		write_dbgwcr(i, 0);
 		write_dbgwvr(i, 0);
@@ -418,7 +418,7 @@ static void guest_code_ss(int test_cnt)
 
 static int debug_version(uint64_t id_aa64dfr0)
 {
-	return FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_DEBUGVER), id_aa64dfr0);
+	return FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_EL1_DebugVer), id_aa64dfr0);
 }
 
 static void test_guest_debug_exceptions(uint8_t bpn, uint8_t wpn, uint8_t ctx_bpn)
@@ -539,14 +539,14 @@ void test_guest_debug_exceptions_all(uint64_t aa64dfr0)
 	int b, w, c;
 
 	/* Number of breakpoints */
-	brp_num = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_BRPS), aa64dfr0) + 1;
+	brp_num = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_EL1_BRPs), aa64dfr0) + 1;
 	__TEST_REQUIRE(brp_num >= 2, "At least two breakpoints are required");
 
 	/* Number of watchpoints */
-	wrp_num = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_WRPS), aa64dfr0) + 1;
+	wrp_num = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_EL1_WRPs), aa64dfr0) + 1;
 
 	/* Number of context aware breakpoints */
-	ctx_brp_num = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_CTX_CMPS), aa64dfr0) + 1;
+	ctx_brp_num = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_EL1_CTX_CMPs), aa64dfr0) + 1;
 
 	pr_debug("%s brp_num:%d, wrp_num:%d, ctx_brp_num:%d\n", __func__,
 		 brp_num, wrp_num, ctx_brp_num);
tools/testing/selftests/kvm/aarch64/page_fault_test.c +3 -3
index 47bb914ab2fa..975d28be3cca 100644
@@ -96,14 +96,14 @@ static bool guest_check_lse(void)
 	uint64_t isar0 = read_sysreg(id_aa64isar0_el1);
 	uint64_t atomic;
 
-	atomic = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64ISAR0_ATOMICS), isar0);
+	atomic = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64ISAR0_EL1_ATOMIC), isar0);
 	return atomic >= 2;
 }
 
 static bool guest_check_dc_zva(void)
 {
 	uint64_t dczid = read_sysreg(dczid_el0);
-	uint64_t dzp = FIELD_GET(ARM64_FEATURE_MASK(DCZID_DZP), dczid);
+	uint64_t dzp = FIELD_GET(ARM64_FEATURE_MASK(DCZID_EL0_DZP), dczid);
 
 	return dzp == 0;
 }
@@ -196,7 +196,7 @@ static bool guest_set_ha(void)
 	uint64_t hadbs, tcr;
 
 	/* Skip if HA is not supported. */
-	hadbs = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR1_HADBS), mmfr1);
+	hadbs = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR1_EL1_HAFDBS), mmfr1);
 	if (hadbs == 0)
 		return false;
 
tools/testing/selftests/kvm/lib/aarch64/processor.c +3 -3
index 3a0259e25335..6fe12e985ba5 100644
@@ -518,9 +518,9 @@ void aarch64_get_supported_page_sizes(uint32_t ipa,
 	err = ioctl(vcpu_fd, KVM_GET_ONE_REG, &reg);
 	TEST_ASSERT(err == 0, KVM_IOCTL_ERROR(KVM_GET_ONE_REG, vcpu_fd));
 
-	*ps4k = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR0_TGRAN4), val) != 0xf;
-	*ps64k = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR0_TGRAN64), val) == 0;
-	*ps16k = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR0_TGRAN16), val) != 0;
+	*ps4k = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR0_EL1_TGRAN4), val) != 0xf;
+	*ps64k = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR0_EL1_TGRAN64), val) == 0;
+	*ps16k = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR0_EL1_TGRAN16), val) != 0;
 
 	close(vcpu_fd);
 	close(vm_fd);
Signature · 1 line
2.42.0.609.gbb76f46606-goog
maintainer Acked-by on the v1 series
#8 lore raw
In reply to Oliver Upton
Quoted 9 lines · Oliver Upton

KVM selftests needs to use the full set of sysreg definitions for an upcoming change [1]. We took a stab at copying the entire sysreg generation infrastructure into the tools directory, but that exploded and broke the build for perf, oops [2].

Short of better build infrastructure in tools for handling common prerequisite tasks, this series takes the lazy route and copies the generated output of the sysreg infra from the kernel.

Hopefully this will spark some interest. In the meantime, this gets us going, so:

	M.
Signature · 1 line
Without deviation from the norm, progress is not possible.