Message ID | 1496337035-30213-12-git-send-email-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | f50cd31413d8bc9d1eef8edd1f878324543bf65d |
Headers | show
Delivered-To: patch@linaro.org Received: by 10.182.202.35 with SMTP id kf3csp857259obc; Thu, 1 Jun 2017 10:11:13 -0700 (PDT) X-Received: by 10.55.189.66 with SMTP id n63mr3195078qkf.89.1496337073410; Thu, 01 Jun 2017 10:11:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496337073; cv=none; d=google.com; s=arc-20160816; b=M6NWIjmxR1cJ5TalSlVw1DypCkou1+WcSTkSUkz0uBaUv5ftP7tGnYGlhiF8NYS4ZQ VwA4yp677xcbDhmtGmNxYOVw5g7KHZRZYDs8qE3vCuP8N4YCgzBRDSh6J9J2+2XUwPC/ hmzeUXg1/uIeT1lW5vcjeSMFfVRD8B6sY1UNH6+BgrUTdgNAkekIXz+qsetKSGGWhCya Tka5mOy86Gpw0obDCWvlcj4HJ8QewLB3+2vHg8Y4uV2nDh5eGcR1NAdGun4QiLohaZXp dZsJ6mKgBjfeEEBI2Ca3M9tNlpOxaeE3WMLC4BdGpGrgnKZ/+Oib/D1TAr7izSOwVYVc xjGw== 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=ovDKBQIQXBNTIAFLV1tpD74QD2PwP3JT5p2+Tzq8o00=; b=zFD2Lwwab2qLE5Wu9VmmkhuJIBPU3aT5YxVbFqOl2vaGOXPAx1TRexpYO6S/tEG4D9 XsEGsdPpmfEige9Xaiy2bI4+tw2kgCU77+4M0xAezAZJh4dk1l2SQrYtJ43z7hp6wxmC ijEaBpHHN8iD31Qe5NsJ+J7/o1YVrUBO3mfBl//PraSQqJ6np/o2rMb1Z/cMNZLqOHwB e7Cdv2alaAhTtRwPegmBwZ00/brzzcARehgsmFNtHXNaQT+S411h169wW1y3jopWQbKL ldecmAFPWYrAUU6BcKKcwAdDl4IKO2TzkbA5Rq+8TJJ7a7J2l+xQmTLYKXjZHYves+pG H/yg== 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 p43si20187228qte.133.2017.06.01.10.11.13 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 01 Jun 2017 10:11:13 -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]:45799 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1dGTcs-00014t-PY for patch@linaro.org; Thu, 01 Jun 2017 13:11:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1dGTcT-00012u-Pl 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 1dGTcS-00067g-Uv for qemu-devel@nongnu.org; Thu, 01 Jun 2017 13:10:45 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37144) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1dGTcS-00064g-Ne for qemu-devel@nongnu.org; Thu, 01 Jun 2017 13:10:44 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from <pm215@archaic.org.uk>) id 1dGTcR-0007Q3-Jm for qemu-devel@nongnu.org; Thu, 01 Jun 2017 18:10:43 +0100 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Thu, 1 Jun 2017 18:10:19 +0100 Message-Id: <1496337035-30213-12-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 11/27] arm: Don't clear ARM_FEATURE_PMSA for no-mpu configs 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/cpu.c b/target/arm/cpu.c index f844af5..76a5e20 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -763,8 +763,14 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) cpu->id_pfr1 &= ~0xf000; } + /* MPU can be configured out of a PMSA CPU either by setting has-mpu + * to false or by setting pmsav7-dregion to 0. + */ if (!cpu->has_mpu) { - unset_feature(env, ARM_FEATURE_PMSA); + cpu->pmsav7_dregion = 0; + } + if (cpu->pmsav7_dregion == 0) { + cpu->has_mpu = false; } if (arm_feature(env, ARM_FEATURE_PMSA) &&