On Wed, Jul 16, 2025 at 11:53:56AM +0200, Luc Michel wrote:
> Refactor the PMC IOU SLCR device creation using the VersalMap structure.
> This is the first user of a shared IRQ using an OR gate. The OSPI
> controller is reconnected to the SLCR.
>
> Signed-off-by: Luc Michel <luc.mic...@amd.com>
Reviewed-by: Francisco Iglesias <francisco.igles...@amd.com>
> ---
> include/hw/arm/xlnx-versal.h | 5 ----
> hw/arm/xlnx-versal.c | 48 +++++++++++++++++++++---------------
> 2 files changed, 28 insertions(+), 25 deletions(-)
>
> diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h
> index b7ef255d6fd..78442e6c2c5 100644
> --- a/include/hw/arm/xlnx-versal.h
> +++ b/include/hw/arm/xlnx-versal.h
> @@ -19,11 +19,10 @@
> #include "hw/intc/arm_gicv3.h"
> #include "hw/rtc/xlnx-zynqmp-rtc.h"
> #include "qom/object.h"
> #include "hw/nvram/xlnx-bbram.h"
> #include "hw/misc/xlnx-versal-crl.h"
> -#include "hw/misc/xlnx-versal-pmc-iou-slcr.h"
> #include "hw/misc/xlnx-versal-trng.h"
> #include "net/can_emu.h"
> #include "hw/misc/xlnx-versal-cfu.h"
> #include "hw/misc/xlnx-versal-cframe-reg.h"
> #include "target/arm/cpu.h"
> @@ -82,14 +81,10 @@ struct Versal {
> XlnxVersalCRL crl;
> } lpd;
>
> /* The Platform Management Controller subsystem. */
> struct {
> - struct {
> - XlnxVersalPmcIouSlcr slcr;
> - } iou;
> -
> XlnxZynqMPRTC rtc;
> XlnxVersalTRng trng;
> XlnxBBRam bbram;
> XlnxVersalCFUAPB cfu_apb;
> XlnxVersalCFUFDRO cfu_fdro;
> diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c
> index 89c93278336..d34a36e18aa 100644
> --- a/hw/arm/xlnx-versal.c
> +++ b/hw/arm/xlnx-versal.c
> @@ -33,10 +33,11 @@
> #include "hw/dma/xlnx-zdma.h"
> #include "hw/misc/xlnx-versal-xramc.h"
> #include "hw/usb/xlnx-usb-subsystem.h"
> #include "hw/nvram/xlnx-versal-efuse.h"
> #include "hw/ssi/xlnx-versal-ospi.h"
> +#include "hw/misc/xlnx-versal-pmc-iou-slcr.h"
>
> #define XLNX_VERSAL_ACPU_TYPE ARM_CPU_TYPE_NAME("cortex-a72")
> #define XLNX_VERSAL_RCPU_TYPE ARM_CPU_TYPE_NAME("cortex-r5f")
> #define GEM_REVISION 0x40070106
>
> @@ -114,10 +115,12 @@ typedef struct VersalMap {
> uint64_t dac_sz;
> uint64_t dma_src;
> uint64_t dma_dst;
> int irq;
> } ospi;
> +
> + VersalSimplePeriphMap pmc_iou_slcr;
> } VersalMap;
>
> static const VersalMap VERSAL_MAP = {
> .uart[0] = { 0xff000000, 18 },
> .uart[1] = { 0xff010000, 19 },
> @@ -154,10 +157,12 @@ static const VersalMap VERSAL_MAP = {
> .ctrl = 0xf1010000,
> .dac = 0xc0000000, .dac_sz = 0x20000000,
> .dma_src = 0xf1011000, .dma_dst = 0xf1011800,
> .irq = 124,
> },
> +
> + .pmc_iou_slcr = { 0xf1060000, OR_IRQ(121, 0) },
> };
>
> static const VersalMap *VERSION_TO_MAP[] = {
> [VERSAL_VER_VERSAL] = &VERSAL_MAP,
> };
> @@ -861,25 +866,28 @@ static void versal_create_efuse(Versal *s,
> sysbus_mmio_get_region(SYS_BUS_DEVICE(cache),
> 0));
> versal_sysbus_connect_irq(s, SYS_BUS_DEVICE(ctrl), 0, map->irq);
> }
>
> -static void versal_create_pmc_iou_slcr(Versal *s, qemu_irq *pic)
> +static DeviceState *versal_create_pmc_iou_slcr(Versal *s,
> + const VersalSimplePeriphMap
> *map)
> {
> SysBusDevice *sbd;
> + DeviceState *dev;
>
> - object_initialize_child(OBJECT(s), "versal-pmc-iou-slcr",
> &s->pmc.iou.slcr,
> - TYPE_XILINX_VERSAL_PMC_IOU_SLCR);
> + dev = qdev_new(TYPE_XILINX_VERSAL_PMC_IOU_SLCR);
> + object_property_add_child(OBJECT(s), "pmc-iou-slcr", OBJECT(dev));
>
> - sbd = SYS_BUS_DEVICE(&s->pmc.iou.slcr);
> - sysbus_realize(sbd, &error_fatal);
> + sbd = SYS_BUS_DEVICE(dev);
> + sysbus_realize_and_unref(sbd, &error_fatal);
>
> - memory_region_add_subregion(&s->mr_ps, MM_PMC_PMC_IOU_SLCR,
> + memory_region_add_subregion(&s->mr_ps, map->addr,
> sysbus_mmio_get_region(sbd, 0));
>
> - sysbus_connect_irq(sbd, 0,
> - qdev_get_gpio_in(DEVICE(&s->pmc.apb_irq_orgate), 2));
> + versal_sysbus_connect_irq(s, sbd, 0, map->irq);
> +
> + return dev;
> }
>
> static DeviceState *versal_create_ospi(Versal *s,
> const struct VersalOspiMap *map)
> {
> @@ -1201,10 +1209,11 @@ static void versal_unimp_irq_parity_imr(void *opaque,
> int n, int level)
> "is not yet implemented\n");
> }
>
> static void versal_unimp(Versal *s)
> {
> + DeviceState *slcr;
> qemu_irq gpio_in;
>
> versal_unimp_area(s, "psm", &s->mr_ps,
> MM_PSM_START, MM_PSM_END - MM_PSM_START);
> versal_unimp_area(s, "crf", &s->mr_ps,
> @@ -1223,27 +1232,22 @@ static void versal_unimp(Versal *s)
> qdev_init_gpio_in_named(DEVICE(s), versal_unimp_qspi_ospi_mux_sel,
> "qspi-ospi-mux-sel-dummy", 1);
> qdev_init_gpio_in_named(DEVICE(s), versal_unimp_irq_parity_imr,
> "irq-parity-imr-dummy", 1);
>
> + slcr = DEVICE(versal_get_child(s, "pmc-iou-slcr"));
> gpio_in = qdev_get_gpio_in_named(DEVICE(s), "sd-emmc-sel-dummy", 0);
> - qdev_connect_gpio_out_named(DEVICE(&s->pmc.iou.slcr), "sd-emmc-sel", 0,
> - gpio_in);
> + qdev_connect_gpio_out_named(slcr, "sd-emmc-sel", 0, gpio_in);
>
> gpio_in = qdev_get_gpio_in_named(DEVICE(s), "sd-emmc-sel-dummy", 1);
> - qdev_connect_gpio_out_named(DEVICE(&s->pmc.iou.slcr), "sd-emmc-sel", 1,
> - gpio_in);
> + qdev_connect_gpio_out_named(slcr, "sd-emmc-sel", 1, gpio_in);
>
> gpio_in = qdev_get_gpio_in_named(DEVICE(s), "qspi-ospi-mux-sel-dummy",
> 0);
> - qdev_connect_gpio_out_named(DEVICE(&s->pmc.iou.slcr),
> - "qspi-ospi-mux-sel", 0,
> - gpio_in);
> + qdev_connect_gpio_out_named(slcr, "qspi-ospi-mux-sel", 0, gpio_in);
>
> gpio_in = qdev_get_gpio_in_named(DEVICE(s), "irq-parity-imr-dummy", 0);
> - qdev_connect_gpio_out_named(DEVICE(&s->pmc.iou.slcr),
> - SYSBUS_DEVICE_GPIO_IRQ, 0,
> - gpio_in);
> + qdev_connect_gpio_out_named(slcr, SYSBUS_DEVICE_GPIO_IRQ, 0, gpio_in);
> }
>
> static uint32_t fdt_add_clk_node(Versal *s, const char *name,
> unsigned int freq_hz)
> {
> @@ -1262,10 +1266,11 @@ static uint32_t fdt_add_clk_node(Versal *s, const
> char *name,
> }
>
> static void versal_realize(DeviceState *dev, Error **errp)
> {
> Versal *s = XLNX_VERSAL_BASE(dev);
> + DeviceState *slcr, *ospi;
> qemu_irq pic[XLNX_VERSAL_NR_IRQS];
> Object *container;
> const VersalMap *map = versal_get_map(s);
> size_t i;
>
> @@ -1312,17 +1317,20 @@ static void versal_realize(DeviceState *dev, Error
> **errp)
> for (i = 0; i < map->num_usb; i++) {
> versal_create_usb(s, &map->usb[i]);
> }
>
> versal_create_efuse(s, &map->efuse);
> - versal_create_ospi(s, &map->ospi);
> + ospi = versal_create_ospi(s, &map->ospi);
> + slcr = versal_create_pmc_iou_slcr(s, &map->pmc_iou_slcr);
>
> + qdev_connect_gpio_out_named(slcr, "ospi-mux-sel", 0,
> + qdev_get_gpio_in_named(ospi,
> + "ospi-mux-sel", 0));
> versal_create_pmc_apb_irq_orgate(s, pic);
> versal_create_rtc(s, pic);
> versal_create_trng(s, pic);
> versal_create_bbram(s, pic);
> - versal_create_pmc_iou_slcr(s, pic);
> versal_create_crl(s, pic);
> versal_create_cfu(s, pic);
> versal_map_ddr(s);
> versal_unimp(s);
>
> --
> 2.50.0
>
