target-arm: Add vexpress machine secure property
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 disable security extensions on a -kernel 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> Message-id: 1418684992-8996-5-git-send-email-greg.bellows@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
af7c9f34b1
commit
4902192432
|
@ -164,6 +164,7 @@ typedef struct {
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
MachineState parent;
|
MachineState parent;
|
||||||
|
bool secure;
|
||||||
} VexpressMachineState;
|
} VexpressMachineState;
|
||||||
|
|
||||||
#define TYPE_VEXPRESS_MACHINE "vexpress"
|
#define TYPE_VEXPRESS_MACHINE "vexpress"
|
||||||
|
@ -701,6 +702,34 @@ static void vexpress_common_init(MachineState *machine)
|
||||||
arm_load_kernel(ARM_CPU(first_cpu), &daughterboard->bootinfo);
|
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 the ARM "
|
||||||
|
"Security Extensions (TrustZone)",
|
||||||
|
NULL);
|
||||||
|
}
|
||||||
|
|
||||||
static void vexpress_class_init(ObjectClass *oc, void *data)
|
static void vexpress_class_init(ObjectClass *oc, void *data)
|
||||||
{
|
{
|
||||||
MachineClass *mc = MACHINE_CLASS(oc);
|
MachineClass *mc = MACHINE_CLASS(oc);
|
||||||
|
@ -739,6 +768,7 @@ static const TypeInfo vexpress_info = {
|
||||||
.parent = TYPE_MACHINE,
|
.parent = TYPE_MACHINE,
|
||||||
.abstract = true,
|
.abstract = true,
|
||||||
.instance_size = sizeof(VexpressMachineState),
|
.instance_size = sizeof(VexpressMachineState),
|
||||||
|
.instance_init = vexpress_instance_init,
|
||||||
.class_size = sizeof(VexpressMachineClass),
|
.class_size = sizeof(VexpressMachineClass),
|
||||||
.class_init = vexpress_class_init,
|
.class_init = vexpress_class_init,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue