[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/31] target-arm: Set CPU has_el3 prop during virt i
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 17/31] target-arm: Set CPU has_el3 prop during virt init |
Date: |
Tue, 23 Dec 2014 13:54:13 +0000 |
From: Greg Bellows <address@hidden>
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 <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
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
- [Qemu-devel] [PULL 28/31] arm: add fw_cfg to "virt" board, (continued)
- [Qemu-devel] [PULL 28/31] arm: add fw_cfg to "virt" board, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 31/31] hw/arm/virt: enable passing of EFI-stubbed kernel to guest UEFI firmware, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 08/31] target-arm: Switch to common vexpress machine init, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 13/31] target-arm: Add feature unset function, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 10/31] target-arm: Change vexpress daughterboard init arg, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 03/31] machine: remove qemu_machine_opts global list, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 30/31] hw/arm: pass pristine kernel image to guest firmware over fw_cfg, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 25/31] exec: allows 8-byte accesses in subpage_ops, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 23/31] fw_cfg_mem: max access size and region size are the same for data register, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 26/31] fw_cfg_mem: introduce the "data_width" property, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 17/31] target-arm: Set CPU has_el3 prop during virt init,
Peter Maydell <=
- [Qemu-devel] [PULL 20/31] target-arm: add cpu feature EL3 to CPUs with Security Extensions, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 15/31] target-arm: Add arm_boot_info secure_boot control, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 14/31] target-arm: Add ARMCPU secure property, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 12/31] target-arm: Add virt machine secure property, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 01/31] audio: Don't free hw resources until after hw backend is stopped, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 09/31] target-arm: Add vexpress machine secure property, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 02/31] target-arm: Merge EL3 CP15 register lists, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 27/31] fw_cfg_mem: expose the "data_width" property with fw_cfg_init_mem_wide(), Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 29/31] hw/loader: split out load_image_gzipped_buffer(), Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 24/31] fw_cfg_mem: flip ctl_mem_ops and data_mem_ops to DEVICE_BIG_ENDIAN, Peter Maydell, 2014/12/23