From patchwork Tue Aug 14 18:17:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 144206 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4703989ljj; Tue, 14 Aug 2018 11:34:04 -0700 (PDT) X-Google-Smtp-Source: AA+uWPxcU/4Q1vgVQ5DbVSjFAU0mkUBYpJLDv2r4GqkGrX7q2rZGTCdYLOxGwIqNZ6RhuAZ4eKtw X-Received: by 2002:ac8:710f:: with SMTP id z15-v6mr21462695qto.387.1534271644502; Tue, 14 Aug 2018 11:34:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534271644; cv=none; d=google.com; s=arc-20160816; b=d2Wv3j6RmLYEcXSTw/owyH5zo9LsTnJylyCtSeg8tpT9QehYK65Aq48eb9HPTPEcVV aVmdjobkkxNFfvMr47fDFr8S5qkQDbLNkHe/HRRl9vsWt8xQB5KFbB3/+6VpyjlhFUal AfxOJs787Bhj/t/6jkq4osJmBW7Gv5XFDCupMQbaDXYGHYi/zLJziClKM6vMSvq5MgYT dEDTmWI5y0mmTn14GzX1CRLt+8RDyrQ81Z3n9kljOEhzLF9kyRIDR/IsmaprJsw2ELz7 fVawnwQv+xfFfNUYM4HBAcmYNKtkuXCUE1p3/+u0CnUqn43IMz/6dE/2VbIGAhOOB/ZL joTQ== 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:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=RohoPJ1Gki1wGibOjC615QL/3sHAb79m/FVqnyoA/5g=; b=DJ9aBRkBvV00I73+urFfKoAhK0Y0InobBKClvIiUjU9N59tmSjtT1rIF14oxTvxqjn N+CEfs4fBSoRQUeelKeONi+BfBextwOzd0wT/V296s7fM6Odgm1hb5ej04K+fRm9KUJi 3QfCIhRbTl7dl9T4wG317ublvfYZipAvSnxgNjSefqYaB+ymEBaSYl4tuSCvCEiE7a2I OzNZgmq2i0D+tLNrHKmzrd1TJAtddpu74ikB8jHhuDTiUbzesn36RlzlJfkhD/YWsFjs fB+Doqsd2sXwWW1+VIDOm4Tnwd07NNDcHcooD+NmLpIw0XTOIm4QqWoDBlLjVP+Ty7lN 5seA== 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 y1-v6si18441506qky.55.2018.08.14.11.34.04 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 Aug 2018 11:34:04 -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]:45668 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fpe8p-0004Ie-Vt for patch@linaro.org; Tue, 14 Aug 2018 14:34:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52386) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fpdut-0004SB-Op for qemu-devel@nongnu.org; Tue, 14 Aug 2018 14:21:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fpdtk-0006Y7-49 for qemu-devel@nongnu.org; Tue, 14 Aug 2018 14:19:39 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:44400) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fpdtj-0006Ug-Pt for qemu-devel@nongnu.org; Tue, 14 Aug 2018 14:18:27 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fpdtb-000772-9P for qemu-devel@nongnu.org; Tue, 14 Aug 2018 19:18:19 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 14 Aug 2018 19:17:31 +0100 Message-Id: <20180814181815.23348-2-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> 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 01/45] target/arm: Forbid unprivileged mode for M Baseline 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" From: Julia Suvorova MSR handling is the only place where CONTROL.nPRIV is modified. Signed-off-by: Julia Suvorova Message-id: 20180705222622.17139-1-jusual@mail.ru Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/helper.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) -- 2.18.0 diff --git a/target/arm/helper.c b/target/arm/helper.c index 66afb08ee0f..a6d642f4ae5 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -10728,8 +10728,10 @@ void HELPER(v7m_msr)(CPUARMState *env, uint32_t maskreg, uint32_t val) write_v7m_control_spsel_for_secstate(env, val & R_V7M_CONTROL_SPSEL_MASK, M_REG_NS); - env->v7m.control[M_REG_NS] &= ~R_V7M_CONTROL_NPRIV_MASK; - env->v7m.control[M_REG_NS] |= val & R_V7M_CONTROL_NPRIV_MASK; + if (arm_feature(env, ARM_FEATURE_M_MAIN)) { + env->v7m.control[M_REG_NS] &= ~R_V7M_CONTROL_NPRIV_MASK; + env->v7m.control[M_REG_NS] |= val & R_V7M_CONTROL_NPRIV_MASK; + } return; case 0x98: /* SP_NS */ { @@ -10822,8 +10824,10 @@ void HELPER(v7m_msr)(CPUARMState *env, uint32_t maskreg, uint32_t val) !arm_v7m_is_handler_mode(env)) { write_v7m_control_spsel(env, (val & R_V7M_CONTROL_SPSEL_MASK) != 0); } - env->v7m.control[env->v7m.secure] &= ~R_V7M_CONTROL_NPRIV_MASK; - env->v7m.control[env->v7m.secure] |= val & R_V7M_CONTROL_NPRIV_MASK; + if (arm_feature(env, ARM_FEATURE_M_MAIN)) { + env->v7m.control[env->v7m.secure] &= ~R_V7M_CONTROL_NPRIV_MASK; + env->v7m.control[env->v7m.secure] |= val & R_V7M_CONTROL_NPRIV_MASK; + } break; default: bad_reg: