From 72056524766d4154fc5a2726042ff46649cb200c Mon Sep 17 00:00:00 2001
From: Junshi Wang <junshi.wang@arm.com>
Date: Wed, 21 Aug 2024 15:46:59 +0800
Subject: [PATCH] arch-arm: Fix Execution Permission in Stage2 Direct
 Permission.

In Stage 2 under AArch64, execution permission does not need read
permission.

Change-Id: I45887e8f4d50ed5edc4afaed9a2dd8a74db9d0d4
---
 src/arch/arm/mmu.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/arch/arm/mmu.cc b/src/arch/arm/mmu.cc
index d349455c3b..0381176b3f 100644
--- a/src/arch/arm/mmu.cc
+++ b/src/arch/arm/mmu.cc
@@ -627,7 +627,7 @@ MMU::s2PermBits64(TlbEntry *te, const RequestPtr &req, Mode mode,
             "w:%d, x:%d\n", te->hap, xn, pxn, r, w, x);
 
     if (x) {
-        grant = grant_read && !xn;
+        grant = !xn;
     } else if (req->isAtomic()) {
         grant = grant_read || grant_write;
     } else if (w) {