OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/arm/xlnx-zynqmp: Connect the ZynqMP APU Control

Browse Source 
Connect the ZynqMP APU Control device.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Francisco Iglesias <francisco.iglesias@xilinx.com>
Reviewed-by: Luc Michel <luc@lmichel.fr>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 20220316164645.2303510-7-edgar.iglesias@gmail.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Edgar E. Iglesias 2022-03-16 17:46:45 +01:00 committed by Peter Maydell
parent b4ecda2dd7
commit eb7a38ba66
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/arm/xlnx-zynqmp.c
View File

@ -66,7 +66,7 @@
#define DPDMA_IRQ 116 #define DPDMA_IRQ 116
#define APU_ADDR 0xfd5c0000 #define APU_ADDR 0xfd5c0000
#define APU_SIZE 0x100 #define APU_IRQ 153
#define IPI_ADDR 0xFF300000 #define IPI_ADDR 0xFF300000
#define IPI_IRQ 64 #define IPI_IRQ 64
@ -283,6 +283,27 @@ static void xlnx_zynqmp_create_efuse(XlnxZynqMPState *s, qemu_irq *gic)
sysbus_connect_irq(sbd, 0, gic[EFUSE_IRQ]); sysbus_connect_irq(sbd, 0, gic[EFUSE_IRQ]);
} }
static void xlnx_zynqmp_create_apu_ctrl(XlnxZynqMPState *s, qemu_irq *gic)
{
SysBusDevice *sbd;
int i;
object_initialize_child(OBJECT(s), "apu-ctrl", &s->apu_ctrl,
TYPE_XLNX_ZYNQMP_APU_CTRL);
sbd = SYS_BUS_DEVICE(&s->apu_ctrl);
for (i = 0; i < XLNX_ZYNQMP_NUM_APU_CPUS; i++) {
g_autofree gchar *name = g_strdup_printf("cpu%d", i);
object_property_set_link(OBJECT(&s->apu_ctrl), name,
OBJECT(&s->apu_cpu[i]), &error_abort);
}
sysbus_realize(sbd, &error_fatal);
sysbus_mmio_map(sbd, 0, APU_ADDR);
sysbus_connect_irq(sbd, 0, gic[APU_IRQ]);
}
static void xlnx_zynqmp_create_crf(XlnxZynqMPState *s, qemu_irq *gic) static void xlnx_zynqmp_create_crf(XlnxZynqMPState *s, qemu_irq *gic)
{ {
SysBusDevice *sbd; SysBusDevice *sbd;
@ -302,7 +323,6 @@ static void xlnx_zynqmp_create_unimp_mmio(XlnxZynqMPState *s)
hwaddr base; hwaddr base;
hwaddr size; hwaddr size;
} unimp_areas[ARRAY_SIZE(s->mr_unimp)] = { } unimp_areas[ARRAY_SIZE(s->mr_unimp)] = {
{ .name = "apu", APU_ADDR, APU_SIZE },
{ .name = "serdes", SERDES_ADDR, SERDES_SIZE }, { .name = "serdes", SERDES_ADDR, SERDES_SIZE },
}; };
unsigned int nr; unsigned int nr;
@ -699,6 +719,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
xlnx_zynqmp_create_bbram(s, gic_spi); xlnx_zynqmp_create_bbram(s, gic_spi);
xlnx_zynqmp_create_efuse(s, gic_spi); xlnx_zynqmp_create_efuse(s, gic_spi);
xlnx_zynqmp_create_apu_ctrl(s, gic_spi);
xlnx_zynqmp_create_crf(s, gic_spi); xlnx_zynqmp_create_crf(s, gic_spi);
xlnx_zynqmp_create_unimp_mmio(s); xlnx_zynqmp_create_unimp_mmio(s);

4
include/hw/arm/xlnx-zynqmp.h
View File

@ -39,6 +39,7 @@
#include "hw/nvram/xlnx-bbram.h" #include "hw/nvram/xlnx-bbram.h"
#include "hw/nvram/xlnx-zynqmp-efuse.h" #include "hw/nvram/xlnx-zynqmp-efuse.h"
#include "hw/or-irq.h" #include "hw/or-irq.h"
#include "hw/misc/xlnx-zynqmp-apu-ctrl.h"
#include "hw/misc/xlnx-zynqmp-crf.h" #include "hw/misc/xlnx-zynqmp-crf.h"
#define TYPE_XLNX_ZYNQMP "xlnx-zynqmp" #define TYPE_XLNX_ZYNQMP "xlnx-zynqmp"
@ -86,7 +87,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPState, XLNX_ZYNQMP)
/* /*
* Unimplemented mmio regions needed to boot some images. * Unimplemented mmio regions needed to boot some images.
*/ */
#define XLNX_ZYNQMP_NUM_UNIMP_AREAS 2 #define XLNX_ZYNQMP_NUM_UNIMP_AREAS 1
struct XlnxZynqMPState { struct XlnxZynqMPState {
/*< private >*/ /*< private >*/
@ -125,6 +126,7 @@ struct XlnxZynqMPState {
XlnxZDMA adma[XLNX_ZYNQMP_NUM_ADMA_CH]; XlnxZDMA adma[XLNX_ZYNQMP_NUM_ADMA_CH];
XlnxCSUDMA qspi_dma; XlnxCSUDMA qspi_dma;
qemu_or_irq qspi_irq_orgate; qemu_or_irq qspi_irq_orgate;
XlnxZynqMPAPUCtrl apu_ctrl;
XlnxZynqMPCRF crf; XlnxZynqMPCRF crf;
char *boot_cpu; char *boot_cpu;