[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v1 6/6] hw/arm/xlnx-zynqmp: Connect the ZynqMP APU Control
From: |
Luc Michel |
Subject: |
Re: [PATCH v1 6/6] hw/arm/xlnx-zynqmp: Connect the ZynqMP APU Control |
Date: |
Thu, 3 Feb 2022 21:26:11 +0100 |
On 00:12 Mon 31 Jan , Edgar E. Iglesias wrote:
> From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com>
>
> Connect the ZynqMP APU Control device.
>
> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Luc Michel <luc@lmichel.fr>
> ---
> include/hw/arm/xlnx-zynqmp.h | 4 +++-
> hw/arm/xlnx-zynqmp.c | 25 +++++++++++++++++++++++--
> 2 files changed, 26 insertions(+), 3 deletions(-)
>
> diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h
> index d5a3ad3df2..05cd2128f3 100644
> --- a/include/hw/arm/xlnx-zynqmp.h
> +++ b/include/hw/arm/xlnx-zynqmp.h
> @@ -38,6 +38,7 @@
> #include "hw/dma/xlnx_csu_dma.h"
> #include "hw/nvram/xlnx-bbram.h"
> #include "hw/nvram/xlnx-zynqmp-efuse.h"
> +#include "hw/misc/xlnx-zynqmp-apu-ctrl.h"
> #include "hw/misc/xlnx-zynqmp-crf.h"
>
> #define TYPE_XLNX_ZYNQMP "xlnx-zynqmp"
> @@ -85,7 +86,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPState, XLNX_ZYNQMP)
> /*
> * Unimplemented mmio regions needed to boot some images.
> */
> -#define XLNX_ZYNQMP_NUM_UNIMP_AREAS 2
> +#define XLNX_ZYNQMP_NUM_UNIMP_AREAS 1
>
> struct XlnxZynqMPState {
> /*< private >*/
> @@ -123,6 +124,7 @@ struct XlnxZynqMPState {
> XlnxZDMA gdma[XLNX_ZYNQMP_NUM_GDMA_CH];
> XlnxZDMA adma[XLNX_ZYNQMP_NUM_ADMA_CH];
> XlnxCSUDMA qspi_dma;
> + XlnxZynqMPAPUCtrl apu_ctrl;
> XlnxZynqMPCRF crf;
>
> char *boot_cpu;
> diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
> index 857d3c9636..21c411cd77 100644
> --- a/hw/arm/xlnx-zynqmp.c
> +++ b/hw/arm/xlnx-zynqmp.c
> @@ -64,7 +64,7 @@
> #define DPDMA_IRQ 116
>
> #define APU_ADDR 0xfd5c0000
> -#define APU_SIZE 0x100
> +#define APU_IRQ 153
>
> #define IPI_ADDR 0xFF300000
> #define IPI_IRQ 64
> @@ -282,6 +282,27 @@ static void xlnx_zynqmp_create_efuse(XlnxZynqMPState *s,
> qemu_irq *gic)
> 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)
> {
> SysBusDevice *sbd;
> @@ -301,7 +322,6 @@ static void xlnx_zynqmp_create_unimp_mmio(XlnxZynqMPState
> *s)
> hwaddr base;
> hwaddr size;
> } unimp_areas[ARRAY_SIZE(s->mr_unimp)] = {
> - { .name = "apu", APU_ADDR, APU_SIZE },
> { .name = "serdes", SERDES_ADDR, SERDES_SIZE },
> };
> unsigned int nr;
> @@ -697,6 +717,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error
> **errp)
>
> xlnx_zynqmp_create_bbram(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_unimp_mmio(s);
>
> --
> 2.25.1
>
--
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [PATCH v1 6/6] hw/arm/xlnx-zynqmp: Connect the ZynqMP APU Control,
Luc Michel <=