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

xlnx-zynqmp: Connect the IPI device to the ZynqMP SoC

Browse Source 
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
This commit is contained in:
Alistair Francis 2018-01-22 11:43:52 -08:00 committed by Edgar E. Iglesias
parent 07b30201e6
commit 0ab7bbc75b
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,9 @@
#define DPDMA_ADDR 0xfd4c0000 #define DPDMA_ADDR 0xfd4c0000
#define DPDMA_IRQ 116 #define DPDMA_IRQ 116
#define IPI_ADDR 0xFF300000
#define IPI_IRQ 64
static const uint64_t gem_addr[XLNX_ZYNQMP_NUM_GEMS] = { static const uint64_t gem_addr[XLNX_ZYNQMP_NUM_GEMS] = {
0xFF0B0000, 0xFF0C0000, 0xFF0D0000, 0xFF0E0000, 0xFF0B0000, 0xFF0C0000, 0xFF0D0000, 0xFF0E0000,
}; };
@ -183,6 +186,9 @@ static void xlnx_zynqmp_init(Object *obj)
object_initialize(&s->dpdma, sizeof(s->dpdma), TYPE_XLNX_DPDMA); object_initialize(&s->dpdma, sizeof(s->dpdma), TYPE_XLNX_DPDMA);
qdev_set_parent_bus(DEVICE(&s->dpdma), sysbus_get_default()); qdev_set_parent_bus(DEVICE(&s->dpdma), sysbus_get_default());
object_initialize(&s->ipi, sizeof(s->ipi), TYPE_XLNX_ZYNQMP_IPI);
qdev_set_parent_bus(DEVICE(&s->ipi), sysbus_get_default());
} }
static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
@ -454,6 +460,14 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
&error_abort); &error_abort);
sysbus_mmio_map(SYS_BUS_DEVICE(&s->dpdma), 0, DPDMA_ADDR); sysbus_mmio_map(SYS_BUS_DEVICE(&s->dpdma), 0, DPDMA_ADDR);
sysbus_connect_irq(SYS_BUS_DEVICE(&s->dpdma), 0, gic_spi[DPDMA_IRQ]); sysbus_connect_irq(SYS_BUS_DEVICE(&s->dpdma), 0, gic_spi[DPDMA_IRQ]);
object_property_set_bool(OBJECT(&s->ipi), true, "realized", &err);
if (err) {
error_propagate(errp, err);
return;
}
sysbus_mmio_map(SYS_BUS_DEVICE(&s->ipi), 0, IPI_ADDR);
sysbus_connect_irq(SYS_BUS_DEVICE(&s->ipi), 0, gic_spi[IPI_IRQ]);
} }
static Property xlnx_zynqmp_props[] = { static Property xlnx_zynqmp_props[] = {

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

@ -28,6 +28,7 @@
#include "hw/ssi/xilinx_spips.h" #include "hw/ssi/xilinx_spips.h"
#include "hw/dma/xlnx_dpdma.h" #include "hw/dma/xlnx_dpdma.h"
#include "hw/display/xlnx_dp.h" #include "hw/display/xlnx_dp.h"
#include "hw/intc/xlnx-zynqmp-ipi.h"
#define TYPE_XLNX_ZYNQMP "xlnx,zynqmp" #define TYPE_XLNX_ZYNQMP "xlnx,zynqmp"
#define XLNX_ZYNQMP(obj) OBJECT_CHECK(XlnxZynqMPState, (obj), \ #define XLNX_ZYNQMP(obj) OBJECT_CHECK(XlnxZynqMPState, (obj), \
@ -90,6 +91,7 @@ typedef struct XlnxZynqMPState {
XlnxZynqMPQSPIPS qspi; XlnxZynqMPQSPIPS qspi;
XlnxDPState dp; XlnxDPState dp;
XlnxDPDMAState dpdma; XlnxDPDMAState dpdma;
XlnxZynqMPIPI ipi;
char *boot_cpu; char *boot_cpu;
ARMCPU *boot_cpu_ptr; ARMCPU *boot_cpu_ptr;