diff --git a/src/arch/arm/regs/misc.cc b/src/arch/arm/regs/misc.cc
index 17b652dfb1..cd0504f935 100644
--- a/src/arch/arm/regs/misc.cc
+++ b/src/arch/arm/regs/misc.cc
@@ -1259,6 +1259,7 @@ std::unordered_map<MiscRegNum64, MiscRegIndex> miscRegNumToIdx{
     { MiscRegNum64(3, 4, 3, 0, 0), MISCREG_DACR32_EL2 },
     { MiscRegNum64(3, 4, 3, 1, 4), MISCREG_HDFGRTR_EL2 },
     { MiscRegNum64(3, 4, 3, 1, 5), MISCREG_HDFGWTR_EL2 },
+    { MiscRegNum64(3, 4, 3, 1, 6), MISCREG_HAFGRTR_EL2 },
     { MiscRegNum64(3, 4, 4, 0, 0), MISCREG_SPSR_EL2 },
     { MiscRegNum64(3, 4, 4, 0, 1), MISCREG_ELR_EL2 },
     { MiscRegNum64(3, 4, 4, 1, 0), MISCREG_SP_EL1 },
@@ -6871,6 +6872,9 @@ ISA::initializeMiscRegMetadata()
     InitReg(MISCREG_HDFGWTR_EL2)
       .fault(EL2, faultFgtCtrlRegs)
       .hyp().mon(release->has(ArmExtension::FEAT_FGT));
+    InitReg(MISCREG_HAFGRTR_EL2)
+      .fault(EL2, faultFgtCtrlRegs)
+      .hyp().mon(release->has(ArmExtension::FEAT_FGT));
 
     // Dummy registers
     InitReg(MISCREG_NOP)
diff --git a/src/arch/arm/regs/misc.hh b/src/arch/arm/regs/misc.hh
index 288de96d22..a7e50954a5 100644
--- a/src/arch/arm/regs/misc.hh
+++ b/src/arch/arm/regs/misc.hh
@@ -1165,6 +1165,7 @@ namespace ArmISA
         MISCREG_HFGWTR_EL2,
         MISCREG_HDFGRTR_EL2,
         MISCREG_HDFGWTR_EL2,
+        MISCREG_HAFGRTR_EL2,
 
         // FEAT_MPAM
         MISCREG_MPAMIDR_EL1,
@@ -2912,6 +2913,7 @@ namespace ArmISA
         "hfgwtr_el2",
         "hdfgrtr_el2",
         "hdfgwtr_el2",
+        "hafgrtr_el2",
 
         // FEAT_MPAM
         "mpamidr_el1",