From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60124) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJmvy-00076w-0c for qemu-devel@nongnu.org; Thu, 14 Jan 2016 13:47:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJmvx-0002Ip-31 for qemu-devel@nongnu.org; Thu, 14 Jan 2016 13:47:45 -0500 From: Peter Maydell Date: Thu, 14 Jan 2016 18:34:10 +0000 Message-Id: <1452796451-2946-8-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1452796451-2946-1-git-send-email-peter.maydell@linaro.org> References: <1452796451-2946-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 7/8] target-arm: Implement remaining illegal return event checks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , qemu-arm@nongnu.org, "Edgar E. Iglesias" , patches@linaro.org We already implement almost all the checks for the illegal return events from AArch64 state described in the ARM ARM section D1.11.2. Add the two missing ones: * return to EL2 when EL3 is implemented and SCR_EL3.NS is 0 * return to Non-secure EL1 when EL2 is implemented and HCR_EL2.TGE is 1 (We don't implement external debug, so the case of "debug state exit from EL0 using AArch64 state to EL0 using AArch32 state" doesn't apply for QEMU.) Signed-off-by: Peter Maydell --- target-arm/op_helper.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index 38d46d8..5789ccb 100644 --- a/target-arm/op_helper.c +++ b/target-arm/op_helper.c @@ -718,6 +718,17 @@ void HELPER(exception_return)(CPUARMState *env) goto illegal_return; } + if (new_el == 2 && arm_is_secure_below_el3(env)) { + /* Return to the non-existent secure-EL2 */ + goto illegal_return; + } + + if (new_el == 1 && + arm_feature(env, ARM_FEATURE_EL2) && (env->cp15.hcr_el2 & HCR_TGE) + && !arm_is_secure_below_el3(env)) { + goto illegal_return; + } + if (!return_to_aa64) { env->aarch64 = 0; env->uncached_cpsr = spsr & CPSR_M; -- 1.9.1