diff mbox

[v3,12/15] target-arm: Set CPU has_el3 prop during virt init

Message ID 1418669479-23908-13-git-send-email-greg.bellows@linaro.org
State New
Headers show

Commit Message

Greg Bellows Dec. 15, 2014, 6:51 p.m. UTC 
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 <greg.bellows@linaro.org>

---

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
---
 hw/arm/virt.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Comments

Peter Maydell Dec. 15, 2014, 7:47 p.m. UTC | #1 
On 15 December 2014 at 18:51, Greg Bellows <greg.bellows@linaro.org> wrote:
> -    object_property_set_description(obj, "secure",
> -                         "Set on/off to enable/disable secure state",
> -                         NULL);
> +    object_property_set_description(obj, "secure", SECURE_PROP_DESC, NULL);

Same remarks about squashing here. PS: why the #define ?

-- PMM
diff mbox

Patch

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 3eacc43..3a49ad0 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -96,6 +96,9 @@  typedef struct {
     bool secure;
 } VirtMachineState;
 
+#define SECURE_PROP_DESC \
+    "Set on/off to enable/disable the ARM Security Extensions (TrustZone)"
+
 #define TYPE_VIRT_MACHINE   "virt"
 #define VIRT_MACHINE(obj) \
     OBJECT_CHECK(VirtMachineState, (obj), TYPE_VIRT_MACHINE)
@@ -547,6 +550,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 +588,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);
 
@@ -655,9 +663,7 @@  static void virt_instance_init(Object *obj)
     vms->secure = true;
     object_property_add_bool(obj, "secure", virt_get_secure,
                              virt_set_secure, NULL);
-    object_property_set_description(obj, "secure",
-                         "Set on/off to enable/disable secure state",
-                         NULL);
+    object_property_set_description(obj, "secure", SECURE_PROP_DESC, NULL);
 }
 
 static void virt_class_init(ObjectClass *oc, void *data)