mirror of https://github.com/xemu-project/xemu.git
xlnx-zcu102: Add a machine level secure property
Add a machine level secure property. This defaults to false and can be set to true using this machine command line argument: -machine xlnx-zcu102,secure=on This follows what the ARM virt machine does. This property only applies to the ZCU102 machine. The EP108 machine does not have this property. Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
b70cf33f03
commit
b7436e94de
|
@ -30,6 +30,8 @@ typedef struct XlnxZCU102 {
|
||||||
|
|
||||||
XlnxZynqMPState soc;
|
XlnxZynqMPState soc;
|
||||||
MemoryRegion ddr_ram;
|
MemoryRegion ddr_ram;
|
||||||
|
|
||||||
|
bool secure;
|
||||||
} XlnxZCU102;
|
} XlnxZCU102;
|
||||||
|
|
||||||
#define TYPE_ZCU102_MACHINE MACHINE_TYPE_NAME("xlnx-zcu102")
|
#define TYPE_ZCU102_MACHINE MACHINE_TYPE_NAME("xlnx-zcu102")
|
||||||
|
@ -42,6 +44,20 @@ typedef struct XlnxZCU102 {
|
||||||
|
|
||||||
static struct arm_boot_info xlnx_zcu102_binfo;
|
static struct arm_boot_info xlnx_zcu102_binfo;
|
||||||
|
|
||||||
|
static bool zcu102_get_secure(Object *obj, Error **errp)
|
||||||
|
{
|
||||||
|
XlnxZCU102 *s = ZCU102_MACHINE(obj);
|
||||||
|
|
||||||
|
return s->secure;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void zcu102_set_secure(Object *obj, bool value, Error **errp)
|
||||||
|
{
|
||||||
|
XlnxZCU102 *s = ZCU102_MACHINE(obj);
|
||||||
|
|
||||||
|
s->secure = value;
|
||||||
|
}
|
||||||
|
|
||||||
static void xlnx_zynqmp_init(XlnxZCU102 *s, MachineState *machine)
|
static void xlnx_zynqmp_init(XlnxZCU102 *s, MachineState *machine)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
@ -69,6 +85,8 @@ static void xlnx_zynqmp_init(XlnxZCU102 *s, MachineState *machine)
|
||||||
|
|
||||||
object_property_set_link(OBJECT(&s->soc), OBJECT(&s->ddr_ram),
|
object_property_set_link(OBJECT(&s->soc), OBJECT(&s->ddr_ram),
|
||||||
"ddr-ram", &error_abort);
|
"ddr-ram", &error_abort);
|
||||||
|
object_property_set_bool(OBJECT(&s->soc), s->secure, "secure",
|
||||||
|
&error_fatal);
|
||||||
|
|
||||||
object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_fatal);
|
object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_fatal);
|
||||||
|
|
||||||
|
@ -134,6 +152,10 @@ static void xlnx_ep108_init(MachineState *machine)
|
||||||
|
|
||||||
static void xlnx_ep108_machine_instance_init(Object *obj)
|
static void xlnx_ep108_machine_instance_init(Object *obj)
|
||||||
{
|
{
|
||||||
|
XlnxZCU102 *s = EP108_MACHINE(obj);
|
||||||
|
|
||||||
|
/* EP108, we don't support setting secure */
|
||||||
|
s->secure = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xlnx_ep108_machine_class_init(ObjectClass *oc, void *data)
|
static void xlnx_ep108_machine_class_init(ObjectClass *oc, void *data)
|
||||||
|
@ -169,6 +191,16 @@ static void xlnx_zcu102_init(MachineState *machine)
|
||||||
|
|
||||||
static void xlnx_zcu102_machine_instance_init(Object *obj)
|
static void xlnx_zcu102_machine_instance_init(Object *obj)
|
||||||
{
|
{
|
||||||
|
XlnxZCU102 *s = ZCU102_MACHINE(obj);
|
||||||
|
|
||||||
|
/* Default to secure mode being disabled */
|
||||||
|
s->secure = false;
|
||||||
|
object_property_add_bool(obj, "secure", zcu102_get_secure,
|
||||||
|
zcu102_set_secure, NULL);
|
||||||
|
object_property_set_description(obj, "secure",
|
||||||
|
"Set on/off to enable/disable the ARM "
|
||||||
|
"Security Extensions (TrustZone)",
|
||||||
|
NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xlnx_zcu102_machine_class_init(ObjectClass *oc, void *data)
|
static void xlnx_zcu102_machine_class_init(ObjectClass *oc, void *data)
|
||||||
|
|
Loading…
Reference in New Issue