From patchwork Tue Aug 14 18:18:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 144231 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4727021ljj; Tue, 14 Aug 2018 11:59:03 -0700 (PDT) X-Google-Smtp-Source: AA+uWPyBWB8LKkHeTRcxNWEps/W9f1vxJt59w5NzVi5MpTf9RbR3YgW9a8JLlB0q+qJCdo7n1c4J X-Received: by 2002:a0c:f708:: with SMTP id w8-v6mr19682212qvn.91.1534273143796; Tue, 14 Aug 2018 11:59:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534273143; cv=none; d=google.com; s=arc-20160816; b=JdwPGSWBN5WM7nnThV0Hsj02yyM5a8CqT4W7DYtpIXrWAJ0t+6YRVmf6LRi4P5bzRZ +lSw/IVaI0gxP+Hlwcxo9mwB0ttuWaZ+WiP/JWt0QYIzPEQbVWO1XL1YsuEMtR2crV7L SNX4yBpN9iaNrQ/03/IwB9KVjDFM3in4di+JZ2J3hKDAIvpWoK2JdGP+V8FSXRZspfOT OAL302wX3wWV7CWY/bWHnA4PA4njtph76Zz/VINuSUPDBcqyQs2nXnNXysNsoj/l69NQ HhZejh81/Q24RquORQzndFUFXhqwzcyLndQbLN7D4PmSLnOvWjb9ifmin8nnLuuP9NJK PBVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=623RCnhe8/5c8leTd9M5rTIHFqSJAcNAu6c9H/eX9AY=; b=IQLpUvp56283Ggo/YKXpBiitwKLdXC67m0yQXG99ssB+XMRejLA7jflPfkdRw5ebWH kRen7vBldJM5fKx34sGG/VT3xQiRAcxqvIYw30bTKSAocdJuBs1P3pJQGEId8t17Lqs8 cWHucYHSRAag8BW20qY7L20CbMf57SGXJYouppHOJ2Pi/eLNAeB/jVYsO7NZSEjuvVMA 45wKrz/PfYteOivDoAg8vdFb9d2JBND85H6hZ5PKY57pLD0hDk1bW5JWy9GsEZkQy33q dWVwRK+quUNq45fsfJ4kmhXcLr0trYG3nKk7mu/Un4j3BYZEUcYF5V/wablVj3MyfY/f cUSg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o78-v6si8829704qko.11.2018.08.14.11.59.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 Aug 2018 11:59:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45808 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fpeX1-0008Pc-8N for patch@linaro.org; Tue, 14 Aug 2018 14:59:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52843) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fpdvp-0005DC-P5 for qemu-devel@nongnu.org; Tue, 14 Aug 2018 14:22:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fpduK-0006rY-Tv for qemu-devel@nongnu.org; Tue, 14 Aug 2018 14:20:37 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:44428) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fpduK-0006nb-AP for qemu-devel@nongnu.org; Tue, 14 Aug 2018 14:19:04 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fpduH-0007OE-5X for qemu-devel@nongnu.org; Tue, 14 Aug 2018 19:19:01 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 14 Aug 2018 19:18:09 +0100 Message-Id: <20180814181815.23348-40-peter.maydell@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180814181815.23348-1-peter.maydell@linaro.org> References: <20180814181815.23348-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 39/45] target/arm: Initialize exc_secure correctly in do_v7m_exception_exit() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" In do_v7m_exception_exit(), we use the exc_secure variable to track whether the exception we're returning from is secure or non-secure. Unfortunately the statement initializing this was accidentally inside an "if (env->v7m.exception != ARMV7M_EXCP_NMI)" conditional, which meant that we were using the wrong value for NMI handlers. Move the initialization out to the right place. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-id: 20180720145647.8810-3-peter.maydell@linaro.org --- target/arm/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.18.0 diff --git a/target/arm/helper.c b/target/arm/helper.c index 1b60c8d66c9..9d908f1c663 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7052,6 +7052,7 @@ static void do_v7m_exception_exit(ARMCPU *cpu) /* For all other purposes, treat ES as 0 (R_HXSR) */ excret &= ~R_V7M_EXCRET_ES_MASK; } + exc_secure = excret & R_V7M_EXCRET_ES_MASK; } if (env->v7m.exception != ARMV7M_EXCP_NMI) { @@ -7062,7 +7063,6 @@ static void do_v7m_exception_exit(ARMCPU *cpu) * which security state's faultmask to clear. (v8M ARM ARM R_KBNF.) */ if (arm_feature(env, ARM_FEATURE_M_SECURITY)) { - exc_secure = excret & R_V7M_EXCRET_ES_MASK; if (armv7m_nvic_raw_execution_priority(env->nvic) >= 0) { env->v7m.faultmask[exc_secure] = 0; }