[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 1/4] hw/arm/xlnx-zynqmp: Realize qspi controller *after* q
From: |
Alistair Francis |
Subject: |
Re: [PATCH v2 1/4] hw/arm/xlnx-zynqmp: Realize qspi controller *after* qspi_dma |
Date: |
Fri, 20 Aug 2021 08:50:30 +1000 |
On Fri, Aug 20, 2021 at 2:35 AM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> If we link QOM object (a) as a property of QOM object (b),
> we must set the property *before* (b) is realized.
>
> Move QSPI realization *after* QSPI DMA.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> hw/arm/xlnx-zynqmp.c | 42 ++++++++++++++++++++----------------------
> 1 file changed, 20 insertions(+), 22 deletions(-)
>
> diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
> index 3597e8db4de..9724978761b 100644
> --- a/hw/arm/xlnx-zynqmp.c
> +++ b/hw/arm/xlnx-zynqmp.c
> @@ -570,26 +570,6 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error
> **errp)
> g_free(bus_name);
> }
>
> - if (!sysbus_realize(SYS_BUS_DEVICE(&s->qspi), errp)) {
> - return;
> - }
> - sysbus_mmio_map(SYS_BUS_DEVICE(&s->qspi), 0, QSPI_ADDR);
> - sysbus_mmio_map(SYS_BUS_DEVICE(&s->qspi), 1, LQSPI_ADDR);
> - sysbus_connect_irq(SYS_BUS_DEVICE(&s->qspi), 0, gic_spi[QSPI_IRQ]);
> -
> - for (i = 0; i < XLNX_ZYNQMP_NUM_QSPI_BUS; i++) {
> - gchar *bus_name;
> - gchar *target_bus;
> -
> - /* Alias controller SPI bus to the SoC itself */
> - bus_name = g_strdup_printf("qspi%d", i);
> - target_bus = g_strdup_printf("spi%d", i);
> - object_property_add_alias(OBJECT(s), bus_name,
> - OBJECT(&s->qspi), target_bus);
> - g_free(bus_name);
> - g_free(target_bus);
> - }
> -
> if (!sysbus_realize(SYS_BUS_DEVICE(&s->dp), errp)) {
> return;
> }
> @@ -646,8 +626,26 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error
> **errp)
>
> sysbus_mmio_map(SYS_BUS_DEVICE(&s->qspi_dma), 0, QSPI_DMA_ADDR);
> sysbus_connect_irq(SYS_BUS_DEVICE(&s->qspi_dma), 0, gic_spi[QSPI_IRQ]);
> - object_property_set_link(OBJECT(&s->qspi), "stream-connected-dma",
> - OBJECT(&s->qspi_dma), errp);
> +
> + if (!object_property_set_link(OBJECT(&s->qspi), "stream-connected-dma",
> + OBJECT(&s->qspi_dma), errp)) {
> + return;
> + }
> + if (!sysbus_realize(SYS_BUS_DEVICE(&s->qspi), errp)) {
> + return;
> + }
> + sysbus_mmio_map(SYS_BUS_DEVICE(&s->qspi), 0, QSPI_ADDR);
> + sysbus_mmio_map(SYS_BUS_DEVICE(&s->qspi), 1, LQSPI_ADDR);
> + sysbus_connect_irq(SYS_BUS_DEVICE(&s->qspi), 0, gic_spi[QSPI_IRQ]);
> +
> + for (i = 0; i < XLNX_ZYNQMP_NUM_QSPI_BUS; i++) {
> + g_autofree gchar *bus_name = g_strdup_printf("qspi%d", i);
> + g_autofree gchar *target_bus = g_strdup_printf("spi%d", i);
> +
> + /* Alias controller SPI bus to the SoC itself */
> + object_property_add_alias(OBJECT(s), bus_name,
> + OBJECT(&s->qspi), target_bus);
> + }
> }
>
> static Property xlnx_zynqmp_props[] = {
> --
> 2.31.1
>
>
- [PATCH v2 0/4] hw/dma: Always expect 'dma' link property to be set to simplify, Philippe Mathieu-Daudé, 2021/08/19
- [PATCH v2 1/4] hw/arm/xlnx-zynqmp: Realize qspi controller *after* qspi_dma, Philippe Mathieu-Daudé, 2021/08/19
- Re: [PATCH v2 1/4] hw/arm/xlnx-zynqmp: Realize qspi controller *after* qspi_dma,
Alistair Francis <=
- [PATCH v2 2/4] hw/dma/xlnx_csu_dma: Run trivial checks early in realize(), Philippe Mathieu-Daudé, 2021/08/19
- [PATCH v2 3/4] hw/dma/xlnx_csu_dma: Always expect 'dma' link property to be set, Philippe Mathieu-Daudé, 2021/08/19
- [PATCH v2 4/4] hw/dma/xlnx-zdma Always expect 'dma' link property to be set, Philippe Mathieu-Daudé, 2021/08/19
- Re: [PATCH v2 0/4] hw/dma: Always expect 'dma' link property to be set to simplify, Peter Maydell, 2021/08/26