From patchwork Tue May 27 16:28:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 31016 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CFE012066E for ; Tue, 27 May 2014 17:50:25 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id tp5sf50693947ieb.5 for ; Tue, 27 May 2014 10:50:25 -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:cc: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=/7gYqrXoTG4vFDpEyjwPLWdXJaUVxsP9AL3cgq5aw2s=; b=HjpSnNIHwOZz9RqqFz9ojQrfxTDxJ/g33aMsYvirAppFSkHBErSESLY6dICGp7GtyK l0TYSrZx7c9zUf7htZwQxKP+SxU54HLpAlhWNpoOBXXT7aN+RWnhqT8gNZwszI+mwYXg PHnimNIig2fgZezyxu+KQXMdi+SRAkO+jvurFqTxUawPHSPnO5etOU4TbSerWBV+HJUn W/VwHwvjzdV0VLAxPuFXDLrrZzGTUKd6K3Ztt/X2epABoL1i7InZowLNOuj7L/n1K2ch sNFV3YjqZ5XjpF/e9EzdvbMkvsL7yFJxMWtM0L8c4vs5IX8Eo7J+8wqohvZi/vIvCJ+F mGpg== X-Gm-Message-State: ALoCoQk3/FTpYrZCQNGQtYiBpOL6INvuZIHkpExqPAG4AZ25XTxk54kllQO0PMJeS4pBLe//RHfx X-Received: by 10.183.11.102 with SMTP id eh6mr14334884obd.37.1401213025301; Tue, 27 May 2014 10:50:25 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.24.181 with SMTP id 50ls3164633qgr.92.gmail; Tue, 27 May 2014 10:50:25 -0700 (PDT) X-Received: by 10.52.28.39 with SMTP id y7mr2160407vdg.75.1401213025158; Tue, 27 May 2014 10:50:25 -0700 (PDT) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id fv10si8614906vdc.39.2014.05.27.10.50.25 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 27 May 2014 10:50:25 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.171 as permitted sender) client-ip=209.85.128.171; Received: by mail-ve0-f171.google.com with SMTP id oz11so11185222veb.30 for ; Tue, 27 May 2014 10:50:25 -0700 (PDT) X-Received: by 10.58.245.2 with SMTP id xk2mr29011534vec.9.1401213024954; Tue, 27 May 2014 10:50:24 -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 ib8csp138292vcb; Tue, 27 May 2014 10:50:24 -0700 (PDT) X-Received: by 10.140.40.81 with SMTP id w75mr16406677qgw.112.1401213024066; Tue, 27 May 2014 10:50:24 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b62si18027366qgb.26.2014.05.27.10.50.23 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 27 May 2014 10:50:24 -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]:36523 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKJV-000343-KO for patch@linaro.org; Tue, 27 May 2014 12:33:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41472) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKF5-00039A-2O for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WpKF4-0002qD-0P for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:47 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48252) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKF3-0002lf-Qo for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:45 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WpKEt-0005rQ-A1; Tue, 27 May 2014 17:28:35 +0100 From: Peter Maydell To: Anthony Liguori Date: Tue, 27 May 2014 17:28:26 +0100 Message-Id: <1401208114-22404-19-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1401208114-22404-1-git-send-email-peter.maydell@linaro.org> References: <1401208114-22404-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 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 18/26] target-arm: Register EL2 versions of ELR and SPSR 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.128.171 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: "Edgar E. Iglesias" Reviewed-by: Peter Crosthwaite Signed-off-by: Edgar E. Iglesias Message-id: 1400980132-25949-16-git-send-email-edgar.iglesias@gmail.com Signed-off-by: Peter Maydell --- target-arm/helper.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/target-arm/helper.c b/target-arm/helper.c index 368413c..a49cf94 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -2101,6 +2101,19 @@ static const ARMCPRegInfo v8_cp_reginfo[] = { REGINFO_SENTINEL }; +static const ARMCPRegInfo v8_el2_cp_reginfo[] = { + { .name = "ELR_EL2", .state = ARM_CP_STATE_AA64, + .type = ARM_CP_NO_MIGRATE, + .opc0 = 3, .opc1 = 4, .crn = 4, .crm = 0, .opc2 = 1, + .access = PL2_RW, + .fieldoffset = offsetof(CPUARMState, elr_el[2]) }, + { .name = "SPSR_EL2", .state = ARM_CP_STATE_AA64, + .type = ARM_CP_NO_MIGRATE, + .opc0 = 3, .opc1 = 4, .crn = 4, .crm = 0, .opc2 = 0, + .access = PL2_RW, .fieldoffset = offsetof(CPUARMState, banked_spsr[6]) }, + REGINFO_SENTINEL +}; + static void sctlr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) { @@ -2352,6 +2365,9 @@ void register_cp_regs_for_features(ARMCPU *cpu) define_arm_cp_regs(cpu, v8_cp_reginfo); define_aarch64_debug_regs(cpu); } + if (arm_feature(env, ARM_FEATURE_EL2)) { + define_arm_cp_regs(cpu, v8_el2_cp_reginfo); + } if (arm_feature(env, ARM_FEATURE_MPU)) { /* These are the MPU registers prior to PMSAv6. Any new * PMSA core later than the ARM946 will require that we