From patchwork Thu Apr 10 16:15:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 28216 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f199.google.com (mail-qc0-f199.google.com [209.85.216.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4517021308 for ; Thu, 10 Apr 2014 16:16:08 +0000 (UTC) Received: by mail-qc0-f199.google.com with SMTP id e16sf11643706qcx.10 for ; Thu, 10 Apr 2014 09:16:08 -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:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=2ain0Rl4U92HaZtsQrr5+TmF1cvYODtdRM2vzbyRtks=; b=O05+PfErfbA/34w/luFWJiHwkw+CRBJ5yqm3hj1+F/miuMy7HYVC4UtC/rhnK3P+vI iZo50jaKK7V2ZMqiIBwXMptChgniXgAFYZjP/q6uMCLvovZcAtESCJ5RUCCG045AnmvT OMD4B4YP4jxURUSTbjicu2oFLvyYe52kRYqpcL4yJOSN0zvB5uUsAhVBkoL3IWlyw2do GEhHuOliUDr93uM9/grEHWvDFXRHeDYzb8bssJPb5AH6+r0xY2SUE6V8OEMzJFZdbw8l qJMmhEOMhySkm2bocioZ0itEZEnHNQmC846GFozx9/nZGRCpBqluzvY6CF0DDvVxLCOv 7vyw== X-Gm-Message-State: ALoCoQnJ5vRHzouZW5bejPNOyut2PxCTV7KZMA2Wa3DsvFcoDdQU3tbRWVyrzZ9Ao4QU/uSHSs0/ X-Received: by 10.236.17.161 with SMTP id j21mr6942105yhj.55.1397146567977; Thu, 10 Apr 2014 09:16:07 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.44.72 with SMTP id f66ls1236550qga.47.gmail; Thu, 10 Apr 2014 09:16:07 -0700 (PDT) X-Received: by 10.58.23.6 with SMTP id i6mr14778837vef.12.1397146567838; Thu, 10 Apr 2014 09:16:07 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id tq2si770823vdc.165.2014.04.10.09.16.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Apr 2014 09:16:07 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id sa20so3539893veb.22 for ; Thu, 10 Apr 2014 09:16:07 -0700 (PDT) X-Received: by 10.58.1.97 with SMTP id 1mr2120579vel.23.1397146567769; Thu, 10 Apr 2014 09:16:07 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp72289vcb; Thu, 10 Apr 2014 09:16:07 -0700 (PDT) X-Received: by 10.204.107.13 with SMTP id z13mr1439944bko.43.1397146563768; Thu, 10 Apr 2014 09:16:03 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id nr10si2048821bkb.335.2014.04.10.09.16.03 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 10 Apr 2014 09:16:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::1 as permitted sender) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WYHda-0007sT-AO; Thu, 10 Apr 2014 17:15:38 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Alexander Graf , Laurent Desnogues , kvmarm@lists.cs.columbia.edu, Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Christoffer Dall , Peter Crosthwaite , Greg Bellows Subject: [PATCH v6 35/37] target-arm: Make Cortex-A15 CBAR read-only Date: Thu, 10 Apr 2014 17:15:34 +0100 Message-Id: <1397146536-30116-36-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1397146536-30116-1-git-send-email-peter.maydell@linaro.org> References: <1397146536-30116-1-git-send-email-peter.maydell@linaro.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.128.177 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 Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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;