From patchwork Mon Jun 15 17:24:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 49907 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9AB98211FD for ; Mon, 15 Jun 2015 17:34:28 +0000 (UTC) Received: by labnp3 with SMTP id np3sf8430649lab.1 for ; Mon, 15 Jun 2015 10:34:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=nD/X/gy2F3BaNAnfqVMOLPPIRdXHPOosH7YgL/Iv510=; b=JOJVsr/eA8sN6iIR1xz3AFZF3YFiNYLfS8TU2H2sqibKYG/1Ot5TJZ0utJRnIxEHPr EnA1H8WT9uPyKTgnMlCEf5R4hNgSn9+JsBFK08ad+jL1heORM+ZGrQ2efW5JA6uXQPE0 bjlRwJ8Jz9oLXU7r1HUSzk826o/MGmUXnVeV8UbxnfmHvgUWfbcoxlo014bq6iHdTEGs EXb48B5abb9GKo/XY0x7I8nXfrB/6ZYoVNxAL2XUzCfuP9FzxsfHDS8B8MjWI8v9S5PQ bx1ndVRjjXbxfCU9ufuADQpIKTipGq+PBHDz5yh5ws7z1NGGW5x9VwX9RHoREPFICpcc cCDw== X-Gm-Message-State: ALoCoQkw2bJr5qJwkWzkSgFVg8kpFipn8NFkQ5NYSnj8rNyvCW6MbpXaQDJ952whoZ3Xe4cEvdI4 X-Received: by 10.180.36.172 with SMTP id r12mr20460174wij.6.1434389666551; Mon, 15 Jun 2015 10:34:26 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.7.72 with SMTP id h8ls934462laa.71.gmail; Mon, 15 Jun 2015 10:34:26 -0700 (PDT) X-Received: by 10.152.30.34 with SMTP id p2mr28303502lah.89.1434389666386; Mon, 15 Jun 2015 10:34:26 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id uq2si10995547lbc.120.2015.06.15.10.34.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jun 2015 10:34:26 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by labbc20 with SMTP id bc20so26431465lab.1 for ; Mon, 15 Jun 2015 10:34:26 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr27626882lac.41.1434389666307; Mon, 15 Jun 2015 10:34:26 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1567499lbb; Mon, 15 Jun 2015 10:34:25 -0700 (PDT) X-Received: by 10.140.233.82 with SMTP id e79mr39456450qhc.83.1434389665051; Mon, 15 Jun 2015 10:34:25 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o10si13449274qge.57.2015.06.15.10.34.24 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 15 Jun 2015 10:34:25 -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; Received: from localhost ([::1]:35677 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4YHA-0006pX-5b for patch@linaro.org; Mon, 15 Jun 2015 13:34:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60788) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4Y8F-0007aX-9U for qemu-devel@nongnu.org; Mon, 15 Jun 2015 13:25:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4Y8D-0001Rg-8h for qemu-devel@nongnu.org; Mon, 15 Jun 2015 13:25:11 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34471) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4Y8D-0001AA-1w for qemu-devel@nongnu.org; Mon, 15 Jun 2015 13:25:09 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Z4Y83-0003Wn-DH for qemu-devel@nongnu.org; Mon, 15 Jun 2015 18:24:59 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 15 Jun 2015 18:24:49 +0100 Message-Id: <1434389098-13430-20-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1434389098-13430-1-git-send-email-peter.maydell@linaro.org> References: <1434389098-13430-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 19/28] arm: Don't add v7mp registers in MPU systems X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Peter Crosthwaite These registers are VMSA specific so they should be conditional on VMSA (i.e. !MPU). Signed-off-by: Peter Crosthwaite Message-id: 7bb8843e45f2635c6b7a583c5bb5da51ed4442a0.1434066412.git.peter.crosthwaite@xilinx.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target-arm/helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index d46db91..c8cb970 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -3193,7 +3193,8 @@ void register_cp_regs_for_features(ARMCPU *cpu) if (arm_feature(env, ARM_FEATURE_V6K)) { define_arm_cp_regs(cpu, v6k_cp_reginfo); } - if (arm_feature(env, ARM_FEATURE_V7MP)) { + if (arm_feature(env, ARM_FEATURE_V7MP) && + !arm_feature(env, ARM_FEATURE_MPU)) { define_arm_cp_regs(cpu, v7mp_cp_reginfo); } if (arm_feature(env, ARM_FEATURE_V7)) {