From patchwork Mon Dec 15 18:51:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 42281 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f70.google.com (mail-ee0-f70.google.com [74.125.83.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2630D2456A for ; Mon, 15 Dec 2014 18:57:13 +0000 (UTC) Received: by mail-ee0-f70.google.com with SMTP id b57sf7952441eek.9 for ; Mon, 15 Dec 2014 10:57:12 -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=l0o25fh6vWuD89rykl6Fb3QpjVhwzrKrsQ+jD8Haqn8=; b=bt6yy4Cjm1AAiIqzttbAkTp4TbFDohpCP9BgerjL8wtenxPFheJZ6u/FVMPF51LaTt V+P8/JW3o8ptdXpjJzQAq8nscMAjaNQ0qudsqXQhZbbNaE03enO//K6/wCH40hVfh9Mq Yob6VKpzEX60xSykwnuSUjMJwdrA8Y2Asvwyq1bL1oGPmp9R82cem7Lh9Ahs1YSC8HB7 X8JITMsY8uxJU4D/P1bVrvHJ3yHvmknvHPZ2XQ4mhTh4O44wumiehocek3SGKJNT2+nz 3ux2yPwCsJgyFh1dlDa2JdV8ro9M6BPHxCowGz2QN6YwYBMTmcgr4gdHIeDzk+5bcX2R YyTg== X-Gm-Message-State: ALoCoQk0FDZ6Cwn+P1EyGOsEQDRk1icpmyuiGmqcJ2FVfsvvUN7rn03SghlzijrghGZgbvbkIUl/ X-Received: by 10.112.155.198 with SMTP id vy6mr1220436lbb.7.1418669832234; Mon, 15 Dec 2014 10:57:12 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.99 with SMTP id s3ls442858lag.79.gmail; Mon, 15 Dec 2014 10:57:11 -0800 (PST) X-Received: by 10.152.28.71 with SMTP id z7mr31974250lag.60.1418669831966; Mon, 15 Dec 2014 10:57:11 -0800 (PST) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id w4si11349610lbb.28.2014.12.15.10.57.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Dec 2014 10:57:11 -0800 (PST) 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 u10so9772042lbd.3 for ; Mon, 15 Dec 2014 10:57:11 -0800 (PST) X-Received: by 10.152.25.129 with SMTP id c1mr32318803lag.9.1418669831886; Mon, 15 Dec 2014 10:57:11 -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 ru5csp809751lbb; Mon, 15 Dec 2014 10:57:11 -0800 (PST) X-Received: by 10.229.50.135 with SMTP id z7mr58155013qcf.21.1418669830451; Mon, 15 Dec 2014 10:57:10 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id l18si11569341qab.88.2014.12.15.10.57.09 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 15 Dec 2014 10:57:10 -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]:41488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0apR-0000Qj-M2 for patch@linaro.org; Mon, 15 Dec 2014 13:57:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0akI-0000gE-SM for qemu-devel@nongnu.org; Mon, 15 Dec 2014 13:51:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0akC-0005w0-Vm for qemu-devel@nongnu.org; Mon, 15 Dec 2014 13:51:50 -0500 Received: from mail-pd0-f180.google.com ([209.85.192.180]:58602) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0akC-0005vq-Ak for qemu-devel@nongnu.org; Mon, 15 Dec 2014 13:51:44 -0500 Received: by mail-pd0-f180.google.com with SMTP id w10so12210723pde.11 for ; Mon, 15 Dec 2014 10:51:43 -0800 (PST) X-Received: by 10.68.232.104 with SMTP id tn8mr53724969pbc.31.1418669503769; Mon, 15 Dec 2014 10:51:43 -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 bq7sm9972513pdb.50.2014.12.15.10.51.42 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Dec 2014 10:51:43 -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: Mon, 15 Dec 2014 12:51:13 -0600 Message-Id: <1418669479-23908-10-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1418669479-23908-1-git-send-email-greg.bellows@linaro.org> References: <1418669479-23908-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.180 Cc: Greg Bellows Subject: [Qemu-devel] [PATCH v3 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.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 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 Reviewed-by: Peter Maydell --- v1 -> v2 - Added set of has_el3 to true when EL3 is enabled v2 -> v3 - Properly init has_el3 - Fixed typo --- target-arm/cpu-qom.h | 2 ++ target-arm/cpu.c | 23 +++++++++++++++++++++++ 2 files changed, 25 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..069e090 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, true); + static void arm_cpu_post_init(Object *obj) { ARMCPU *cpu = ARM_CPU(obj); @@ -407,6 +410,14 @@ 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); + } } static void arm_cpu_finalizefn(Object *obj) @@ -476,6 +487,18 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) cpu->reset_sctlr |= (1 << 13); } + if (!cpu->has_el3) { + /* If the has_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);