summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-08-25 15:45:08 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-08-25 15:45:08 +0100
commitd0a2cbceb2aa20d64d53e1c20c7d26a78ade8382 (patch)
tree126c3f7ba89de71e7334667618a43629d1479327
parent834a6c6920316d39aaf0e68ac936c0a3ad164815 (diff)
downloadfocaccia-qemu-d0a2cbceb2aa20d64d53e1c20c7d26a78ade8382.tar.gz
focaccia-qemu-d0a2cbceb2aa20d64d53e1c20c7d26a78ade8382.zip
target-arm: there is no TTBR1 for 32-bit EL2 stage 1 translations
For EL2 stage 1 translations, there is no TTBR1. We were already
handling this for 64-bit EL2; add the code to take the 'no TTBR1'
code path for 64-bit EL2 as well.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 1437751263-21913-2-git-send-email-peter.maydell@linaro.org
Diffstat (limited to '')
-rw-r--r--target-arm/helper.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 97ca86ad0a..86d0baf2c0 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -5999,6 +5999,11 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
         if (el > 1) {
             ttbr1_valid = false;
         }
+    } else {
+        /* There is no TTBR1 for EL2 */
+        if (el == 2) {
+            ttbr1_valid = false;
+        }
     }
 
     /* Determine whether this address is in the region controlled by