Commit 37d42473 authored by Edgar E. Iglesias's avatar Edgar E. Iglesias Committed by Peter Maydell
Browse files

xlnx-zynqmp: Add a secure prop to en/disable ARM Security Extensions 



Add a secure prop to en/disable ARM Security Extensions.
This is particularly useful for KVM runs.

Default to disabled to match the behavior of KVM.

This changes the default setup from having the ARM Security
Extensions to not longer having them.

Signed-off-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: default avatarAlistair Francis <alistair.francis@xilinx.com>
Message-id: 1464173555-12800-2-git-send-email-edgar.iglesias@gmail.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 0bf8039d

hw/arm/xlnx-zynqmp.c

+3 −0
Original line number Diff line number Diff line
@@ -238,6 +238,8 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) 
        }

        g_free(name);



        object_property_set_bool(OBJECT(&s->apu_cpu[i]),

                                 s->secure, "has_el3", NULL);

        object_property_set_int(OBJECT(&s->apu_cpu[i]), GIC_BASE_ADDR,

                                "reset-cbar", &error_abort);

        object_property_set_bool(OBJECT(&s->apu_cpu[i]), true, "realized",
@@ -370,6 +372,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) 


static Property xlnx_zynqmp_props[] = {

    DEFINE_PROP_STRING("boot-cpu", XlnxZynqMPState, boot_cpu),

    DEFINE_PROP_BOOL("secure", XlnxZynqMPState, secure, false),

    DEFINE_PROP_END_OF_LIST()

};

include/hw/arm/xlnx-zynqmp.h

+3 −0
Original line number Diff line number Diff line
@@ -84,6 +84,9 @@ typedef struct XlnxZynqMPState { 


    char *boot_cpu;

    ARMCPU *boot_cpu_ptr;



    /* Has the ARM Security extensions?  */

    bool secure;

}  XlnxZynqMPState;



#define XLNX_ZYNQMP_H