[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 11/15] target-arm: Enable CPU has_el3 prop during
From: |
Greg Bellows |
Subject: |
[Qemu-devel] [PATCH v4 11/15] target-arm: Enable CPU has_el3 prop during VE init |
Date: |
Mon, 15 Dec 2014 17:09:48 -0600 |
Adds setting of the CPU has_el3 property based on the vexpress machine
secure state property during initialization. This enables/disables EL3
state during start-up. Changes include adding an additional secure state
boolean during vexpress CPU initialization. Also enables the ARM secure boot
by default.
Signed-off-by: Greg Bellows <address@hidden>
---
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 feautre to be disabled.
- Add setting of arm_boot_info.secure_boot to true
v2 -> v3
- Silently ignore error if "has_el3" does not exist.
- Revise secure machine property description
v3 -> v4
- Move machine secure property description change to correct patch.
---
hw/arm/vexpress.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index c63c422..84415c8 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -196,7 +196,7 @@ struct VEDBoardInfo {
};
static void init_cpus(const char *cpu_model, const char *privdev,
- hwaddr periphbase, qemu_irq *pic)
+ hwaddr periphbase, qemu_irq *pic, bool secure)
{
ObjectClass *cpu_oc = cpu_class_by_name(TYPE_ARM_CPU, cpu_model);
DeviceState *dev;
@@ -213,6 +213,10 @@ static void init_cpus(const char *cpu_model, const char
*privdev,
Object *cpuobj = object_new(object_class_get_name(cpu_oc));
Error *err = NULL;
+ if (!secure) {
+ object_property_set_bool(cpuobj, false, "has_el3", NULL);
+ }
+
if (object_property_find(cpuobj, "reset-cbar", NULL)) {
object_property_set_int(cpuobj, periphbase,
"reset-cbar", &error_abort);
@@ -288,7 +292,7 @@ static void a9_daughterboard_init(const
VexpressMachineState *vms,
memory_region_add_subregion(sysmem, 0x60000000, ram);
/* 0x1e000000 A9MPCore (SCU) private memory region */
- init_cpus(cpu_model, "a9mpcore_priv", 0x1e000000, pic);
+ init_cpus(cpu_model, "a9mpcore_priv", 0x1e000000, pic, vms->secure);
/* Daughterboard peripherals : 0x10020000 .. 0x20000000 */
@@ -374,7 +378,7 @@ static void a15_daughterboard_init(const
VexpressMachineState *vms,
memory_region_add_subregion(sysmem, 0x80000000, ram);
/* 0x2c000000 A15MPCore private memory region (GIC) */
- init_cpus(cpu_model, "a15mpcore_priv", 0x2c000000, pic);
+ init_cpus(cpu_model, "a15mpcore_priv", 0x2c000000, pic, vms->secure);
/* A15 daughterboard peripherals: */
@@ -699,6 +703,8 @@ static void vexpress_common_init(MachineState *machine)
daughterboard->bootinfo.smp_bootreg_addr = map[VE_SYSREGS] + 0x30;
daughterboard->bootinfo.gic_cpu_if_addr = daughterboard->gic_cpu_if_addr;
daughterboard->bootinfo.modify_dtb = vexpress_modify_dtb;
+ /* Indicate that when booting Linux we should be in secure state */
+ daughterboard->bootinfo.secure_boot = true;
arm_load_kernel(ARM_CPU(first_cpu), &daughterboard->bootinfo);
}
--
1.8.3.2
- [Qemu-devel] [PATCH v4 01/15] target-arm: Add vexpress class and machine types, (continued)
- [Qemu-devel] [PATCH v4 01/15] target-arm: Add vexpress class and machine types, Greg Bellows, 2014/12/15
- [Qemu-devel] [PATCH v4 02/15] target-arm: Add vexpress a9 & a15 machine objects, Greg Bellows, 2014/12/15
- [Qemu-devel] [PATCH v4 03/15] target-arm: Switch to common vexpress machine init, Greg Bellows, 2014/12/15
- [Qemu-devel] [PATCH v4 05/15] target-arm: Change vexpress daughterboard init arg, Greg Bellows, 2014/12/15
- [Qemu-devel] [PATCH v4 04/15] target-arm: Add vexpress machine secure property, Greg Bellows, 2014/12/15
- [Qemu-devel] [PATCH v4 06/15] target-arm: Add virt class and machine types, Greg Bellows, 2014/12/15
- [Qemu-devel] [PATCH v4 07/15] target-arm: Add virt machine secure property, Greg Bellows, 2014/12/15
- [Qemu-devel] [PATCH v4 08/15] target-arm: Add feature unset function, Greg Bellows, 2014/12/15
- [Qemu-devel] [PATCH v4 09/15] target-arm: Add ARMCPU secure property, Greg Bellows, 2014/12/15
- [Qemu-devel] [PATCH v4 10/15] target-arm: Add arm_boot_info secure_boot control, Greg Bellows, 2014/12/15
- [Qemu-devel] [PATCH v4 11/15] target-arm: Enable CPU has_el3 prop during VE init,
Greg Bellows <=
- [Qemu-devel] [PATCH v4 12/15] target-arm: Set CPU has_el3 prop during virt init, Greg Bellows, 2014/12/15
- [Qemu-devel] [PATCH v4 13/15] target-arm: Breakout integratorcp and versatilepb cpu init, Greg Bellows, 2014/12/15
- [Qemu-devel] [PATCH v4 14/15] target-arm: Disable EL3 on unsupported machines, Greg Bellows, 2014/12/15
- [Qemu-devel] [PATCH v4 15/15] target-arm: add cpu feature EL3 to CPUs with Security Extensions, Greg Bellows, 2014/12/15
- Re: [Qemu-devel] [PATCH v4 00/15] target-arm: Add CPU security extension enablement, Peter Maydell, 2014/12/16