Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-09 19:15:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hw/arm: versal: Embed the GEMs into the SoC type

Browse Source 
Embed the GEMs into the SoC type.

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Luc Michel <luc.michel@greensocs.com>
Message-id: 20200427181649.26851-6-edgar.iglesias@gmail.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Edgar E. Iglesias 2020-04-27 20:16:43 +02:00 committed by Peter Maydell
parent 88052ffdd1
commit 4bd9b59c05
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/arm/xlnx-versal.c
View File

@ -170,25 +170,26 @@ static void versal_create_gems(Versal *s, qemu_irq *pic)
DeviceState *dev; DeviceState *dev;
MemoryRegion *mr; MemoryRegion *mr;
dev = qdev_create(NULL, "cadence_gem"); sysbus_init_child_obj(OBJECT(s), name,
s->lpd.iou.gem[i] = SYS_BUS_DEVICE(dev); &s->lpd.iou.gem[i], sizeof(s->lpd.iou.gem[i]),
object_property_add_child(OBJECT(s), name, OBJECT(dev), &error_fatal); TYPE_CADENCE_GEM);
dev = DEVICE(&s->lpd.iou.gem[i]);
if (nd->used) { if (nd->used) {
qemu_check_nic_model(nd, "cadence_gem"); qemu_check_nic_model(nd, "cadence_gem");
qdev_set_nic_properties(dev, nd); qdev_set_nic_properties(dev, nd);
} }
object_property_set_int(OBJECT(s->lpd.iou.gem[i]), object_property_set_int(OBJECT(dev),
2, "num-priority-queues", 2, "num-priority-queues",
&error_abort); &error_abort);
object_property_set_link(OBJECT(s->lpd.iou.gem[i]), object_property_set_link(OBJECT(dev),
OBJECT(&s->mr_ps), "dma", OBJECT(&s->mr_ps), "dma",
&error_abort); &error_abort);
qdev_init_nofail(dev); qdev_init_nofail(dev);
mr = sysbus_mmio_get_region(s->lpd.iou.gem[i], 0); mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0);
memory_region_add_subregion(&s->mr_ps, addrs[i], mr); memory_region_add_subregion(&s->mr_ps, addrs[i], mr);
sysbus_connect_irq(s->lpd.iou.gem[i], 0, pic[irqs[i]]); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[irqs[i]]);
g_free(name); g_free(name);
} }
} }

3
include/hw/arm/xlnx-versal.h
View File

@ -16,6 +16,7 @@
#include "hw/arm/boot.h" #include "hw/arm/boot.h"
#include "hw/intc/arm_gicv3.h" #include "hw/intc/arm_gicv3.h"
#include "hw/char/pl011.h" #include "hw/char/pl011.h"
#include "hw/net/cadence_gem.h"
#define TYPE_XLNX_VERSAL "xlnx-versal" #define TYPE_XLNX_VERSAL "xlnx-versal"
#define XLNX_VERSAL(obj) OBJECT_CHECK(Versal, (obj), TYPE_XLNX_VERSAL) #define XLNX_VERSAL(obj) OBJECT_CHECK(Versal, (obj), TYPE_XLNX_VERSAL)
@ -51,7 +52,7 @@ typedef struct Versal {
struct { struct {
PL011State uart[XLNX_VERSAL_NR_UARTS]; PL011State uart[XLNX_VERSAL_NR_UARTS];
SysBusDevice *gem[XLNX_VERSAL_NR_GEMS]; CadenceGEMState gem[XLNX_VERSAL_NR_GEMS];
SysBusDevice *adma[XLNX_VERSAL_NR_ADMAS]; SysBusDevice *adma[XLNX_VERSAL_NR_ADMAS];
} iou; } iou;
} lpd; } lpd;