From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33035) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3Pv2-0003m1-SE for qemu-devel@nongnu.org; Tue, 23 Dec 2014 08:54:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y3Pv1-00017L-LY for qemu-devel@nongnu.org; Tue, 23 Dec 2014 08:54:36 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:54615) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3Pv1-00015a-Dq for qemu-devel@nongnu.org; Tue, 23 Dec 2014 08:54:35 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Y3Puu-000440-GW for qemu-devel@nongnu.org; Tue, 23 Dec 2014 13:54:28 +0000 From: Peter Maydell Date: Tue, 23 Dec 2014 13:54:13 +0000 Message-Id: <1419342867-15527-18-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1419342867-15527-1-git-send-email-peter.maydell@linaro.org> References: <1419342867-15527-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 17/31] 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 From: 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 Message-id: 1418684992-8996-13-git-send-email-greg.bellows@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- 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.9.1