From patchwork Thu Dec 11 23:29: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: 420302 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A031F14009B for ; Fri, 12 Dec 2014 10:37:19 +1100 (AEDT) Received: from localhost ([::1]:54694 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzDIL-0007FE-PW for incoming@patchwork.ozlabs.org; Thu, 11 Dec 2014 18:37:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzDBG-0003uA-O8 for qemu-devel@nongnu.org; Thu, 11 Dec 2014 18:30:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XzDBA-0000mE-PL for qemu-devel@nongnu.org; Thu, 11 Dec 2014 18:29:58 -0500 Received: from mail-pd0-f173.google.com ([209.85.192.173]:48756) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzDBA-0000ld-IB for qemu-devel@nongnu.org; Thu, 11 Dec 2014 18:29:52 -0500 Received: by mail-pd0-f173.google.com with SMTP id ft15so5919614pdb.18 for ; Thu, 11 Dec 2014 15:29:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=opdvSQ8igkExbgwv7X8HJuor57tzO0OY3dRyqJPNxlE=; b=IY0VI8KHbf4jHHCPU722t3aQHRt+KpbItYzFXwROdMQBEloWE8ZKVKMt7Hw7MeSvKT mloLMcALOiTI0vRllaFUaRiDL0lTEAJsmlTmzA6pM1SABsNPK7U7t4IDwoMiVG0ValYr VKsZxB4NiEfavc6KWdYzxoKRwI+3bM8UELHXjahHy6RPNRCw8fMx9pRZc2hj87QXf2XB DbqaPkw1eWDQu/V8hP3a/O7JBn0lgReZNDrv22fcUB+zlOyQtZPRgFL6oQzk6hREpiYi bMb1gHwaScgMWX3SaK/hcZCDg0iKTpxP/aa/O2mCtWNxfO/UbERCtoDtKtrpcZRR9MR7 4AHg== X-Gm-Message-State: ALoCoQm3HYzJGcAdTM7ynMYJnvzNpEcrpU5t/FePtwC2FsGiMB8hhxH3FKED+U3USxXk+3aDYDhO X-Received: by 10.68.236.163 with SMTP id uv3mr2317478pbc.5.1418340592149; Thu, 11 Dec 2014 15:29:52 -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.50 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Dec 2014 15:29:51 -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:21 -0600 Message-Id: <1418340569-30519-8-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 07/15] target-arm: Add virt 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add "secure" virt machine specific property to allow override of the default secure state configuration. By default, when using the QEMU -kernel command line argument, virt machines boot into NS/SVC. When using the QEMU -bios command line argument, virt 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=virt,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/virt.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index b6bb914..3eacc43 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -93,6 +93,7 @@ typedef struct { typedef struct { MachineState parent; + bool secure; } VirtMachineState; #define TYPE_VIRT_MACHINE "virt" @@ -632,6 +633,33 @@ static void machvirt_init(MachineState *machine) arm_load_kernel(ARM_CPU(first_cpu), &vbi->bootinfo); } +static bool virt_get_secure(Object *obj, Error **errp) +{ + VirtMachineState *vms = VIRT_MACHINE(obj); + + return vms->secure; +} + +static void virt_set_secure(Object *obj, bool value, Error **errp) +{ + VirtMachineState *vms = VIRT_MACHINE(obj); + + vms->secure = value; +} + +static void virt_instance_init(Object *obj) +{ + VirtMachineState *vms = VIRT_MACHINE(obj); + + /* EL3 is enabled by default on virt */ + vms->secure = true; + object_property_add_bool(obj, "secure", virt_get_secure, + virt_set_secure, NULL); + object_property_set_description(obj, "secure", + "Set on/off to enable/disable secure state", + NULL); +} + static void virt_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -646,6 +674,7 @@ static const TypeInfo machvirt_info = { .name = TYPE_VIRT_MACHINE, .parent = TYPE_MACHINE, .instance_size = sizeof(VirtMachineState), + .instance_init = virt_instance_init, .class_size = sizeof(VirtMachineClass), .class_init = virt_class_init, };