From patchwork Thu Apr 17 10:33:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 28548 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f71.google.com (mail-qg0-f71.google.com [209.85.192.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E4EA6206A6 for ; Thu, 17 Apr 2014 11:39:38 +0000 (UTC) Received: by mail-qg0-f71.google.com with SMTP id f51sf650841qge.6 for ; Thu, 17 Apr 2014 04:39:38 -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=2ain0Rl4U92HaZtsQrr5+TmF1cvYODtdRM2vzbyRtks=; b=llUeXxYoZT6qsx5GcZQ3m/U13jYAO8c7h5oXYhXMWiHk0CatgyaR717kgNXTnfVndM T8mMZ6FI/RG2BzNc4BNANXraBwvL5F1HutUHgisVq1yXerV7hfMp/KZczCd3wpeAq7q6 lYAPDMPPXgI5dX/qwi4lDekcz8yylmh8GJueOpN7A0hCv2MsgT0BXBlnYPuXe3Zg6vay lX/DxXuMgrZTlTYv0pkf/zdigG9ftWgwnZvP9GSStSBbfhAK9obZe7bjP7QbPDB1N3E/ /o75MB7g+wUDmN4jfWyCMhiZYFL586GeOX27YSRqU4ZJOH6vld6jdSNuGUFUPhmW4VLD Fa8w== X-Gm-Message-State: ALoCoQkI72apzgbrNohvgarvtPAaX5PUld7UCWADAccBjVNTbY9oRfMMadCdu4QmVjskqtKASI59 X-Received: by 10.236.181.74 with SMTP id k50mr5926811yhm.46.1397734778696; Thu, 17 Apr 2014 04:39:38 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.22.75 with SMTP id 69ls1075720qgm.94.gmail; Thu, 17 Apr 2014 04:39:38 -0700 (PDT) X-Received: by 10.58.74.38 with SMTP id q6mr11070605vev.7.1397734778553; Thu, 17 Apr 2014 04:39:38 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id w15si4394633vcz.181.2014.04.17.04.39.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 17 Apr 2014 04:39:38 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id ik5so354857vcb.28 for ; Thu, 17 Apr 2014 04:39:38 -0700 (PDT) X-Received: by 10.58.111.163 with SMTP id ij3mr6838683veb.26.1397734778452; Thu, 17 Apr 2014 04:39:38 -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.220.221.72 with SMTP id ib8csp28045vcb; Thu, 17 Apr 2014 04:39:38 -0700 (PDT) X-Received: by 10.140.102.85 with SMTP id v79mr16364534qge.8.1397734778027; Thu, 17 Apr 2014 04:39:38 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s6si10392929qaj.177.2014.04.17.04.39.37 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 17 Apr 2014 04:39:38 -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]:59556 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wajt3-0006iG-G3 for patch@linaro.org; Thu, 17 Apr 2014 06:49:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50862) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WajeA-0007kB-78 for qemu-devel@nongnu.org; Thu, 17 Apr 2014 06:34:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Waje9-0002T8-5B for qemu-devel@nongnu.org; Thu, 17 Apr 2014 06:34:22 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:47842) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Waje8-0002OB-Vf for qemu-devel@nongnu.org; Thu, 17 Apr 2014 06:34:21 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Wajdx-00021O-1n for qemu-devel@nongnu.org; Thu, 17 Apr 2014 11:34:09 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 17 Apr 2014 11:33:49 +0100 Message-Id: <1397730846-7576-35-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1397730846-7576-1-git-send-email-peter.maydell@linaro.org> References: <1397730846-7576-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 34/51] target-arm: Make Cortex-A15 CBAR read-only 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=neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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 The Cortex-A15's CBAR register is actually read-only (unlike that of the Cortex-A9). Correct our model to match the hardware. Signed-off-by: Peter Maydell Reviewed-by: Peter Crosthwaite --- target-arm/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-arm/cpu.c b/target-arm/cpu.c index f9f6187..c0ddc3e 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -744,7 +744,7 @@ static void cortex_a15_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_ARM_DIV); set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER); set_feature(&cpu->env, ARM_FEATURE_DUMMY_C15_REGS); - set_feature(&cpu->env, ARM_FEATURE_CBAR); + set_feature(&cpu->env, ARM_FEATURE_CBAR_RO); set_feature(&cpu->env, ARM_FEATURE_LPAE); cpu->kvm_target = QEMU_KVM_ARM_TARGET_CORTEX_A15; cpu->midr = 0x412fc0f1;