From patchwork Thu Dec 11 23:29:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 42171 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 C51A426666 for ; Thu, 11 Dec 2014 23:38:31 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id u10sf4172134lbd.10 for ; Thu, 11 Dec 2014 15:38:30 -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=aBWJmLkanmljVJrWA79leLh7kCDNF4CL2axOdGkCfCo=; b=Is2AjiLsDzLaXSZkRdWjHJB1+qtH6YsqFQp4NpC1RJ4QdP6WS0lE7OumK430EhZGkR c7Um8W6rrA581E5zyw7ejQ0xzQjJy5itV0ncFDEreZE0liECA3WQ1bYo0Xbb6ehLtoqG zMz4O90XX0F4ENrCBI6C8ykdBnuKf1IaGejKYKOAQspwzS7apsck0LnHY2OjxJtKS4Y2 fXm19WUxrA16usUeIG2es6JBiWP5mvztOzekjV63zaS9ZDivY/03TK//K+zK+Hu2K6Nm VZozX5zT3r91TclI5kh7eTu9EHlF32bGx310IyErX08jKaQ5JGiKsB/g+rNUwc4fZOiR VL4w== X-Gm-Message-State: ALoCoQnQ8LpkZsWaDAcm7ngGqK8Ma+GjCfuHBs+LmsA3Ra6aReUtPG5aZxXf0kdPbAgYwYCoXDSc X-Received: by 10.112.43.65 with SMTP id u1mr3090lbl.16.1418341110704; Thu, 11 Dec 2014 15:38:30 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.26.200 with SMTP id n8ls373178lag.10.gmail; Thu, 11 Dec 2014 15:38:30 -0800 (PST) X-Received: by 10.152.164.232 with SMTP id yt8mr12580762lab.7.1418341110327; Thu, 11 Dec 2014 15:38:30 -0800 (PST) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id iz2si2723401lbc.92.2014.12.11.15.38.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Dec 2014 15:38:29 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by mail-lb0-f176.google.com with SMTP id p9so4946071lbv.7 for ; Thu, 11 Dec 2014 15:38:29 -0800 (PST) X-Received: by 10.112.141.42 with SMTP id rl10mr12430696lbb.98.1418341109919; Thu, 11 Dec 2014 15:38:29 -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.142.69 with SMTP id ru5csp687544lbb; Thu, 11 Dec 2014 15:38:29 -0800 (PST) X-Received: by 10.140.93.49 with SMTP id c46mr23838976qge.58.1418341108375; Thu, 11 Dec 2014 15:38:28 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id v66si3174196qgv.96.2014.12.11.15.38.27 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 11 Dec 2014 15:38:28 -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]:54698 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzDJT-0008AA-IT for patch@linaro.org; Thu, 11 Dec 2014 18:38:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzDBK-0003zs-DY for qemu-devel@nongnu.org; Thu, 11 Dec 2014 18:30:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XzDBD-0000so-Ot for qemu-devel@nongnu.org; Thu, 11 Dec 2014 18:30:02 -0500 Received: from mail-pd0-f173.google.com ([209.85.192.173]:50863) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzDBD-0000rx-JA for qemu-devel@nongnu.org; Thu, 11 Dec 2014 18:29:55 -0500 Received: by mail-pd0-f173.google.com with SMTP id ft15so5919686pdb.18 for ; Thu, 11 Dec 2014 15:29:55 -0800 (PST) X-Received: by 10.68.135.100 with SMTP id pr4mr21169310pbb.123.1418340595048; Thu, 11 Dec 2014 15:29:55 -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 ip1sm2362908pbc.0.2014.12.11.15.29.53 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Dec 2014 15:29:54 -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: Thu, 11 Dec 2014 17:29:23 -0600 Message-Id: <1418340569-30519-10-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1418340569-30519-1-git-send-email-greg.bellows@linaro.org> References: <1418340569-30519-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.173 Cc: Greg Bellows Subject: [Qemu-devel] [PATCH v2 09/15] target-arm: Add ARMCPU secure property 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.176 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 Added a "has_el3" state property to the ARMCPU descriptor. This property indicates whether the ARMCPU has security extensions enabled (EL3) or not. By default it is disabled at this time. Signed-off-by: Greg Bellows --- v1 -> v2 - Added set of has_el3 to true when EL3 is enabled --- target-arm/cpu-qom.h | 2 ++ target-arm/cpu.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/target-arm/cpu-qom.h b/target-arm/cpu-qom.h index dcfda7d..ed5a644 100644 --- a/target-arm/cpu-qom.h +++ b/target-arm/cpu-qom.h @@ -100,6 +100,8 @@ typedef struct ARMCPU { bool start_powered_off; /* CPU currently in PSCI powered-off state */ bool powered_off; + /* CPU has security extension */ + bool has_el3; /* PSCI conduit used to invoke PSCI methods * 0 - disabled, 1 - smc, 2 - hvc diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 01afed2..758e8f8 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -388,6 +388,9 @@ static Property arm_cpu_reset_hivecs_property = static Property arm_cpu_rvbar_property = DEFINE_PROP_UINT64("rvbar", ARMCPU, rvbar, 0); +static Property arm_cpu_has_el3_property = + DEFINE_PROP_BOOL("has_el3", ARMCPU, has_el3, false); + static void arm_cpu_post_init(Object *obj) { ARMCPU *cpu = ARM_CPU(obj); @@ -407,6 +410,15 @@ static void arm_cpu_post_init(Object *obj) qdev_property_add_static(DEVICE(obj), &arm_cpu_rvbar_property, &error_abort); } + + if (arm_feature(&cpu->env, ARM_FEATURE_EL3)) { + /* Add the has_el3 state CPU property only if EL3 is allowed. This will + * prevent "has_el3" from existing on CPUs which cannot support EL3. + */ + qdev_property_add_static(DEVICE(obj), &arm_cpu_has_el3_property, + &error_abort); + cpu->has_el3 = true; + } } static void arm_cpu_finalizefn(Object *obj) @@ -476,6 +488,18 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) cpu->reset_sctlr |= (1 << 13); } + if (!cpu->has_el3) { + /* If the hsa_el3 CPU property is disabled then we need to disable the + * feature. + */ + unset_feature(env, ARM_FEATURE_EL3); + + /* Disable the security extension feature bits in the processor feature + * register as well. This is id_pfr1[7:4]. + */ + cpu->id_pfr1 &= ~0xf0; + } + register_cp_regs_for_features(cpu); arm_cpu_register_gdb_regs_for_features(cpu);