From patchwork Mon Dec 15 18:51:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 42277 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 450C72456A for ; Mon, 15 Dec 2014 18:54:58 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id bs8sf3933582wib.10 for ; Mon, 15 Dec 2014 10:54:57 -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=PioO9oTvLJUSN/ELytn2uX5pJ8jvT0V8hvLcpelzORw=; b=EnGIAxf8VIehCHvwuh9h8yVECBI0IMHYrgk9pRL02A/4GTz8s6uVH58TSttEpl+Zaq KeRKRA1CSS/QmUvd6kMzTFsaGV10P/ZbjIe5RX7JglNrDHIKMLTK/YguzTQOSr9q9sBD RrHhVG0XohHrSUXMm7Rx4mGrOYWqeohGUfadAG6MQR4c5EtUVTVx93GJUSWFtO9rl2P5 +aPGBTUFIw3x1b7zsQf0Ne26kwFicfIkDC+sh+yAtwbxxemQd3ddMndpMwZW8W9yvyI4 deUTIA9V3YCMLTIK0aoawj457UR7xaTRgHQk2EYX4Zay6lDQJhocwiphKVhvEthSlP+E H21g== X-Gm-Message-State: ALoCoQlRtBhV8NGO0IAL9zxKiKdi4UgmKQKyvd9rtPhajmkKAz08EiufeJwh18PMuB7sf9Q2gxhq X-Received: by 10.112.142.36 with SMTP id rt4mr4919032lbb.3.1418669697236; Mon, 15 Dec 2014 10:54:57 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.200 with SMTP id d8ls490581lah.18.gmail; Mon, 15 Dec 2014 10:54:56 -0800 (PST) X-Received: by 10.112.173.202 with SMTP id bm10mr30993283lbc.74.1418669696865; Mon, 15 Dec 2014 10:54:56 -0800 (PST) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id ev4si11282597lbc.105.2014.12.15.10.54.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Dec 2014 10:54:56 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by mail-lb0-f170.google.com with SMTP id 10so9756068lbg.15 for ; Mon, 15 Dec 2014 10:54:56 -0800 (PST) X-Received: by 10.112.52.37 with SMTP id q5mr31349885lbo.32.1418669696558; Mon, 15 Dec 2014 10:54:56 -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 ru5csp809280lbb; Mon, 15 Dec 2014 10:54:55 -0800 (PST) X-Received: by 10.224.96.129 with SMTP id h1mr7254187qan.46.1418669694879; Mon, 15 Dec 2014 10:54:54 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id w7si11601442qcg.40.2014.12.15.10.54.54 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 15 Dec 2014 10:54:54 -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]:41468 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0anG-00057W-2Q for patch@linaro.org; Mon, 15 Dec 2014 13:54:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0akE-0000Z0-VQ for qemu-devel@nongnu.org; Mon, 15 Dec 2014 13:51:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0ak9-0005uj-2p for qemu-devel@nongnu.org; Mon, 15 Dec 2014 13:51:46 -0500 Received: from mail-pa0-f42.google.com ([209.85.220.42]:47701) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0ak8-0005ub-TM for qemu-devel@nongnu.org; Mon, 15 Dec 2014 13:51:41 -0500 Received: by mail-pa0-f42.google.com with SMTP id et14so12416948pad.1 for ; Mon, 15 Dec 2014 10:51:40 -0800 (PST) X-Received: by 10.70.37.104 with SMTP id x8mr52793886pdj.119.1418669500353; Mon, 15 Dec 2014 10:51:40 -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.38 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Dec 2014 10:51:39 -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:11 -0600 Message-Id: <1418669479-23908-8-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.220.42 Cc: Greg Bellows Subject: [Qemu-devel] [PATCH v3 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+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.170 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" 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=off -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, };