From 116f43d49c1b7c3ee812d081371dc1a877fcadd7 Mon Sep 17 00:00:00 2001
From: Mikhail Krichanov <mikhailkrichanov@gmail.com>
Date: Fri, 13 Sep 2024 14:40:24 +0300
Subject: [PATCH] ArmMmuLib: Worked around lack of EL2&0 translation support.

---
 ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
index 74b5e16c9e..03d0925566 100644
--- a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
+++ b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
@@ -488,7 +488,12 @@ GcdAttributeToPageAttribute (
       PageAttributes |= TT_AP_RW_RW;
     }
   } else {
-    PageAttributes |= TT_UXN_MASK;
+    if (ArmReadCurrentEL () == AARCH64_EL1) {
+      //
+      // TODO: Add EL2&0 support.
+      //
+      PageAttributes |= TT_UXN_MASK;
+    }
 
     if ((GcdAttributes & EFI_MEMORY_RO) != 0) {
       PageAttributes |= TT_AP_NO_RO;