From 6b698630a299c03e83250ac5703e8a87a38d0e03 Mon Sep 17 00:00:00 2001
From: Giacomo Travaglini <giacomo.travaglini@arm.com>
Date: Mon, 17 Jul 2023 14:40:32 +0100
Subject: [PATCH] arch-arm: Check VMID in secure mode as well (NS=0)

This is still trying to completely remove any artifact
which implies virtualization is only supported in
non-secure mode (NS=1)

Change-Id: I83fed1c33cc745ecdf3c5ad60f4f356f3c58aad5
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
---
 src/arch/arm/pagetable.hh | 4 ++--
 src/arch/arm/utility.hh   | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/arch/arm/pagetable.hh b/src/arch/arm/pagetable.hh
index deaf10df9e..98c5f46a61 100644
--- a/src/arch/arm/pagetable.hh
+++ b/src/arch/arm/pagetable.hh
@@ -320,8 +320,8 @@ struct TlbEntry : public Serializable
             if (match && !lookup.ignoreAsn) {
                 match = global || (lookup.asn == asid);
             }
-            if (match && nstid) {
-                match = isHyp || (lookup.vmid == vmid);
+            if (match && useVMID(lookup.targetEL, lookup.inHost)) {
+                match = lookup.vmid == vmid;
             }
         }
         return match;
diff --git a/src/arch/arm/utility.hh b/src/arch/arm/utility.hh
index d317651db5..c231b93bdb 100644
--- a/src/arch/arm/utility.hh
+++ b/src/arch/arm/utility.hh
@@ -366,6 +366,12 @@ void syncVecElemsToRegs(ThreadContext *tc);
 
 bool fgtEnabled(ThreadContext *tc);
 
+static inline bool
+useVMID(ExceptionLevel el, bool in_host)
+{
+    return el == EL1 || (el == EL0 && !in_host);
+}
+
 } // namespace ArmISA
 } // namespace gem5