From patchwork Fri Oct 10 16:03:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 38614 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C6468205D8 for ; Fri, 10 Oct 2014 16:16:49 +0000 (UTC) Received: by mail-wi0-f198.google.com with SMTP id hi2sf1003601wib.9 for ; Fri, 10 Oct 2014 09:16:46 -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=G7Zt3UkVFgq/owRNrWFcYemgHg8FE6YOR7iID1tdGcw=; b=Ir67VKCYYQSJQ9C5n6QLjuPONs7EE2hwN1Du84JEMeAet3FdvnP78/6wLBRn9kq+G3 NaZJRgjN0MhJ3+P40UBm7hg+p+4fMpxnddercRFgreYfCu0srzmdkQdo3pLivC4pF/LS TgBFrzcbkHIeS6I0MGLH6wcJcouMC0YH5bpRATfYFGMIny0gXd1Jc3KtueUref6JTcML 4i0WcwNBEAQLmiQEaFK3R28PvcGf5FWiBLFiyNxPme+56VzYKlea9somTxoPqv7xpHnj wuIYnApn32J5PHkrHgE/RU8ngLhnj3M7bQ4djmGov+QeJKzuYPjBHRueMS7wSlAhEgsR c9Lw== X-Gm-Message-State: ALoCoQm8Y+tZYiRu+lifo7ZYT2h0OUmGmNVfNBapTOK3gFTtyQjxAOQdXmyl862OgLWuYvfcix50 X-Received: by 10.112.132.37 with SMTP id or5mr1160350lbb.2.1412957806420; Fri, 10 Oct 2014 09:16:46 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.74 with SMTP id r10ls311768lag.109.gmail; Fri, 10 Oct 2014 09:16:46 -0700 (PDT) X-Received: by 10.112.52.165 with SMTP id u5mr5828801lbo.80.1412957806277; Fri, 10 Oct 2014 09:16:46 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com [209.85.217.172]) by mx.google.com with ESMTPS id o5si9894843lao.127.2014.10.10.09.16.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 Oct 2014 09:16:46 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by mail-lb0-f172.google.com with SMTP id b6so3458706lbj.3 for ; Fri, 10 Oct 2014 09:16:46 -0700 (PDT) X-Received: by 10.112.138.202 with SMTP id qs10mr5806987lbb.66.1412957805664; Fri, 10 Oct 2014 09:16:45 -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 c5csp458087lbz; Fri, 10 Oct 2014 09:16:44 -0700 (PDT) X-Received: by 10.202.208.206 with SMTP id h197mr2603280oig.91.1412957804248; Fri, 10 Oct 2014 09:16:44 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id v1si11816508qcj.4.2014.10.10.09.16.43 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 10 Oct 2014 09:16:44 -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]:49519 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xccrz-0001ip-BX for patch@linaro.org; Fri, 10 Oct 2014 12:16:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35030) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xccfr-0006vg-Ht for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xccfm-00081W-3r for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:11 -0400 Received: from mail-oi0-f49.google.com ([209.85.218.49]:63796) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xccfl-00081H-V4 for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:06 -0400 Received: by mail-oi0-f49.google.com with SMTP id a3so6979947oib.36 for ; Fri, 10 Oct 2014 09:04:05 -0700 (PDT) X-Received: by 10.202.203.148 with SMTP id b142mr3237150oig.58.1412957045613; Fri, 10 Oct 2014 09:04:05 -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.04 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 Oct 2014 09:04:05 -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:22 -0500 Message-Id: <1412957023-11105-12-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.49 Subject: [Qemu-devel] [PATCH v6 11/32] target-arm: add CPREG secure state support 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.172 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 Prepare ARMCPRegInfo to support specifying two fieldoffsets per register definition. This will allow us to keep one register definition for banked registers (different offsets for secure/ non-secure world). Also added secure state tracking field and flags. This allows for identification of the register info secure state. Signed-off-by: Fabian Aggeler Signed-off-by: Greg Bellows ========== v5 -> v6 - Separate out secure CPREG flags - Add convenience macro for testing flags - Removed extraneous newline - Move add_cpreg_to_hashtable() functionality to a later commit for which it is dependent on. - Added comment explaining fieldoffset padding v4 -> v5 - Added ARM CP register secure and non-secure bank flags - Added setting of secure and non-secure flags furing registration --- target-arm/cpu.h | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 59414f3..4d8de9e 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -985,6 +985,24 @@ enum { ARM_CP_STATE_BOTH = 2, }; +/* ARM CP register secure state flags. These flags identify security state + * attributes for a given CP register entry. + * The existence of both or neither secure and non-secure flags indicates that + * the register has both a secure and non-secure hash entry. A single one of + * these flags causes the register to only be hashed for the specified + * security state. + * Although definitions may have any combination of the S/NS bits, each + * registered entry will only have one to identify whether the entry is secure + * or non-secure. + */ +enum { + ARM_CP_SECSTATE_S = (1 << 0), /* bit[0]: Secure state register */ + ARM_CP_SECSTATE_NS = (1 << 1), /* bit[1]: Non-secure state register */ +}; + +/* Convenience macro for checking for a specific bit */ +#define ARM_CP_SECSTATE_TEST(_ri, _flag) (((_ri)->secure & (_flag)) == (_flag)) + /* Return true if cptype is a valid type field. This is used to try to * catch errors where the sentinel has been accidentally left off the end * of a list of registers. @@ -1119,6 +1137,8 @@ struct ARMCPRegInfo { int type; /* Access rights: PL*_[RW] */ int access; + /* Security state: ARM_CP_SECSTATE_* bits/values */ + int secure; /* The opaque pointer passed to define_arm_cp_regs_with_opaque() when * this register was defined: can be used to hand data through to the * register read/write functions, since they are passed the ARMCPRegInfo*. @@ -1128,12 +1148,28 @@ struct ARMCPRegInfo { * fieldoffset is non-zero, the reset value of the register. */ uint64_t resetvalue; - /* Offset of the field in CPUARMState for this register. This is not - * needed if either: + /* Offsets of the fields (secure/non-secure) in CPUARMState for this + * register. The array will be accessed by the ns bit which means the + * secure instance has to be at [0] while the non-secure instance must be + * at [1]. If a register is not banked .fieldoffset can be used, which maps + * to the non-secure bank. + * + * Extra padding is added to align the default fieldoffset field with the + * non-secure bank_fieldoffsets entry. This is necessary for maintaining + * the same storage offset when AArch64 and banked AArch32 are seperately + * defined. + * + * This is not needed if either: * 1. type is ARM_CP_CONST or one of the ARM_CP_SPECIALs * 2. both readfn and writefn are specified */ - ptrdiff_t fieldoffset; /* offsetof(CPUARMState, field) */ + union { /* offsetof(CPUARMState, field) */ + struct { + ptrdiff_t _fieldoffset_padding; + ptrdiff_t fieldoffset; + }; + ptrdiff_t bank_fieldoffsets[2]; + }; /* Function for making any access checks for this register in addition to * those specified by the 'access' permissions bits. If NULL, no extra * checks required. The access check is performed at runtime, not at