Commit 6675d719 authored by Alistair Francis's avatar Alistair Francis Committed by Peter Maydell
Browse files

xlnx-zynqmp: Connect the four OCM banks 



The Xilinx EP108 has four separate OCM banks which are located
adjacent to each other. This patch adds the four banks to
the ZynqMP SoC.

Signed-off-by: default avatarAlistair Francis <alistair.francis@xilinx.com>
Reviewed-by: default avatarPeter Crosthwaite <peter.crosthwaite@xilinx.com>
Message-id: afa6ba31163a5d541a0bef4b0dc11f2597e0c495.1436813543.git.alistair.francis@xilinx.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 34a44504

hw/arm/xlnx-zynqmp.c

+15 −0
Original line number Diff line number Diff line
@@ -101,6 +101,21 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) 
    qemu_irq gic_spi[GIC_NUM_SPI_INTR];

    Error *err = NULL;



    /* Create the four OCM banks */

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

        char *ocm_name = g_strdup_printf("zynqmp.ocm_ram_bank_%d", i);



        memory_region_init_ram(&s->ocm_ram[i], NULL, ocm_name,

                               XLNX_ZYNQMP_OCM_RAM_SIZE, &error_abort);

        vmstate_register_ram_global(&s->ocm_ram[i]);

        memory_region_add_subregion(get_system_memory(),

                                    XLNX_ZYNQMP_OCM_RAM_0_ADDRESS +

                                        i * XLNX_ZYNQMP_OCM_RAM_SIZE,

                                    &s->ocm_ram[i]);



        g_free(ocm_name);

    }



    qdev_prop_set_uint32(DEVICE(&s->gic), "num-irq", GIC_NUM_SPI_INTR + 32);

    qdev_prop_set_uint32(DEVICE(&s->gic), "revision", 2);

    qdev_prop_set_uint32(DEVICE(&s->gic), "num-cpu", XLNX_ZYNQMP_NUM_APU_CPUS);

include/hw/arm/xlnx-zynqmp.h

+6 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ 
#define XLNX_ZYNQMP_NUM_GEMS 4

#define XLNX_ZYNQMP_NUM_UARTS 2



#define XLNX_ZYNQMP_NUM_OCM_BANKS 4

#define XLNX_ZYNQMP_OCM_RAM_0_ADDRESS 0xFFFC0000

#define XLNX_ZYNQMP_OCM_RAM_SIZE 0x10000



#define XLNX_ZYNQMP_GIC_REGIONS 2



/* ZynqMP maps the ARM GIC regions (GICC, GICD ...) at consecutive 64k offsets
@@ -52,6 +56,8 @@ typedef struct XlnxZynqMPState { 
    ARMCPU rpu_cpu[XLNX_ZYNQMP_NUM_RPU_CPUS];

    GICState gic;

    MemoryRegion gic_mr[XLNX_ZYNQMP_GIC_REGIONS][XLNX_ZYNQMP_GIC_ALIASES];

    MemoryRegion ocm_ram[XLNX_ZYNQMP_NUM_OCM_BANKS];



    CadenceGEMState gem[XLNX_ZYNQMP_NUM_GEMS];

    CadenceUARTState uart[XLNX_ZYNQMP_NUM_UARTS];