Commit 816fd397 authored by Luc Michel's avatar Luc Michel Committed by Peter Maydell
Browse files

arm/xlnx-zynqmp: put APUs and RPUs in separate CPU clusters 



Create two separate CPU clusters for APUs and RPUs.

Signed-off-by: default avatarLuc Michel <luc.michel@greensocs.com>
Reviewed-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Message-id: 20181207090135.7651-17-luc.michel@greensocs.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 364fce6f

hw/arm/xlnx-zynqmp.c

+19 −4
Original line number Diff line number Diff line
@@ -178,12 +178,19 @@ static void xlnx_zynqmp_create_rpu(XlnxZynqMPState *s, const char *boot_cpu, 
    int i;

    int num_rpus = MIN(smp_cpus - XLNX_ZYNQMP_NUM_APU_CPUS, XLNX_ZYNQMP_NUM_RPU_CPUS);



    object_initialize_child(OBJECT(s), "rpu-cluster", &s->rpu_cluster,

                            sizeof(s->rpu_cluster), TYPE_CPU_CLUSTER,

                            &error_abort, NULL);

    qdev_prop_set_uint32(DEVICE(&s->rpu_cluster), "cluster-id", 1);



    qdev_init_nofail(DEVICE(&s->rpu_cluster));



    for (i = 0; i < num_rpus; i++) {

        char *name;



        object_initialize(&s->rpu_cpu[i], sizeof(s->rpu_cpu[i]),

                          "cortex-r5f-" TYPE_ARM_CPU);

        object_property_add_child(OBJECT(s), "rpu-cpu[*]",

        object_property_add_child(OBJECT(&s->rpu_cluster), "rpu-cpu[*]",

                                  OBJECT(&s->rpu_cpu[i]), &error_abort);



        name = object_get_canonical_path_component(OBJECT(&s->rpu_cpu[i]));
@@ -213,10 +220,16 @@ static void xlnx_zynqmp_init(Object *obj) 
    int i;

    int num_apus = MIN(smp_cpus, XLNX_ZYNQMP_NUM_APU_CPUS);



    object_initialize_child(obj, "apu-cluster", &s->apu_cluster,

                            sizeof(s->apu_cluster), TYPE_CPU_CLUSTER,

                            &error_abort, NULL);

    qdev_prop_set_uint32(DEVICE(&s->apu_cluster), "cluster-id", 0);



    for (i = 0; i < num_apus; i++) {

        object_initialize_child(obj, "apu-cpu[*]", &s->apu_cpu[i],

                                sizeof(s->apu_cpu[i]),

                                "cortex-a53-" TYPE_ARM_CPU, &error_abort, NULL);

        object_initialize_child(OBJECT(&s->apu_cluster), "apu-cpu[*]",

                                &s->apu_cpu[i], sizeof(s->apu_cpu[i]),

                                "cortex-a53-" TYPE_ARM_CPU, &error_abort,

                                NULL);

    }



    sysbus_init_child_obj(obj, "gic", &s->gic, sizeof(s->gic),
@@ -333,6 +346,8 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) 
    qdev_prop_set_bit(DEVICE(&s->gic),

                      "has-virtualization-extensions", s->virt);



    qdev_init_nofail(DEVICE(&s->apu_cluster));



    /* Realize APUs before realizing the GIC. KVM requires this.  */

    for (i = 0; i < num_apus; i++) {

        char *name;

include/hw/arm/xlnx-zynqmp.h

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "hw/display/xlnx_dp.h"

#include "hw/intc/xlnx-zynqmp-ipi.h"

#include "hw/timer/xlnx-zynqmp-rtc.h"

#include "hw/cpu/cluster.h"



#define TYPE_XLNX_ZYNQMP "xlnx,zynqmp"

#define XLNX_ZYNQMP(obj) OBJECT_CHECK(XlnxZynqMPState, (obj), \
@@ -77,6 +78,8 @@ typedef struct XlnxZynqMPState { 
    DeviceState parent_obj;



    /*< public >*/

    CPUClusterState apu_cluster;

    CPUClusterState rpu_cluster;

    ARMCPU apu_cpu[XLNX_ZYNQMP_NUM_APU_CPUS];

    ARMCPU rpu_cpu[XLNX_ZYNQMP_NUM_RPU_CPUS];

    GICState gic;