diff mbox

[v3,04/15] target-arm: Add vexpress machine secure property

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

Commit Message

Greg Bellows Dec. 15, 2014, 6:51 p.m. UTC
Add "secure" Vexpress machine specific property to allow override of the
default secure state configuration.  By default, when using the QEMU
-kernel command line argument, Vexpress machines boot into NS/SVC.  When using
the QEMU -bios command line argument, Vexpress machines boot into S/SVC.

The secure state can be changed from the default specifying the secure
state as a machine property.  For example, the below command line would enable
secure state on a -linux boot:

    aarch64-softmmu/qemu-system-aarch64
        -machine type=vexpress-a15,secure=off
        -kernel ...

Signed-off-by: Greg Bellows <greg.bellows@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

---

v1 -> v2
- Adapt the machine secure property to Marcel's new dynamic registration
- Change the default machine secure property to true (on).
---
 hw/arm/vexpress.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

Comments

Peter Maydell Dec. 15, 2014, 7:43 p.m. UTC | #1
On 15 December 2014 at 18:51, Greg Bellows <greg.bellows@linaro.org> wrote:
> Add "secure" Vexpress machine specific property to allow override of the
> default secure state configuration.  By default, when using the QEMU
> -kernel command line argument, Vexpress machines boot into NS/SVC.  When using
> the QEMU -bios command line argument, Vexpress machines boot into S/SVC.
>
> The secure state can be changed from the default specifying the secure
> state as a machine property.  For example, the below command line would enable

disable!

> secure state on a -linux boot:
>
>     aarch64-softmmu/qemu-system-aarch64
>         -machine type=vexpress-a15,secure=off
>         -kernel ...
>
> Signed-off-by: Greg Bellows <greg.bellows@linaro.org>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

> +    /* EL3 is enabled by default on vexpress */
> +    vms->secure = true;
> +    object_property_add_bool(obj, "secure", vexpress_get_secure,
> +                             vexpress_set_secure, NULL);
> +    object_property_set_description(obj, "secure",
> +                             "Set on/off to enable/disable secure state",
> +                             NULL);

I think we decided on IRC that
"Set on/off to enable/disable the ARM Security Extensions (TrustZone)"

was slightly more explanatory for the user?

-- PMM
Greg Bellows Dec. 15, 2014, 8:21 p.m. UTC | #2
On 15 December 2014 at 13:43, Peter Maydell <peter.maydell@linaro.org>
wrote:
>
> On 15 December 2014 at 18:51, Greg Bellows <greg.bellows@linaro.org>
> wrote:
> > Add "secure" Vexpress machine specific property to allow override of the
> > default secure state configuration.  By default, when using the QEMU
> > -kernel command line argument, Vexpress machines boot into NS/SVC.  When
> using
> > the QEMU -bios command line argument, Vexpress machines boot into S/SVC.
> >
> > The secure state can be changed from the default specifying the secure
> > state as a machine property.  For example, the below command line would
> enable
>
> disable!
>
> > secure state on a -linux boot:
> >
> >     aarch64-softmmu/qemu-system-aarch64
> >         -machine type=vexpress-a15,secure=off
> >         -kernel ...
> >
> > Signed-off-by: Greg Bellows <greg.bellows@linaro.org>
> > Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
>
> > +    /* EL3 is enabled by default on vexpress */
> > +    vms->secure = true;
> > +    object_property_add_bool(obj, "secure", vexpress_get_secure,
> > +                             vexpress_set_secure, NULL);
> > +    object_property_set_description(obj, "secure",
> > +                             "Set on/off to enable/disable secure
> state",
> > +                             NULL);
>
> I think we decided on IRC that
> "Set on/off to enable/disable the ARM Security Extensions (TrustZone)"
>
> was slightly more explanatory for the user?
>

bah... yes we did.  I made the code change, but failed to update the patch.


>
> -- PMM
>
diff mbox

Patch

diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index a03cb52..7b34f44 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -164,6 +164,7 @@  typedef struct {
 
 typedef struct {
     MachineState parent;
+    bool secure;
 } VexpressMachineState;
 
 #define TYPE_VEXPRESS_MACHINE   "vexpress"
@@ -701,6 +702,33 @@  static void vexpress_common_init(MachineState *machine)
     arm_load_kernel(ARM_CPU(first_cpu), &daughterboard->bootinfo);
 }
 
+static bool vexpress_get_secure(Object *obj, Error **errp)
+{
+    VexpressMachineState *vms = VEXPRESS_MACHINE(obj);
+
+    return vms->secure;
+}
+
+static void vexpress_set_secure(Object *obj, bool value, Error **errp)
+{
+    VexpressMachineState *vms = VEXPRESS_MACHINE(obj);
+
+    vms->secure = value;
+}
+
+static void vexpress_instance_init(Object *obj)
+{
+    VexpressMachineState *vms = VEXPRESS_MACHINE(obj);
+
+    /* EL3 is enabled by default on vexpress */
+    vms->secure = true;
+    object_property_add_bool(obj, "secure", vexpress_get_secure,
+                             vexpress_set_secure, NULL);
+    object_property_set_description(obj, "secure",
+                             "Set on/off to enable/disable secure state",
+                             NULL);
+}
+
 static void vexpress_class_init(ObjectClass *oc, void *data)
 {
     MachineClass *mc = MACHINE_CLASS(oc);
@@ -739,6 +767,7 @@  static const TypeInfo vexpress_info = {
     .parent = TYPE_MACHINE,
     .abstract = true,
     .instance_size = sizeof(VexpressMachineState),
+    .instance_init = vexpress_instance_init,
     .class_size = sizeof(VexpressMachineClass),
     .class_init = vexpress_class_init,
 };