diff options
| author | Rémi Denis-Courmont | 2021-01-12 11:45:04 +0100 |
|---|---|---|
| committer | Peter Maydell | 2021-01-19 15:38:52 +0100 |
| commit | 588c6dd113b27b8db393c7264297b9d33261692e (patch) | |
| tree | aa9d98d99095fa563abb80bbeb9bceecbef6bde4 /target/arm | |
| parent | target/arm: do S1_ptw_translate() before address space lookup (diff) | |
| download | qemu-588c6dd113b27b8db393c7264297b9d33261692e.tar.gz qemu-588c6dd113b27b8db393c7264297b9d33261692e.tar.xz qemu-588c6dd113b27b8db393c7264297b9d33261692e.zip | |
target/arm: translate NS bit in page-walks
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>
Diffstat (limited to 'target/arm')
| -rw-r--r-- | target/arm/helper.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/target/arm/helper.c b/target/arm/helper.c index ae0ccf72f5..521f85a695 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; |