diff mbox series

[PULL,15/33] target/arm: translate NS bit in page-walks

Message ID 20210119151104.16264-16-peter.maydell@linaro.org
State Accepted
Commit 588c6dd113b27b8db393c7264297b9d33261692e
Headers show
Series target-arm queue | expand

Commit Message

Peter Maydell Jan. 19, 2021, 3:10 p.m. UTC 
From: Rémi Denis-Courmont <remi.denis.courmont@huawei.com>


Signed-off-by: Rémi Denis-Courmont <remi.denis.courmont@huawei.com>

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Message-id: 20210112104511.36576-12-remi.denis.courmont@huawei.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---
 target/arm/helper.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

-- 
2.20.1
diff mbox series

Patch

diff --git a/target/arm/helper.c b/target/arm/helper.c
index ae0ccf72f58..521f85a695a 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -10430,6 +10430,18 @@  static hwaddr S1_ptw_translate(CPUARMState *env, ARMMMUIdx mmu_idx,
             fi->s1ptw = true;
             return ~0;
         }
+
+        if (arm_is_secure_below_el3(env)) {
+            /* Check if page table walk is to secure or non-secure PA space. */
+            if (*is_secure) {
+                *is_secure = !(env->cp15.vstcr_el2.raw_tcr & VSTCR_SW);
+            } else {
+                *is_secure = !(env->cp15.vtcr_el2.raw_tcr & VTCR_NSW);
+            }
+        } else {
+            assert(!*is_secure);
+        }
+
         addr = s2pa;
     }
     return addr;