ArmPkg/AArch64Mmu: use architecturally correct definitions for XN/UXN

[mirror_edk2.git] / ArmPkg / Include / Chipset / AArch64Mmu.h

diff --git a/ArmPkg/Include/Chipset/AArch64Mmu.h b/ArmPkg/Include/Chipset/AArch64Mmu.h
index 2398ba2539c79ac74eb2b255683059b5fb2b4bfe..22e492d61dc04489b63c7e3685efa3e4fe662946 100644 (file)
--- a/ArmPkg/Include/Chipset/AArch64Mmu.h
+++ b/ArmPkg/Include/Chipset/AArch64Mmu.h
@@ -75,12 +75,14 @@
 #define TT_AF                                   BIT10\r
 \r
 #define TT_PXN_MASK                             BIT53\r
-#define TT_UXN_MASK                             BIT54\r
+#define TT_UXN_MASK                             BIT54   // EL1&0\r
+#define TT_XN_MASK                              BIT54   // EL2 / EL3\r
 \r
 #define TT_ATTRIBUTES_MASK                      ((0xFFFULL << 52) | (0x3FFULL << 2))\r
 \r
 #define TT_TABLE_PXN                            BIT59\r
-#define TT_TABLE_XN                             BIT60\r
+#define TT_TABLE_UXN                            BIT60   // EL1&0\r
+#define TT_TABLE_XN                             BIT60   // EL2 / EL3\r
 #define TT_TABLE_NS                             BIT63\r
 \r
 #define TT_TABLE_AP_MASK                        (BIT62 | BIT61)\r