From patchwork Wed Nov 5 23:23:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 40247 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1A709240A6 for ; Wed, 5 Nov 2014 23:37:51 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id n15sf1072702lbi.2 for ; Wed, 05 Nov 2014 15:37:50 -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: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=VFxDgm/KHgtr7uZH8EMNR64TUKuyKKON2zoRyFWQBVM=; b=EhYrU1v6NGIZTRDnOasQ+BhaqKUawu8sEVvGFEaO1n9mLNxkT2dlJ4ll49dJVrsAEx RcOozbVWVbeeyyDKTkwD0GugllNruq1hTXBANP1YRowPtPn0Q1x9HVGFlW29cenOd6NN cJ4qy6lfnYjqAGjdIDniypg2T1wTUGcYXVItscsGV28SALybcRu7m+roXjg6EY4jh1kV L9UoBYGbe9jfxoZoGuOjXBm7RYpPzAAJ729d6fCMLWH1wvjtJ4EVk99UO20qg6qraHnI dVCLScZQqBlbIPfLDu4ra1qR5OdaRDpfJbjpOSllY7dPDzLXmAwIDfgnbl2aGvg71akk addg== X-Gm-Message-State: ALoCoQlVuU2Wjc8Yxdq2Oc2zImyiO1J9VSWt2Xoq7Mg2QYE+hsqGReCqvB+ajmMQQ5sV/nimdZ4q X-Received: by 10.194.178.163 with SMTP id cz3mr89089wjc.1.1415230670636; Wed, 05 Nov 2014 15:37:50 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.45.7 with SMTP id i7ls8060lam.107.gmail; Wed, 05 Nov 2014 15:37:49 -0800 (PST) X-Received: by 10.152.9.201 with SMTP id c9mr688060lab.38.1415230669757; Wed, 05 Nov 2014 15:37:49 -0800 (PST) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id l2si8802438lbc.48.2014.11.05.15.37.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Nov 2014 15:37:49 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by mail-lb0-f171.google.com with SMTP id b6so1592461lbj.2 for ; Wed, 05 Nov 2014 15:37:49 -0800 (PST) X-Received: by 10.152.87.100 with SMTP id w4mr570683laz.27.1415230669201; Wed, 05 Nov 2014 15:37:49 -0800 (PST) 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.184.201 with SMTP id ew9csp372543lbc; Wed, 5 Nov 2014 15:37:48 -0800 (PST) X-Received: by 10.224.66.199 with SMTP id o7mr998753qai.90.1415230667918; Wed, 05 Nov 2014 15:37:47 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u1si9119810qai.25.2014.11.05.15.37.47 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 05 Nov 2014 15:37:47 -0800 (PST) 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]:49086 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XmA95-0002wr-4P for patch@linaro.org; Wed, 05 Nov 2014 18:37:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56537) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xm9vi-0004h4-MB for qemu-devel@nongnu.org; Wed, 05 Nov 2014 18:24:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xm9vd-0004iA-Eq for qemu-devel@nongnu.org; Wed, 05 Nov 2014 18:23:58 -0500 Received: from mail-pd0-f176.google.com ([209.85.192.176]:41240) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xm9vd-0004hx-AG for qemu-devel@nongnu.org; Wed, 05 Nov 2014 18:23:53 -0500 Received: by mail-pd0-f176.google.com with SMTP id ft15so1673291pdb.35 for ; Wed, 05 Nov 2014 15:23:52 -0800 (PST) X-Received: by 10.68.92.66 with SMTP id ck2mr543133pbb.72.1415229832761; Wed, 05 Nov 2014 15:23:52 -0800 (PST) Received: from gbellows-linaro.qualcomm.com (rrcs-67-52-129-61.west.biz.rr.com. [67.52.129.61]) by mx.google.com with ESMTPSA id r4sm4086349pdm.93.2014.11.05.15.23.50 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Nov 2014 15:23:51 -0800 (PST) From: Greg Bellows To: qemu-devel@nongnu.org, serge.fdrv@gmail.com, edgar.iglesias@gmail.com, aggelerf@ethz.ch, peter.maydell@linaro.org Date: Wed, 5 Nov 2014 17:23:07 -0600 Message-Id: <1415229793-3278-21-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1415229793-3278-1-git-send-email-greg.bellows@linaro.org> References: <1415229793-3278-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.192.176 Cc: greg.bellows@linaro.org Subject: [Qemu-devel] [PATCH v9 20/26] target-arm: make DFSR 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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.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: Fabian Aggeler When EL3 is running in AArch32 (or ARMv7 with Security Extensions) DFSR has a secure and a non-secure instance. Signed-off-by: Fabian Aggeler Signed-off-by: Greg Bellows Reviewed-by: Peter Maydell --- v3 -> v4 - Reverted esr/dfsr back to array-based notation as a union with v7 naming. --- target-arm/cpu.h | 10 +++++++++- target-arm/helper.c | 7 ++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 94a1ffb..dc65092 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -251,7 +251,15 @@ typedef struct CPUARMState { uint64_t ifsr32_el2; }; }; - uint64_t esr_el[4]; + union { + struct { + uint64_t _unused_dfsr; + uint64_t dfsr_ns; + uint64_t hsr; + uint64_t dfsr_s; + }; + uint64_t esr_el[4]; + }; uint32_t c6_region[8]; /* MPU base/size registers. */ uint64_t far_el[4]; /* Fault address registers. */ uint64_t par_el1; /* Translation result. */ diff --git a/target-arm/helper.c b/target-arm/helper.c index 4f0f968..42b59de 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -1651,7 +1651,8 @@ static void vmsa_ttbr_write(CPUARMState *env, const ARMCPRegInfo *ri, static const ARMCPRegInfo vmsa_cp_reginfo[] = { { .name = "DFSR", .cp = 15, .crn = 5, .crm = 0, .opc1 = 0, .opc2 = 0, .access = PL1_RW, .type = ARM_CP_NO_MIGRATE, - .fieldoffset = offsetoflow32(CPUARMState, cp15.esr_el[1]), + .bank_fieldoffsets = { offsetoflow32(CPUARMState, cp15.dfsr_s), + offsetoflow32(CPUARMState, cp15.dfsr_ns) }, .resetfn = arm_cp_reset_ignore, }, { .name = "IFSR", .cp = 15, .crn = 5, .crm = 0, .opc1 = 0, .opc2 = 1, .access = PL1_RW, .resetvalue = 0, @@ -4340,11 +4341,11 @@ void arm_cpu_do_interrupt(CPUState *cs) offset = 4; break; case EXCP_DATA_ABORT: - env->cp15.esr_el[1] = env->exception.fsr; + A32_BANKED_CURRENT_REG_SET(env, dfsr, env->exception.fsr); env->cp15.far_el[1] = deposit64(env->cp15.far_el[1], 0, 32, env->exception.vaddress); qemu_log_mask(CPU_LOG_INT, "...with DFSR 0x%x DFAR 0x%x\n", - (uint32_t)env->cp15.esr_el[1], + env->exception.fsr, (uint32_t)env->exception.vaddress); new_mode = ARM_CPU_MODE_ABT; addr = 0x10;