Message ID | 1513188761-20784-20-git-send-email-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | 83d7f86d3d27473c0aac79c1baaa5c2ab01b02d9 |
Headers | show
Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5831034qgn; Wed, 13 Dec 2017 10:39:15 -0800 (PST) X-Google-Smtp-Source: ACJfBouJRP3WBeqG4Zmevp+HQ8U8mz4hK0ZsPolooZPMb43UPqA/PvNI6uoipjKWpAF2i0eTXynW X-Received: by 10.129.58.20 with SMTP id h20mr2647007ywa.464.1513190354996; Wed, 13 Dec 2017 10:39:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513190354; cv=none; d=google.com; s=arc-20160816; b=PRVWyvmNajj+4oFMms6XylJcPP1OgMpW+5+IFjodwDLvzFESo/MzHV1FzJon8QQdM3 q4HJeXrkVAB0QlT18fyxR88Dcld61WfxTyk1Wso8qHBsmF8JVNAnEHfMOvz4KLesefiq C/c6RtcM6finkuR1TXPkIc8xnjt1Ap/ufI4KyHQHRfPEtN5TzEsY0PW1g4kTT0tZ1jf8 WVJVPuhU3ACeu9sI9mPC+HryYo87l6FLh3Ubm8B6uIEixzSPM3fY7y5jyx7oLFxQ01GC CTBENe+SNiV/CZA4VGrHfzCW88XdopHK9hq90x35uLzY6xTrReGXBjwweYNne0EOtcyI HTxA== 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=K2erwEGfoE11WClD0XGsxvFVVIaOqBrM3Bg7u8XNFqA=; b=VxsjZmSPUmQJHSG74Mo3Nz8QUPDHiUAGuY7tvibZ9sYmTG3TeZcpn2NIb11K7tsCxj gsZVQBEyvHwyX/djhvn4rp8mz31GjVH6MdEV8Bg4j83h3riz87X+NUvHKRT7vm4fG3Hx FObmfX3JjALun40C1+24V9p11dTkgPNcR6OrnN88FRiU0CyvjXX6/dB+c8WMxFER5StY HRE866queDaiRoUYvvGLq06AUNFxpqiadKza/EZCyn17v32XeQETCfD5ZPn6cNYdrJkN vFi43U5xsunKkCOfzcN3W8qEtSwegeGApm/Uf0WOu9TZX/RzsY0kzbRLqerwywFtGFdS JqsA== 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: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b7si469032ybj.485.2017.12.13.10.39.14 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 13 Dec 2017 10:39:14 -0800 (PST) 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]:36938 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1ePBw2-0001KN-Fq for patch@linaro.org; Wed, 13 Dec 2017 13:39:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1ePBWc-0004kI-H9 for qemu-devel@nongnu.org; Wed, 13 Dec 2017 13:12:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1ePBWb-0007sM-C5 for qemu-devel@nongnu.org; Wed, 13 Dec 2017 13:12:58 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:39132) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1ePBWb-0007pU-5o for qemu-devel@nongnu.org; Wed, 13 Dec 2017 13:12:57 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from <pm215@archaic.org.uk>) id 1ePBWa-0007gs-0e for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:12:56 +0000 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Wed, 13 Dec 2017 18:12:17 +0000 Message-Id: <1513188761-20784-20-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513188761-20784-1-git-send-email-peter.maydell@linaro.org> References: <1513188761-20784-1-git-send-email-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 19/43] target/arm: Allow explicit writes to CONTROL.SPSEL in Handler mode X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/target/arm/helper.c b/target/arm/helper.c index 88394d4..f21c142 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -10091,8 +10091,11 @@ void HELPER(v7m_msr)(CPUARMState *env, uint32_t maskreg, uint32_t val) * thread mode; other bits can be updated by any privileged code. * write_v7m_control_spsel() deals with updating the SPSEL bit in * env->v7m.control, so we only need update the others. + * For v7M, we must just ignore explicit writes to SPSEL in handler + * mode; for v8M the write is permitted but will have no effect. */ - if (!arm_v7m_is_handler_mode(env)) { + if (arm_feature(env, ARM_FEATURE_V8) || + !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;