From patchwork Fri Oct 10 16:03:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 38596 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f71.google.com (mail-ee0-f71.google.com [74.125.83.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DA7FE205D8 for ; Fri, 10 Oct 2014 16:05:29 +0000 (UTC) Received: by mail-ee0-f71.google.com with SMTP id d17sf2395511eek.10 for ; Fri, 10 Oct 2014 09:05:29 -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=4shAro8QnMCC9IUiebqUWQXULEUtdD7Pz4B53kxZMJc=; b=G0yGpLWoJGVZJu2MJ1mhKL17ZZXHig6tglqfA2O3xZfkTdavg88uNTHq31RzCLTUrA 5t/rggbQ/RR51MpYTS8rRebFIHOkQgPWioO94Ax+tmsm6qIpKJb59mNmH9knCfFWBsTz kVOLE3KvVqAUUeNoWcMz5IHH8OtZjsWodW9xorDfG9WPckCdWXGuomJPxJnjIkTOlMWm LPV4qswhERi1uExmbWgqjv/L2cChEHJUZrtDgzvIODjRp5j+tSxz78lQyDfxAqlr6KGo 3jimxenuiz8J8OPq9SyUaJHiiJHrjkpvsM5yWbt/UBpWdyKODYgtaz6FzX7SeElbSyp9 XYXA== X-Gm-Message-State: ALoCoQnSPgphtY/KPDTvuvawKVP2Mm3o3FGdniQJzLwA+W3qLGy6k0HZAMzwSTySdX0l142A4Z48 X-Received: by 10.181.9.73 with SMTP id dq9mr1238894wid.2.1412957129038; Fri, 10 Oct 2014 09:05:29 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.5.33 with SMTP id cj1ls272605lad.48.gmail; Fri, 10 Oct 2014 09:05:28 -0700 (PDT) X-Received: by 10.152.23.170 with SMTP id n10mr5905761laf.29.1412957128783; Fri, 10 Oct 2014 09:05:28 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com [209.85.217.177]) by mx.google.com with ESMTPS id ri5si6821364lbb.115.2014.10.10.09.05.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 Oct 2014 09:05:28 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by mail-lb0-f177.google.com with SMTP id w7so3330856lbi.22 for ; Fri, 10 Oct 2014 09:05:28 -0700 (PDT) X-Received: by 10.152.7.145 with SMTP id j17mr5764397laa.67.1412957128652; Fri, 10 Oct 2014 09:05:28 -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 c5csp455772lbz; Fri, 10 Oct 2014 09:05:27 -0700 (PDT) X-Received: by 10.202.69.196 with SMTP id s187mr5327375oia.18.1412957126505; Fri, 10 Oct 2014 09:05:26 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id cr6si11760613qcb.12.2014.10.10.09.05.25 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 10 Oct 2014 09:05:26 -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]:49378 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xcch3-0008BP-9V for patch@linaro.org; Fri, 10 Oct 2014 12:05:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xccfm-0006nx-EG for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xccfg-0007yT-C5 for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:06 -0400 Received: from mail-oi0-f49.google.com ([209.85.218.49]:44422) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xccfg-0007yO-81 for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:00 -0400 Received: by mail-oi0-f49.google.com with SMTP id a3so7197483oib.22 for ; Fri, 10 Oct 2014 09:03:59 -0700 (PDT) X-Received: by 10.60.48.41 with SMTP id i9mr5473786oen.37.1412957039841; Fri, 10 Oct 2014 09:03:59 -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.03.59 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 Oct 2014 09:03: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: Fri, 10 Oct 2014 11:03:16 -0500 Message-Id: <1412957023-11105-6-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 05/32] target-arm: make arm_current_el() return EL3 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.177 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 Make arm_current_el() return EL3 for secure PL1 and monitor mode. Increase MMU modes since mmu_index is directly infered from arm_ current_el(). Changes assertion in arm_el_is_aa64() to allow EL3. Signed-off-by: Fabian Aggeler Signed-off-by: Greg Bellows Reviewed-by: Peter Maydell ========== v5 -> v6 - Rework arm_current_el() logic to properly return EL3 for secure PL1 when EL3 is 32-bit. - Replace direct access of env->aarch64 with is_a64() --- target-arm/cpu.h | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 149f258..ed32b97 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -100,7 +100,7 @@ typedef uint32_t ARMReadCPFunc(void *opaque, int cp_info, struct arm_boot_info; -#define NB_MMU_MODES 2 +#define NB_MMU_MODES 4 /* We currently assume float and double are IEEE single and double precision respectively. @@ -798,11 +798,12 @@ static inline bool arm_is_secure(CPUARMState *env) /* Return true if the specified exception level is running in AArch64 state. */ static inline bool arm_el_is_aa64(CPUARMState *env, int el) { - /* We don't currently support EL2 or EL3, and this isn't valid for EL0 + /* We don't currently support EL2, and this isn't valid for EL0 * (if we're in EL0, is_a64() is what you want, and if we're not in EL0 * then the state of EL0 isn't well defined.) */ - assert(el == 1); + assert(el == 1 || el == 3); + /* AArch64-capable CPUs always run with EL1 in AArch64 mode. This * is a QEMU-imposed simplification which we may wish to change later. * If we in future support EL2 and/or EL3, then the state of lower @@ -991,17 +992,27 @@ static inline bool cptype_valid(int cptype) */ static inline int arm_current_el(CPUARMState *env) { - if (env->aarch64) { + if (is_a64(env)) { return extract32(env->pstate, 2, 2); } - if ((env->uncached_cpsr & 0x1f) == ARM_CPU_MODE_USR) { + switch (env->uncached_cpsr & 0x1f) { + case ARM_CPU_MODE_USR: return 0; + case ARM_CPU_MODE_HYP: + return 2; + case ARM_CPU_MODE_MON: + return 3; + default: + if (arm_is_secure(env) && !arm_el_is_aa64(env, 3)) { + /* If EL3 is 32-bit then all secure privileged modes run in + * EL3 + */ + return 3; + } + + return 1; } - /* We don't currently implement the Virtualization or TrustZone - * extensions, so EL2 and EL3 don't exist for us. - */ - return 1; } typedef struct ARMCPRegInfo ARMCPRegInfo;