On [2020 Feb 27] Thu 16:44:23, Edgar E. Iglesias wrote:
> From: "Edgar E. Iglesias" <edgar.igles...@xilinx.com>
>
> Add support for the Versal LPD ADMAs.
>
> Signed-off-by: Edgar E. Iglesias <edgar.igles...@xilinx.com>
Reviewed-by: Francisco Iglesias <frasse.igles...@gmail.com>
> ---
> hw/arm/xlnx-versal.c | 24 ++++++++++++++++++++++++
> include/hw/arm/xlnx-versal.h | 6 ++++++
> 2 files changed, 30 insertions(+)
>
> diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c
> index 1cf3daaf4f..f9beba07ed 100644
> --- a/hw/arm/xlnx-versal.c
> +++ b/hw/arm/xlnx-versal.c
> @@ -193,6 +193,29 @@ static void versal_create_gems(Versal *s, qemu_irq *pic)
> }
> }
>
> +static void versal_create_admas(Versal *s, qemu_irq *pic)
> +{
> + int i;
> +
> + for (i = 0; i < ARRAY_SIZE(s->lpd.iou.adma); i++) {
> + char *name = g_strdup_printf("adma%d", i);
> + DeviceState *dev;
> + MemoryRegion *mr;
> +
> + dev = qdev_create(NULL, "xlnx.zdma");
> + s->lpd.iou.adma[i] = SYS_BUS_DEVICE(dev);
> + object_property_add_child(OBJECT(s), name, OBJECT(dev),
> &error_fatal);
> + qdev_init_nofail(dev);
> +
> + mr = sysbus_mmio_get_region(s->lpd.iou.adma[i], 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]);
> + g_free(name);
> + }
> +}
> +
> /* This takes the board allocated linear DDR memory and creates aliases
> * for each split DDR range/aperture on the Versal address map.
> */
> @@ -274,6 +297,7 @@ static void versal_realize(DeviceState *dev, Error **errp)
> versal_create_apu_gic(s, pic);
> versal_create_uarts(s, pic);
> versal_create_gems(s, pic);
> + versal_create_admas(s, pic);
> versal_map_ddr(s);
> versal_unimp(s);
>
> diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h
> index d844c4ffe4..6c0a692b2f 100644
> --- a/include/hw/arm/xlnx-versal.h
> +++ b/include/hw/arm/xlnx-versal.h
> @@ -22,6 +22,7 @@
> #define XLNX_VERSAL_NR_ACPUS 2
> #define XLNX_VERSAL_NR_UARTS 2
> #define XLNX_VERSAL_NR_GEMS 2
> +#define XLNX_VERSAL_NR_ADMAS 8
> #define XLNX_VERSAL_NR_IRQS 192
>
> typedef struct Versal {
> @@ -50,6 +51,7 @@ typedef struct Versal {
> struct {
> SysBusDevice *uart[XLNX_VERSAL_NR_UARTS];
> SysBusDevice *gem[XLNX_VERSAL_NR_GEMS];
> + SysBusDevice *adma[XLNX_VERSAL_NR_ADMAS];
> } iou;
> } lpd;
>
> @@ -74,6 +76,7 @@ typedef struct Versal {
> #define VERSAL_GEM0_WAKE_IRQ_0 57
> #define VERSAL_GEM1_IRQ_0 58
> #define VERSAL_GEM1_WAKE_IRQ_0 59
> +#define VERSAL_ADMA_IRQ_0 60
>
> /* Architecturally reserved IRQs suitable for virtualization. */
> #define VERSAL_RSVD_IRQ_FIRST 111
> @@ -96,6 +99,9 @@ typedef struct Versal {
> #define MM_GEM1 0xff0d0000U
> #define MM_GEM1_SIZE 0x10000
>
> +#define MM_ADMA_CH0 0xffa80000U
> +#define MM_ADMA_CH0_SIZE 0x10000
> +
> #define MM_OCM 0xfffc0000U
> #define MM_OCM_SIZE 0x40000
>
> --
> 2.20.1
>
