From patchwork Sat Feb 15 16:07:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 24690 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CFA47203BE for ; Sat, 15 Feb 2014 16:07:53 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id i4sf55768445oah.3 for ; Sat, 15 Feb 2014 08:07:53 -0800 (PST) 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=t5hH7mN4KmOVFz15dFRjmbJM4r4h9XVrUBwgWKyN6gg=; b=aPbDZbSMhdTe8deiLICFU0Mlr00XpHUPJtKtrRdSCKsUafCO00OxteNT6CKcTihPaH i0OE/wRsggxzObTmNsIojePITi3038mG8P8DagXXqvsDcz5E1iHOzHdeXjA+JRLJYVlO VfWabAr+m2H8aZ93B5AOuMHgLv0BVEXbpte+hNFHSP2YxYWlWeMXmrvzF6EYs3jQ0g6D /PNg5KVidXhPTbMxsC4cq116vQ39WsTcp/rVUk2jkiClkkL8AgXekgvt8BdrlqcTH72u jBfEJOkVGh6J1PjpPSkwYt/p28g1oPulcaWM3atsjakfVdDLJOeqW7lmam485P4qaj4Z 3TuA== X-Gm-Message-State: ALoCoQmcmOwNcZVdFhRwEFdrGEkJFyMeyquvHIuMQfiNKcmzofvfnaELmP+Ie/0M+b+Si5nB02mo X-Received: by 10.182.66.137 with SMTP id f9mr6253301obt.3.1392480472956; Sat, 15 Feb 2014 08:07:52 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.80.98 with SMTP id b89ls419957qgd.9.gmail; Sat, 15 Feb 2014 08:07:52 -0800 (PST) X-Received: by 10.52.89.230 with SMTP id br6mr8487611vdb.20.1392480472781; Sat, 15 Feb 2014 08:07:52 -0800 (PST) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id av10si3007443ved.74.2014.02.15.08.07.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 15 Feb 2014 08:07:52 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.174 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.174; Received: by mail-ve0-f174.google.com with SMTP id pa12so10751607veb.33 for ; Sat, 15 Feb 2014 08:07:52 -0800 (PST) X-Received: by 10.52.190.1 with SMTP id gm1mr2692595vdc.21.1392480472706; Sat, 15 Feb 2014 08:07:52 -0800 (PST) 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.174.196 with SMTP id u4csp25572vcz; Sat, 15 Feb 2014 08:07:51 -0800 (PST) X-Received: by 10.180.91.164 with SMTP id cf4mr6593518wib.37.1392480463312; Sat, 15 Feb 2014 08:07:43 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id gm10si3873319wib.10.2014.02.15.08.07.40 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 15 Feb 2014 08:07:43 -0800 (PST) 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 1WEhm1-0006fO-50; Sat, 15 Feb 2014 16:07:25 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Alexander Graf , Michael Matz , Claudio Fontana , Dirk Mueller , Laurent Desnogues , kvmarm@lists.cs.columbia.edu, Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Christoffer Dall , Will Newton , Peter Crosthwaite , Rob Herring Subject: [PATCH v3 09/31] target-arm: Implement AArch64 SCTLR_EL1 Date: Sat, 15 Feb 2014 16:07:02 +0000 Message-Id: <1392480444-25565-10-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1392480444-25565-1-git-send-email-peter.maydell@linaro.org> References: <1392480444-25565-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.174 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: , Implement the AArch64 view of the system control register SCTLR_EL1. Signed-off-by: Peter Maydell Reviewed-by: Peter Crosthwaite --- target-arm/cpu.h | 2 +- target-arm/helper.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 51fa634..74b1122 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -169,7 +169,7 @@ typedef struct CPUARMState { struct { uint32_t c0_cpuid; uint64_t c0_cssel; /* Cache size selection. */ - uint32_t c1_sys; /* System control register. */ + uint64_t c1_sys; /* System control register. */ uint32_t c1_coproc; /* Coprocessor access register. */ uint32_t c1_xscaleauxcr; /* XScale auxiliary control register. */ uint32_t c1_scr; /* secure config register. */ diff --git a/target-arm/helper.c b/target-arm/helper.c index 0e459f1..0a9036a 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -1948,7 +1948,8 @@ void register_cp_regs_for_features(ARMCPU *cpu) /* Generic registers whose values depend on the implementation */ { ARMCPRegInfo sctlr = { - .name = "SCTLR", .cp = 15, .crn = 1, .crm = 0, .opc1 = 0, .opc2 = 0, + .name = "SCTLR", .state = ARM_CP_STATE_BOTH, + .opc0 = 3, .crn = 1, .crm = 0, .opc1 = 0, .opc2 = 0, .access = PL1_RW, .fieldoffset = offsetof(CPUARMState, cp15.c1_sys), .writefn = sctlr_write, .resetvalue = cpu->reset_sctlr, .raw_writefn = raw_write,