From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0akN-0000oo-MT for qemu-devel@nongnu.org; Mon, 15 Dec 2014 13:52:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0akH-0005xa-Qd for qemu-devel@nongnu.org; Mon, 15 Dec 2014 13:51:55 -0500 Received: from mail-pa0-f50.google.com ([209.85.220.50]:34707) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0akH-0005xP-Ks for qemu-devel@nongnu.org; Mon, 15 Dec 2014 13:51:49 -0500 Received: by mail-pa0-f50.google.com with SMTP id bj1so12311007pad.23 for ; Mon, 15 Dec 2014 10:51:49 -0800 (PST) From: Greg Bellows Date: Mon, 15 Dec 2014 12:51:16 -0600 Message-Id: <1418669479-23908-13-git-send-email-greg.bellows@linaro.org> In-Reply-To: <1418669479-23908-1-git-send-email-greg.bellows@linaro.org> References: <1418669479-23908-1-git-send-email-greg.bellows@linaro.org> Subject: [Qemu-devel] [PATCH v3 12/15] target-arm: Set CPU has_el3 prop during virt init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, serge.fdrv@gmail.com, edgar.iglesias@gmail.com, aggelerf@ethz.ch, peter.maydell@linaro.org Cc: Greg Bellows Adds setting of the CPU has_el3 property based on the virt machine secure state property during initialization. This enables/disables EL3 state during start-up. Changes include adding an additional secure state boolean during virt CPU initialization. Also disables the ARM secure boot by default. Signed-off-by: Greg Bellows --- v1 -> v2 - Changes CPU property name from "secure" to "has_el3" - Change conditional to handle machine state default of secure. The check now checks if the machine secure property has been disabled which causes the CPU EL3 feature to be disabled. - Add setting of arm_boot_info.secure_boot to false v2 -> v3 - Silently ignore error if "has_el3" does not exist - Remove board initialization of secure_boot as it is implied. - Revise secure machine property description --- hw/arm/virt.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 3eacc43..3a49ad0 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -96,6 +96,9 @@ typedef struct { bool secure; } VirtMachineState; +#define SECURE_PROP_DESC \ + "Set on/off to enable/disable the ARM Security Extensions (TrustZone)" + #define TYPE_VIRT_MACHINE "virt" #define VIRT_MACHINE(obj) \ OBJECT_CHECK(VirtMachineState, (obj), TYPE_VIRT_MACHINE) @@ -547,6 +550,7 @@ static void *machvirt_dtb(const struct arm_boot_info *binfo, int *fdt_size) static void machvirt_init(MachineState *machine) { + VirtMachineState *vms = VIRT_MACHINE(machine); qemu_irq pic[NUM_IRQS]; MemoryRegion *sysmem = get_system_memory(); int n; @@ -584,6 +588,10 @@ static void machvirt_init(MachineState *machine) } cpuobj = object_new(object_class_get_name(oc)); + if (!vms->secure) { + object_property_set_bool(cpuobj, false, "has_el3", NULL); + } + object_property_set_int(cpuobj, QEMU_PSCI_CONDUIT_HVC, "psci-conduit", NULL); @@ -655,9 +663,7 @@ static void virt_instance_init(Object *obj) 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); + object_property_set_description(obj, "secure", SECURE_PROP_DESC, NULL); } static void virt_class_init(ObjectClass *oc, void *data) -- 1.8.3.2