From patchwork Thu Dec 11 23:29:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 42167 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 879AA26666 for ; Thu, 11 Dec 2014 23:35:03 +0000 (UTC) Received: by mail-wg0-f69.google.com with SMTP id x12sf4176097wgg.0 for ; Thu, 11 Dec 2014 15:35:02 -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=tyBXkF0JcfSbrxd7o9pDkgiYAJ2Mx2pCtUPZrYS2rc4=; b=F3wQTDuRtl0B9GjhWwwc4xXjzKG9b0QHQx3rY6MsBzFLNBMJm9kJ++mxXqdjJZNdmZ LDAndlxy5PBH+P0V7/vPlQ6P2glF9GMJjT8+rdq14cDcKDyYSmaECJJV2eTF1m/rczF2 azusLHdmmKWc13DM9y5SfLfdzIKo6gsbCFOaPRsbrStvE99D8e9w+KggzmrAUgaUh4zK HmWERmgxqF9d3Zzipj/GWs6QdUSlsBZGI9Sk6gXkdt9ZkMY4up98i5Ned080wpO0748w b9bvWYrgtlycaALSp3rNLIp5MGglIRvRQL8nILZ+7PcIlOeemOGrv0nUAKDtFoGrpFjG 9/hA== X-Gm-Message-State: ALoCoQnN0jVD7BcuWHWZTrwBOLKwcul7qUFUq/iYIY06rAf0tC/Z4URnRI8l6Hyc+8Fex6MRUhY7 X-Received: by 10.180.24.131 with SMTP id u3mr212658wif.4.1418340902837; Thu, 11 Dec 2014 15:35:02 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.206.102 with SMTP id ln6ls348033lac.95.gmail; Thu, 11 Dec 2014 15:35:02 -0800 (PST) X-Received: by 10.152.234.140 with SMTP id ue12mr12194438lac.78.1418340902552; Thu, 11 Dec 2014 15:35:02 -0800 (PST) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id rd5si2735125lbb.73.2014.12.11.15.35.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Dec 2014 15:35:02 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by mail-la0-f48.google.com with SMTP id gf13so5103231lab.7 for ; Thu, 11 Dec 2014 15:35:02 -0800 (PST) X-Received: by 10.112.235.164 with SMTP id un4mr2895677lbc.56.1418340902479; Thu, 11 Dec 2014 15:35:02 -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 ru5csp686862lbb; Thu, 11 Dec 2014 15:35:01 -0800 (PST) X-Received: by 10.229.44.7 with SMTP id y7mr25491733qce.26.1418340901215; Thu, 11 Dec 2014 15:35:01 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i9si3213363qaz.51.2014.12.11.15.35.00 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 11 Dec 2014 15:35:01 -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]:54674 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzDG8-0003iI-E0 for patch@linaro.org; Thu, 11 Dec 2014 18:35:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzDBD-0003tc-PY for qemu-devel@nongnu.org; Thu, 11 Dec 2014 18:30:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XzDB6-0000il-BE for qemu-devel@nongnu.org; Thu, 11 Dec 2014 18:29:55 -0500 Received: from mail-pa0-f49.google.com ([209.85.220.49]:60469) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzDB6-0000if-63 for qemu-devel@nongnu.org; Thu, 11 Dec 2014 18:29:48 -0500 Received: by mail-pa0-f49.google.com with SMTP id eu11so5977481pac.36 for ; Thu, 11 Dec 2014 15:29:47 -0800 (PST) X-Received: by 10.66.147.102 with SMTP id tj6mr21202043pab.95.1418340587396; Thu, 11 Dec 2014 15:29:47 -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.45 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Dec 2014 15:29:46 -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:18 -0600 Message-Id: <1418340569-30519-5-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.220.49 Cc: Greg Bellows Subject: [Qemu-devel] [PATCH v2 04/15] target-arm: Add vexpress machine 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.215.48 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 Add "secure" Vexpress machine specific property to allow override of the default secure state configuration. By default, when using the QEMU -kernel command line argument, Vexpress machines boot into NS/SVC. When using the QEMU -bios command line argument, Vexpress machines boot into S/SVC. The secure state can be changed from the default specifying the secure state as a machine property. For example, the below command line would enable secure state on a -linux boot: aarch64-softmmu/qemu-system-aarch64 -machine type=vexpress-a15,secure=on -kernel ... Signed-off-by: Greg Bellows Reviewed-by: Peter Maydell --- v1 -> v2 - Adapt the machine secure property to Marcel's new dynamic registration - Change the default machine secure property to true (on). --- hw/arm/vexpress.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index a03cb52..7b34f44 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -164,6 +164,7 @@ typedef struct { typedef struct { MachineState parent; + bool secure; } VexpressMachineState; #define TYPE_VEXPRESS_MACHINE "vexpress" @@ -701,6 +702,33 @@ static void vexpress_common_init(MachineState *machine) arm_load_kernel(ARM_CPU(first_cpu), &daughterboard->bootinfo); } +static bool vexpress_get_secure(Object *obj, Error **errp) +{ + VexpressMachineState *vms = VEXPRESS_MACHINE(obj); + + return vms->secure; +} + +static void vexpress_set_secure(Object *obj, bool value, Error **errp) +{ + VexpressMachineState *vms = VEXPRESS_MACHINE(obj); + + vms->secure = value; +} + +static void vexpress_instance_init(Object *obj) +{ + VexpressMachineState *vms = VEXPRESS_MACHINE(obj); + + /* EL3 is enabled by default on vexpress */ + vms->secure = true; + object_property_add_bool(obj, "secure", vexpress_get_secure, + vexpress_set_secure, NULL); + object_property_set_description(obj, "secure", + "Set on/off to enable/disable secure state", + NULL); +} + static void vexpress_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -739,6 +767,7 @@ static const TypeInfo vexpress_info = { .parent = TYPE_MACHINE, .abstract = true, .instance_size = sizeof(VexpressMachineState), + .instance_init = vexpress_instance_init, .class_size = sizeof(VexpressMachineClass), .class_init = vexpress_class_init, };