On Mon, Apr 27, 2020 at 11:22 AM Edgar E. Iglesias
<edgar.igles...@gmail.com> wrote:
>
> From: "Edgar E. Iglesias" <edgar.igles...@xilinx.com>
>
> Embedd the ADMAs into the SoC type.
>
> Suggested-by: Peter Maydell <peter.mayd...@linaro.org>
> Signed-off-by: Edgar E. Iglesias <edgar.igles...@xilinx.com>
Reviewed-by: Alistair Francis <alistair.fran...@wdc.com>
Alistair
> ---
> hw/arm/xlnx-versal.c | 14 +++++++-------
> include/hw/arm/xlnx-versal.h | 3 ++-
> 2 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c
> index e424aa789e..ebd2dc51be 100644
> --- a/hw/arm/xlnx-versal.c
> +++ b/hw/arm/xlnx-versal.c
> @@ -203,18 +203,18 @@ static void versal_create_admas(Versal *s, qemu_irq
> *pic)
> DeviceState *dev;
> MemoryRegion *mr;
>
> - dev = qdev_create(NULL, "xlnx.zdma");
> - s->lpd.iou.adma[i] = SYS_BUS_DEVICE(dev);
> - object_property_set_int(OBJECT(s->lpd.iou.adma[i]), 128, "bus-width",
> - &error_abort);
> - object_property_add_child(OBJECT(s), name, OBJECT(dev),
> &error_fatal);
> + sysbus_init_child_obj(OBJECT(s), name,
> + &s->lpd.iou.adma[i],
> sizeof(s->lpd.iou.adma[i]),
> + TYPE_XLNX_ZDMA);
> + dev = DEVICE(&s->lpd.iou.adma[i]);
> + object_property_set_int(OBJECT(dev), 128, "bus-width", &error_abort);
> qdev_init_nofail(dev);
>
> - mr = sysbus_mmio_get_region(s->lpd.iou.adma[i], 0);
> + mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0);
> memory_region_add_subregion(&s->mr_ps,
> MM_ADMA_CH0 + i * MM_ADMA_CH0_SIZE, mr);
>
> - sysbus_connect_irq(s->lpd.iou.adma[i], 0, pic[VERSAL_ADMA_IRQ_0 +
> i]);
> + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[VERSAL_ADMA_IRQ_0 +
> i]);
> g_free(name);
> }
> }
> diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h
> index 01da736a5b..94b7826fd4 100644
> --- a/include/hw/arm/xlnx-versal.h
> +++ b/include/hw/arm/xlnx-versal.h
> @@ -16,6 +16,7 @@
> #include "hw/arm/boot.h"
> #include "hw/intc/arm_gicv3.h"
> #include "hw/char/pl011.h"
> +#include "hw/dma/xlnx-zdma.h"
> #include "hw/net/cadence_gem.h"
>
> #define TYPE_XLNX_VERSAL "xlnx-versal"
> @@ -53,7 +54,7 @@ typedef struct Versal {
> struct {
> PL011State uart[XLNX_VERSAL_NR_UARTS];
> CadenceGEMState gem[XLNX_VERSAL_NR_GEMS];
> - SysBusDevice *adma[XLNX_VERSAL_NR_ADMAS];
> + XlnxZDMA adma[XLNX_VERSAL_NR_ADMAS];
> } iou;
> } lpd;
>
> --
> 2.20.1
>
>
