From patchwork Fri Oct 10 16:03:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 38620 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DA523202DB for ; Fri, 10 Oct 2014 16:24:44 +0000 (UTC) Received: by mail-lb0-f198.google.com with SMTP id 10sf2338174lbg.9 for ; Fri, 10 Oct 2014 09:24:43 -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=el10IL53E4tKx14Qx3qJE/iMW30o/zmoasnySP9EcP4=; b=M5MHpqepgiSHAPjFBRnMdalgck8mO6y5aac9qS2OoA2f3duVfjvDjQzd6Fd2fgvkPQ DvtKRmowTZITNNjfIWi6ZSZMXrndlGMmdOTY5EzoiENB8MJteN5NYbfL7GPYroPn+tJp 5bV20Lnwahw0oPlLRPMGBYySbbBWAAzJpZIJpTHL+lmQkT/tDxuss9CCEA8NsFPoAOqV GjOns66wGWUMIpbB34bFy2yHcQwri/dkt++v4CRIrokVEsAte+BQmjMMMRg82hu7EWZP v1Xl1weEtwnXH9DNZ286w64+yZep9PR3r7irwyDKA+j6BidsZrKvhBcNeR58ElPo5QIF 2+5w== X-Gm-Message-State: ALoCoQnsKcdoc5OIA2ftZ8Lq8VmTN9DEbSBUL/sYDpXUQMtVAd7MNgoaN4tLE/TOdO68+MHnekCk X-Received: by 10.112.168.225 with SMTP id zz1mr1147929lbb.8.1412958283009; Fri, 10 Oct 2014 09:24:43 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.234.167 with SMTP id uf7ls309525lac.100.gmail; Fri, 10 Oct 2014 09:24:42 -0700 (PDT) X-Received: by 10.112.151.99 with SMTP id up3mr5853633lbb.45.1412958282744; Fri, 10 Oct 2014 09:24:42 -0700 (PDT) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com [209.85.217.171]) by mx.google.com with ESMTPS id jn7si10157400lbc.7.2014.10.10.09.24.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 Oct 2014 09:24:40 -0700 (PDT) Received-SPF: temperror (google.com: error in processing during lookup of patch+caf_=patchwork-forward=linaro.org@linaro.org: DNS timeout) client-ip=209.85.217.171; Received: by mail-lb0-f171.google.com with SMTP id z12so3423269lbi.30 for ; Fri, 10 Oct 2014 09:24:40 -0700 (PDT) X-Received: by 10.152.26.226 with SMTP id o2mr6076488lag.44.1412958279366; Fri, 10 Oct 2014 09:24:39 -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.84.229 with SMTP id c5csp459597lbz; Fri, 10 Oct 2014 09:24:38 -0700 (PDT) X-Received: by 10.60.123.105 with SMTP id lz9mr3252136oeb.52.1412958278351; Fri, 10 Oct 2014 09:24:38 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 94si11809570qgp.54.2014.10.10.09.24.37 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 10 Oct 2014 09:24: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]:49624 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xcczd-00071N-9b for patch@linaro.org; Fri, 10 Oct 2014 12:24:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xccg5-0007N1-Ts for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xccg0-00088W-Ly for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:25 -0400 Received: from mail-oi0-f47.google.com ([209.85.218.47]:60324) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xccg0-00088L-Hw for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:20 -0400 Received: by mail-oi0-f47.google.com with SMTP id a141so7168097oig.34 for ; Fri, 10 Oct 2014 09:04:20 -0700 (PDT) X-Received: by 10.182.119.230 with SMTP id kx6mr2348220obb.72.1412957060074; Fri, 10 Oct 2014 09:04:20 -0700 (PDT) Received: from gbellows-linaro.bellowshome.net (99-179-1-128.lightspeed.austtx.sbcglobal.net. [99.179.1.128]) by mx.google.com with ESMTPSA id d6sm5382455obt.12.2014.10.10.09.04.19 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 Oct 2014 09:04:19 -0700 (PDT) From: Greg Bellows To: qemu-devel@nongnu.org, peter.maydell@linaro.org, serge.fdrv@gmail.com, edgar.iglesias@gmail.com, aggelerf@ethz.ch Date: Fri, 10 Oct 2014 11:03:37 -0500 Message-Id: <1412957023-11105-27-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1412957023-11105-1-git-send-email-greg.bellows@linaro.org> References: <1412957023-11105-1-git-send-email-greg.bellows@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.218.47 Subject: [Qemu-devel] [PATCH v6 26/32] target-arm: make IFSR banked 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: greg.bellows@linaro.org X-Original-Authentication-Results: mx.google.com; spf=temperror (google.com: error in processing during lookup of patch+caf_=patchwork-forward=linaro.org@linaro.org: DNS timeout) 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: Fabian Aggeler When EL3 is running in AArch32 (or ARMv7 with Security Extensions) IFSR has a secure and a non-secure instance. Signed-off-by: Fabian Aggeler Signed-off-by: Greg Bellows --- target-arm/cpu.h | 10 +++++++++- target-arm/helper.c | 9 +++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 315f98c..adb51d3 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -251,7 +251,15 @@ typedef struct CPUARMState { uint32_t pmsav5_insn_ap; /* PMSAv5 MPU insn access permissions */ uint64_t hcr_el2; /* Hypervisor configuration register */ uint64_t scr_el3; /* Secure configuration register. */ - uint32_t ifsr_el2; /* Fault status registers. */ + union { /* Fault status registers. */ + struct { + uint32_t ifsr_ns; + uint32_t ifsr_s; + }; + struct { + uint32_t ifsr32_el2; + }; + }; uint64_t esr_el[4]; uint32_t c6_region[8]; /* MPU base/size registers. */ uint64_t far_el[4]; /* Fault address registers. */ diff --git a/target-arm/helper.c b/target-arm/helper.c index 4db90ef..af6b371 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -1666,8 +1666,9 @@ static const ARMCPRegInfo vmsa_cp_reginfo[] = { .fieldoffset = offsetoflow32(CPUARMState, cp15.esr_el[1]), .resetfn = arm_cp_reset_ignore, }, { .name = "IFSR", .cp = 15, .crn = 5, .crm = 0, .opc1 = 0, .opc2 = 1, - .access = PL1_RW, - .fieldoffset = offsetof(CPUARMState, cp15.ifsr_el2), .resetvalue = 0, }, + .access = PL1_RW, .resetvalue = 0, + .bank_fieldoffsets = { offsetof(CPUARMState, cp15.ifsr_s), + offsetof(CPUARMState, cp15.ifsr_ns) } }, { .name = "ESR_EL1", .state = ARM_CP_STATE_AA64, .opc0 = 3, .crn = 5, .crm = 2, .opc1 = 0, .opc2 = 0, .access = PL1_RW, @@ -4354,11 +4355,11 @@ void arm_cpu_do_interrupt(CPUState *cs) env->exception.fsr = 2; /* Fall through to prefetch abort. */ case EXCP_PREFETCH_ABORT: - env->cp15.ifsr_el2 = env->exception.fsr; + A32_BANKED_CURRENT_REG_SET(env, ifsr, env->exception.fsr); env->cp15.far_el[1] = deposit64(env->cp15.far_el[1], 32, 32, env->exception.vaddress); qemu_log_mask(CPU_LOG_INT, "...with IFSR 0x%x IFAR 0x%x\n", - env->cp15.ifsr_el2, (uint32_t)env->exception.vaddress); + env->exception.fsr, (uint32_t)env->exception.vaddress); new_mode = ARM_CPU_MODE_ABT; addr = 0x0c; mask = CPSR_A | CPSR_I;