[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/13] target-arm: Set CPU secure prop during VE ini
From: |
Greg Bellows |
Subject: |
[Qemu-devel] [PATCH 11/13] target-arm: Set CPU secure prop during VE init |
Date: |
Wed, 3 Dec 2014 14:06:05 -0600 |
Adds setting of the CPU secure state property based on the vexpress machine
secure state property during initialization. This enablesi/disables secure
state during start-up. Changes include adding an additional secure state
boolean during vexpress CPU initialization.
Signed-off-by: Greg Bellows <address@hidden>
---
hw/arm/vexpress.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index 4a345d8..392293f 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,15 @@ 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, true, "secure", &err);
+ if (err) {
+ error_report("'secure' machine property not supported "
+ "with %s cpu", cpu_model);
+ exit(1);
+ }
+ }
+
if (object_property_find(cpuobj, "reset-cbar", NULL)) {
object_property_set_int(cpuobj, periphbase,
"reset-cbar", &error_abort);
@@ -288,7 +297,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 +383,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: */
--
1.8.3.2
- Re: [Qemu-devel] [PATCH 04/13] target-arm: Add secure qemu machine option, (continued)
[Qemu-devel] [PATCH 07/13] target-arm: Add virt class and machine types, Greg Bellows, 2014/12/03
[Qemu-devel] [PATCH 09/13] target-arm: Add feature unset function, Greg Bellows, 2014/12/03
[Qemu-devel] [PATCH 08/13] target-arm: Add virt machine secure property, Greg Bellows, 2014/12/03
[Qemu-devel] [PATCH 10/13] target-arm: Add ARMCPU secure property, Greg Bellows, 2014/12/03
[Qemu-devel] [PATCH 11/13] target-arm: Set CPU secure prop during VE init,
Greg Bellows <=
[Qemu-devel] [PATCH 12/13] target-arm: Set CPU secure prop during virt init, Greg Bellows, 2014/12/03
[Qemu-devel] [PATCH 13/13] target-arm: add cpu feature EL3 to CPUs with Security Extensions, Greg Bellows, 2014/12/03