Message ID | 1496337035-30213-13-git-send-email-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | 06312febfb2d35367006ef23608ddd6a131214d4 |
Headers | show
Delivered-To: patch@linaro.org Received: by 10.182.202.35 with SMTP id kf3csp858331obc; Thu, 1 Jun 2017 10:14:00 -0700 (PDT) X-Received: by 10.237.37.100 with SMTP id w33mr3443733qtc.14.1496337239973; Thu, 01 Jun 2017 10:13:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496337239; cv=none; d=google.com; s=arc-20160816; b=HHKEjIiL9fzIKE+3EpVeaWWmQMIUR6gYq8W7sKCnT7WXJJOKyOHxEyesSrkpEplOJ6 7EJvf4Q1qcfF7S+wSAafYzf3Ob/AwxnAJ6yxiBnlv5laeac47yS2H+KonQwXuovnphNv IWDJmCuUkbJDkNAEs0oV27lZOm/fjkkr7DpqqDWy4Voz9UGSypUHUDLfpr3hX4cwzhv4 v7UqumiwklcrBuOxU0MpGFIYm/w63jpUPt7t5qr4QOJYFOByiAu3zBrD/qxWWBTnDyml kK9O2bsN3KPwkSsx1Pd1J6BIba9tc7ID13CrmsxOBGrp9fCFXlpsa6r+p/RHoB5dUG/k f8CQ== 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=f0D+qYvn348QkfpMFfZJSvg1AhvLdHWBeY2lqC+QHCo=; b=E9FGhn+yRTVnIwpKvQxH0o1+FnWhuyb2zvbzPiHGthueFHg8SwzsxoTnkbTfu7/M3W se31ZLKWnooKgalulndZviyEpR0SaRN5LDpof3CHiH3aWFeqOhSC2/xIIYGfq1ei9hbE 6oiJYRAICz+tY0Thjggv+DACytoDCEusYDmA763diNil3gMaWvgSORWKi/stO8/z8hA8 2L4XxOyKSyx+GOwu6N7T3tInWYjhow883CJRYmSFYAmegfe1HiELvQOua7a4iEvmpO2o YKhy7N6obtCMBDj1tBmsCpMogrQ6lVveJ485+yqOuAjPdzNbRdt3nFBgMe2a6KuUNzNk UVWQ== 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 85si10390409qkz.146.2017.06.01.10.13.59 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 01 Jun 2017 10:13:59 -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]:45807 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1dGTfZ-0003fY-Dp for patch@linaro.org; Thu, 01 Jun 2017 13:13:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35072) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1dGTcU-00013I-9J for qemu-devel@nongnu.org; Thu, 01 Jun 2017 13:10:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1dGTcT-000684-D0 for qemu-devel@nongnu.org; Thu, 01 Jun 2017 13:10:46 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37145) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1dGTcT-00067A-5D for qemu-devel@nongnu.org; Thu, 01 Jun 2017 13:10:45 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from <pm215@archaic.org.uk>) id 1dGTcS-0007QJ-85 for qemu-devel@nongnu.org; Thu, 01 Jun 2017 18:10:44 +0100 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Thu, 1 Jun 2017 18:10:20 +0100 Message-Id: <1496337035-30213-13-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496337035-30213-1-git-send-email-peter.maydell@linaro.org> References: <1496337035-30213-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 12/27] arm: Don't let no-MPU PMSA cores write to SCTLR.M 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 404bfdb..f0f25c8 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -3258,6 +3258,11 @@ static void sctlr_write(CPUARMState *env, const ARMCPRegInfo *ri, return; } + if (arm_feature(env, ARM_FEATURE_PMSA) && !cpu->has_mpu) { + /* M bit is RAZ/WI for PMSA with no MPU implemented */ + value &= ~SCTLR_M; + } + raw_write(env, ri, value); /* ??? Lots of these bits are not implemented. */ /* This may enable/disable the MMU, so do a TLB flush. */