From patchwork Fri Oct 10 16:03:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 398707 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id ADC031400AB for ; Sat, 11 Oct 2014 03:11:35 +1100 (EST) Received: from localhost ([::1]:49440 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xccmz-00020u-Bz for incoming@patchwork.ozlabs.org; Fri, 10 Oct 2014 12:11:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35066) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xccft-0006z3-EF for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xccfo-00082g-0P for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:13 -0400 Received: from mail-oi0-f47.google.com ([209.85.218.47]:41352) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xccfn-00082V-RN for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:07 -0400 Received: by mail-oi0-f47.google.com with SMTP id a141so7290165oig.20 for ; Fri, 10 Oct 2014 09:04:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=YeAbwC87Prw21SH74zC/sO0Aa1K/x/HwUFXjDaeMXzQ=; b=N6d4LxJFYNwxiHAzDZgcWfN1Rf3y+YvppgPw6aWhMNhJVKDB6jqfQrVwmHD43z6NPm 0UGdlL1Naywm8ajQYsHTqoIHo4JH0AXhl6b3KKSnrLiF3B8Qkm3eUAFaQ29vsKLIbvnW s2a2C1u61LgFZxnLjT7hpmd406+JOJMf7K4V+qmT7+4OgAgfd1yNGnEHXZdOmgtZPGZ4 jxspevQ0WU42DRTGEa8OcL0F1CmSXDe4jtyM2wJn9cKb8YCZyXf5Gda2g3tYGo/QtJ3M zIOXEQadZn0CV5iQ0Phy5oAaD/URzFdzgazb1AbhX2dxfWDHBqvriH+jx0Fu5jDaqopa FTrQ== X-Gm-Message-State: ALoCoQkQ32ix2dBH4xV3kkLzI+mslP0+fDsOY3wDHKRa+PX4aYxHO7CuRaPkL8mTXsXVbeDBY/xd X-Received: by 10.202.89.3 with SMTP id n3mr1847646oib.101.1412957047414; Fri, 10 Oct 2014 09:04:07 -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.06 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 Oct 2014 09:04:07 -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:24 -0500 Message-Id: <1412957023-11105-14-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 13/32] target-arm: insert AArch32 cpregs twice into hashtable 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Fabian Aggeler Prepare for cp register banking by inserting every cp register twice, once for secure world and once for non-secure world. Signed-off-by: Fabian Aggeler Signed-off-by: Greg Bellows ========== v5 -> v6 - Fixed NS-bit number in the CPREG hash lookup from 27 to 29. - Switched to dedicated CPREG secure flags. - Fixed disablement of reset and migration of common 32/64-bit registers. - Globally replace Aarch# with AArch# v4 -> v5 - Added use of ARM CP secure/non-secure bank flags during register processing in define_one_arm_cp_reg_with_opaque(). We now only register the specified bank if only one flag is specified, otherwise we register both a secure and non-secure instance. --- target-arm/helper.c | 90 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 75 insertions(+), 15 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index dfdf9d2..f709b4a 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -3296,22 +3296,60 @@ static void add_cpreg_to_hashtable(ARMCPU *cpu, const ARMCPRegInfo *r, uint32_t *key = g_new(uint32_t, 1); ARMCPRegInfo *r2 = g_memdup(r, sizeof(ARMCPRegInfo)); int is64 = (r->type & ARM_CP_64BIT) ? 1 : 0; - if (r->state == ARM_CP_STATE_BOTH && state == ARM_CP_STATE_AA32) { - /* The AArch32 view of a shared register sees the lower 32 bits - * of a 64 bit backing field. It is not migratable as the AArch64 - * view handles that. AArch64 also handles reset. - * We assume it is a cp15 register if the .cp field is left unset. - */ - if (r2->cp == 0) { - r2->cp = 15; + + if (state == ARM_CP_STATE_AA32) { + /* Clear the secure state flags and set based on incoming nsbit */ + r2->secure &= ~(ARM_CP_SECSTATE_S | ARM_CP_SECSTATE_NS); + r2->secure |= ARM_CP_SECSTATE_S << nsbit; + + if (r->bank_fieldoffsets[0] && r->bank_fieldoffsets[1]) { + /* Register is banked (using both entries in array). + * Overwriting fieldoffset as the array was only used to define + * banked registers but later only fieldoffset is used. + */ + r2->fieldoffset = r->bank_fieldoffsets[nsbit]; + + /* If V8 is enabled then we don't need to migrate or reset the + * AArch32 version of the banked registers as this will be handled + * through the AArch64 view. + * If v7 then we don't need to migrate or reset the AArch32 + * non-secure bank as this will be handled through the AArch64 + * view. In this case the secure bank is not mirrored, so we must + * preserve it's reset criteria and allow it to be migrated. + * + * The exception to the above is cpregs with a crn of 13 + * (specifically FCSEIDR and CONTEXTIDR) in which case there may + * not be an AArch64 equivalent for one or either bank so migration + * and reset must be preserved. + */ + if (r->state == ARM_CP_STATE_BOTH) { + if ((arm_feature(&cpu->env, ARM_FEATURE_V8) && r->crn != 13) || + nsbit) { + r2->type |= ARM_CP_NO_MIGRATE; + r2->resetfn = arm_cp_reset_ignore; + } + } + } else if (!nsbit) { + /* The register is not banked so we only want to allow migration of + * the non-secure instance. + */ + r2->type |= ARM_CP_NO_MIGRATE; + r2->resetfn = arm_cp_reset_ignore; } - r2->type |= ARM_CP_NO_MIGRATE; - r2->resetfn = arm_cp_reset_ignore; + + if (r->state == ARM_CP_STATE_BOTH) { + /* We assume it is a cp15 register if the .cp field is left unset. + */ + if (r2->cp == 0) { + r2->cp = 15; + } + #ifdef HOST_WORDS_BIGENDIAN - if (r2->fieldoffset) { - r2->fieldoffset += sizeof(uint32_t); - } + if (r2->fieldoffset) { + r2->fieldoffset += sizeof(uint32_t); + } #endif + } } if (state == ARM_CP_STATE_AA64) { /* To allow abbreviation of ARMCPRegInfo @@ -3476,8 +3514,30 @@ void define_one_arm_cp_reg_with_opaque(ARMCPU *cpu, if (r->state != state && r->state != ARM_CP_STATE_BOTH) { continue; } - add_cpreg_to_hashtable(cpu, r, opaque, state, - crm, opc1, opc2, SCR_NS); + if (state == ARM_CP_STATE_AA32) { + /* Under AArch32 CP registers can be common + * (same for secure and non-secure world) or banked. + */ + uint32_t s = + r->secure & (ARM_CP_SECSTATE_S | ARM_CP_SECSTATE_NS); + if (ARM_CP_SECSTATE_S == s) { + add_cpreg_to_hashtable(cpu, r, opaque, state, + crm, opc1, opc2, !SCR_NS); + } else if (ARM_CP_SECSTATE_NS == s) { + add_cpreg_to_hashtable(cpu, r, opaque, state, + crm, opc1, opc2, SCR_NS); + } else { + add_cpreg_to_hashtable(cpu, r, opaque, state, + crm, opc1, opc2, !SCR_NS); + add_cpreg_to_hashtable(cpu, r, opaque, state, + crm, opc1, opc2, SCR_NS); + } + } else { + /* AArch64 registers get mapped to non-secure instance + * of AArch32 */ + add_cpreg_to_hashtable(cpu, r, opaque, state, + crm, opc1, opc2, SCR_NS); + } } } }