diff mbox

[PULL,17/17] Allow ARMv8 SCR.SMD updates

Message ID 1430148045-32400-18-git-send-email-peter.maydell@linaro.org
State Accepted
Commit 4eb276408363aef5435a72a8e818f24220b5edd0
Headers show

Commit Message

Peter Maydell April 27, 2015, 3:20 p.m. UTC 
From: Greg Bellows <greg.bellows@linaro.org>

Updated scr_write to always allow updates to the SCR.SMD bit on ARMv8
regardless of whether virtualization (EL2) is enabled or not.

Signed-off-by: Greg Bellows <greg.bellows@linaro.org>
Message-id: 1429888797-4378-1-git-send-email-greg.bellows@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 target-arm/helper.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/target-arm/helper.c b/target-arm/helper.c
index 0ac6ff1..f8f8d76 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -816,8 +816,10 @@  static void scr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value)
          * supported if EL2 exists. The bit is UNK/SBZP when
          * EL2 is unavailable. In QEMU ARMv7, we force it to always zero
          * when EL2 is unavailable.
+         * On ARMv8, this bit is always available.
          */
-        if (arm_feature(env, ARM_FEATURE_V7)) {
+        if (arm_feature(env, ARM_FEATURE_V7) &&
+            !arm_feature(env, ARM_FEATURE_V8)) {
             valid_mask &= ~SCR_SMD;
         }
     }