From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37277) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZKC1-0007SN-GL for qemu-devel@nongnu.org; Fri, 26 Feb 2016 10:20:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aZKC0-0004mE-Gn for qemu-devel@nongnu.org; Fri, 26 Feb 2016 10:20:33 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:55997) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZKC0-0004lb-AZ for qemu-devel@nongnu.org; Fri, 26 Feb 2016 10:20:32 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84) (envelope-from ) id 1aZKBz-0003M6-RE for qemu-devel@nongnu.org; Fri, 26 Feb 2016 15:20:31 +0000 From: Peter Maydell Date: Fri, 26 Feb 2016 15:20:13 +0000 Message-Id: <1456500025-28761-9-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1456500025-28761-1-git-send-email-peter.maydell@linaro.org> References: <1456500025-28761-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 08/20] target-arm: Forbid mode switch to Mon from Secure EL1 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org In v8 trying to switch mode to Mon from Secure EL1 is an illegal mode switch. (In v7 this is impossible as all secure modes except User are at EL3.) We can handle this case by making a switch to Mon valid only if the current EL is 3, which then gives the correct answer whether EL3 is AArch32 or AArch64. Signed-off-by: Peter Maydell Reviewed-by: Sergey Fedorov Message-id: 1455556977-3644-9-git-send-email-peter.maydell@linaro.org --- target-arm/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index c43d66f..5926b15 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -5222,7 +5222,7 @@ static int bad_mode_switch(CPUARMState *env, int mode) return !arm_feature(env, ARM_FEATURE_EL2) || arm_current_el(env) < 2 || arm_is_secure(env); case ARM_CPU_MODE_MON: - return !arm_is_secure(env); + return arm_current_el(env) < 3; default: return 1; } -- 1.9.1