From patchwork Tue Oct 21 16:55:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 39172 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A72872039B for ; Tue, 21 Oct 2014 17:02:12 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id bs8sf1244435wib.11 for ; Tue, 21 Oct 2014 10:02:11 -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=w6Bl3QafeHQAv7CJ/4Ofu+HaBFXDoj+YKYsoGpyck3w=; b=bUTKHUrV89ggWbPGMFhNgrVwrrBDSmAaNNYiL8q1KxEMTQdeREWSXSf6C+Avh4+qJj wtuR7wp+6qtXSl3ZV2sGMSLRS0QcZ3EcMqFV1wpXZyBOdl+z0vI38xgPFdi4kB0k1fzZ h/CKO19sUdHf0s6JceKK09yNccWItK/Wa3XJkHw8L5f5zQ9hCBE2fTXyjgoSa5NzJrUH RuCsKcTtcwkbQSa9c4NrIwvA3j+UeEyox9m58VUgrUUKP8fcJmdw8F3JTdu6yHIwJoZk CQ5bOsQOG1dGoxUKjXkyWI9Ay9eLH11oJe2eeyJe4Dv32HfCWErLr9M+9cTJqiEFnzmP ue1A== X-Gm-Message-State: ALoCoQlxFo4FznFQvvPEa3mBYWT/T302Blnrr+xoLntl/76344b+4U4rsg+n5yrzan3t/q+En8S3 X-Received: by 10.180.75.83 with SMTP id a19mr3768799wiw.2.1413910930076; Tue, 21 Oct 2014 10:02:10 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.170 with SMTP id l10ls75691lah.18.gmail; Tue, 21 Oct 2014 10:02:09 -0700 (PDT) X-Received: by 10.152.178.197 with SMTP id da5mr18080162lac.83.1413910929822; Tue, 21 Oct 2014 10:02:09 -0700 (PDT) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com. [209.85.217.180]) by mx.google.com with ESMTPS id 1si19908107lai.41.2014.10.21.10.02.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 Oct 2014 10:02:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by mail-lb0-f180.google.com with SMTP id n15so1363227lbi.25 for ; Tue, 21 Oct 2014 10:02:09 -0700 (PDT) X-Received: by 10.152.120.199 with SMTP id le7mr2275672lab.67.1413910928938; Tue, 21 Oct 2014 10:02:08 -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 c5csp541716lbz; Tue, 21 Oct 2014 10:02:08 -0700 (PDT) X-Received: by 10.220.1.193 with SMTP id 1mr3253434vcg.42.1413910927727; Tue, 21 Oct 2014 10:02:07 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [208.118.235.17]) by mx.google.com with ESMTPS id p5si13681294qga.7.2014.10.21.10.02.07 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 21 Oct 2014 10:02:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; Received: from localhost ([::1]:52446 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xgcow-00074O-Uh for patch@linaro.org; Tue, 21 Oct 2014 13:02:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42019) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xgcj9-0006iz-Tw for qemu-devel@nongnu.org; Tue, 21 Oct 2014 12:56:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xgcj2-0006pU-Vv for qemu-devel@nongnu.org; Tue, 21 Oct 2014 12:56:07 -0400 Received: from mail-qa0-f49.google.com ([209.85.216.49]:46522) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xgcj2-0006pM-Rb for qemu-devel@nongnu.org; Tue, 21 Oct 2014 12:56:00 -0400 Received: by mail-qa0-f49.google.com with SMTP id f12so1122115qad.22 for ; Tue, 21 Oct 2014 09:56:00 -0700 (PDT) X-Received: by 10.224.88.136 with SMTP id a8mr47747647qam.63.1413910560402; Tue, 21 Oct 2014 09:56:00 -0700 (PDT) Received: from gbellows-linaro.qualcomm.com ([67.52.129.61]) by mx.google.com with ESMTPSA id a3sm11122116qaa.49.2014.10.21.09.55.59 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 Oct 2014 09:55:59 -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: Tue, 21 Oct 2014 11:55:21 -0500 Message-Id: <1413910544-20150-10-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1413910544-20150-1-git-send-email-greg.bellows@linaro.org> References: <1413910544-20150-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.216.49 Cc: greg.bellows@linaro.org Subject: [Qemu-devel] [PATCH v7 09/32] target-arm: add banked register accessors 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.180 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 If EL3 is in AArch32 state certain cp registers are banked (secure and non-secure instance). When reading or writing to coprocessor registers the following macros can be used. - A32_BANKED macros are used for choosing the banked register based on provided input security argument. This macro is used to choose the bank during translation of MRC/MCR instructions that are dependent on something other than the current secure state. - A32_BANKED_CURRENT macros are used for choosing the banked register based on current secure state. This is NOT to be used for choosing the bank used during translation as it breaks monitor mode. If EL3 is operating in AArch64 state coprocessor registers are not banked anymore. The macros use the non-secure instance (_ns) in this case, which is architecturally mapped to the AArch64 EL register. Signed-off-by: Sergey Fedorov Signed-off-by: Fabian Aggeler Signed-off-by: Greg Bellows ========== v5 -> v6 - Converted macro USE_SECURE_REG() into inlince function use_secure_reg() - Globally replace Aarch# with AArch# v4 -> v5 - Cleaned-up macros to try and alleviate misuse. Made A32_BANKED macros take secure arg indicator rather than relying on USE_SECURE_REG. Incorporated the A32_BANKED macros into the A32_BANKED_CURRENT. CURRENT is now the only one that automatically chooses based on current secure state. Signed-off-by: Greg Bellows --- target-arm/cpu.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 1a564b9..b48b81a 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -817,6 +817,46 @@ static inline bool arm_el_is_aa64(CPUARMState *env, int el) return arm_feature(env, ARM_FEATURE_AARCH64); } +/* Function for determing whether to use the secure or non-secure bank of a CP + * register. When EL3 is operating in AArch32 state, the NS-bit determines + * whether the secure instance of a cp-register should be used. + */ +static inline bool use_secure_reg(CPUARMState *env) +{ + bool ret = (arm_feature(env, ARM_FEATURE_EL3) && + !arm_el_is_aa64(env, 3) && + !(env->cp15.scr_el3 & SCR_NS)); + + return ret; +} + +/* Macros for accessing a specified CP register bank */ +#define A32_BANKED_REG_GET(_env, _regname, _secure) \ + ((_secure) ? (_env)->cp15._regname##_s : (_env)->cp15._regname##_ns) + +#define A32_BANKED_REG_SET(_env, _regname, _secure, _val) \ + do { \ + if (_secure) { \ + (_env)->cp15._regname##_s = (_val); \ + } else { \ + (_env)->cp15._regname##_ns = (_val); \ + } \ + } while (0) + +/* Macros for automatically accessing a specific CP register bank depending on + * the current secure state of the system. These macros are not intended for + * supporting instruction translation reads/writes as these are dependent + * solely on the SCR.NS bit and not the mode. + */ +#define A32_BANKED_CURRENT_REG_GET(_env, _regname) \ + A32_BANKED_REG_GET((_env), _regname, \ + ((!arm_el_is_aa64((_env), 3) && arm_is_secure(_env)))) + +#define A32_BANKED_CURRENT_REG_SET(_env, _regname, _val) \ + A32_BANKED_REG_SET((_env), _regname, \ + ((!arm_el_is_aa64((_env), 3) && arm_is_secure(_env))), \ + (_val)) + void arm_cpu_list(FILE *f, fprintf_function cpu_fprintf); unsigned int arm_excp_target_el(CPUState *cs, unsigned int excp_idx);