From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36069) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0ema-0003pY-Ro for qemu-devel@nongnu.org; Mon, 15 Dec 2014 18:10:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0emU-0000i4-DQ for qemu-devel@nongnu.org; Mon, 15 Dec 2014 18:10:28 -0500 Received: from mail-pd0-f178.google.com ([209.85.192.178]:50061) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0emU-0000hd-8t for qemu-devel@nongnu.org; Mon, 15 Dec 2014 18:10:22 -0500 Received: by mail-pd0-f178.google.com with SMTP id r10so12514196pdi.23 for ; Mon, 15 Dec 2014 15:10:21 -0800 (PST) From: Greg Bellows Date: Mon, 15 Dec 2014 17:09:49 -0600 Message-Id: <1418684992-8996-13-git-send-email-greg.bellows@linaro.org> In-Reply-To: <1418684992-8996-1-git-send-email-greg.bellows@linaro.org> References: <1418684992-8996-1-git-send-email-greg.bellows@linaro.org> Subject: [Qemu-devel] [PATCH v4 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 v3 -> v4 - Move machine secure property description change to correct patch. --- hw/arm/virt.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 73c68c7..a9e13ca 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -547,6 +547,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 +585,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); -- 1.8.3.2