On Mon, 26 May 2025 at 09:55, Clément Chigot <[email protected]> wrote:
>
> From: Frederic Konrad <[email protected]>
>
> This wires a second GIC for the Cortex-R5, all the IRQs are split when there
> is an RPU instanciated.
>
> Signed-off-by: Clément Chigot <[email protected]>
Some review of this from the Xilinx folks would be helpful.
> ---
> hw/arm/xlnx-zynqmp.c | 88 +++++++++++++++++++++++++++++++++---
> include/hw/arm/xlnx-zynqmp.h | 6 +++
> 2 files changed, 87 insertions(+), 7 deletions(-)
>
> diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
> index ec96a46eec..be33669f87 100644
> --- a/hw/arm/xlnx-zynqmp.c
> +++ b/hw/arm/xlnx-zynqmp.c
> @@ -26,8 +26,6 @@
> #include "target/arm/cpu-qom.h"
> #include "target/arm/gtimer.h"
>
> -#define GIC_NUM_SPI_INTR 160
> -
> #define ARM_PHYS_TIMER_PPI 30
> #define ARM_VIRT_TIMER_PPI 27
> #define ARM_HYP_TIMER_PPI 26
> @@ -206,7 +204,7 @@ static const XlnxZynqMPGICRegion
> xlnx_zynqmp_gic_regions[] = {
>
> static inline int arm_gic_ppi_index(int cpu_nr, int ppi_index)
> {
> - return GIC_NUM_SPI_INTR + cpu_nr * GIC_INTERNAL + ppi_index;
> + return XLXN_ZYNQMP_GIC_NUM_SPI_INTR + cpu_nr * GIC_INTERNAL + ppi_index;
Typo in your new constant name: should be XLNX_.
> }
>
> static void xlnx_zynqmp_create_rpu(MachineState *ms, XlnxZynqMPState *s,
> @@ -377,6 +375,8 @@ static void xlnx_zynqmp_init(Object *obj)
> XlnxZynqMPState *s = XLNX_ZYNQMP(obj);
> int i;
> int num_apus = MIN(ms->smp.cpus, XLNX_ZYNQMP_NUM_APU_CPUS);
> + int num_rpus = MIN((int)(ms->smp.cpus - XLNX_ZYNQMP_NUM_APU_CPUS),
> + XLNX_ZYNQMP_NUM_RPU_CPUS);
This is kind of a complicated expression that we use twice, and
I think it would be worth abstracting out into a function.
> object_initialize_child(obj, "apu-cluster", &s->apu_cluster,
> TYPE_CPU_CLUSTER);
> @@ -390,6 +390,12 @@ static void xlnx_zynqmp_init(Object *obj)
>
> object_initialize_child(obj, "gic", &s->gic, gic_class_name());
>
> + if (num_rpus > 0) {
> + /* Do not create the rpu_gic in case we don't have rpus.. */
stray ".." at end. Also I would say "if", rather than "in case".
> + object_initialize_child(obj, "rpu_gic", &s->rpu_gic,
> + gic_class_name());
> + }
> +
> for (i = 0; i < XLNX_ZYNQMP_NUM_GEMS; i++) {
> object_initialize_child(obj, "gem[*]", &s->gem[i], TYPE_CADENCE_GEM);
> object_initialize_child(obj, "gem-irq-orgate[*]",
> @@ -439,6 +445,13 @@ static void xlnx_zynqmp_init(Object *obj)
> object_initialize_child(obj, "qspi-irq-orgate",
> &s->qspi_irq_orgate, TYPE_OR_IRQ);
>
> + for (i = 0; i < ARRAY_SIZE(s->splitter); i++) {
> + g_autofree char *name = g_strdup_printf("irq-splitter%d", i);
> + object_initialize_child(obj, name, &s->splitter[i], TYPE_SPLIT_IRQ);
> + }
We don't need the splitters unless num_rpus > 0, so I think
it would be neater not to create/realize/use them.
> +
> +
> +
> for (i = 0; i < XLNX_ZYNQMP_NUM_USB; i++) {
> object_initialize_child(obj, "usb[*]", &s->usb[i], TYPE_USB_DWC3);
> }
> @@ -452,10 +465,13 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error
> **errp)
> uint8_t i;
> uint64_t ram_size;
> int num_apus = MIN(ms->smp.cpus, XLNX_ZYNQMP_NUM_APU_CPUS);
> + int num_rpus = MIN((int)(ms->smp.cpus - XLNX_ZYNQMP_NUM_APU_CPUS),
> + XLNX_ZYNQMP_NUM_RPU_CPUS);
> const char *boot_cpu = s->boot_cpu ? s->boot_cpu : "apu-cpu[0]";
> ram_addr_t ddr_low_size, ddr_high_size;
> - qemu_irq gic_spi[GIC_NUM_SPI_INTR];
> + qemu_irq gic_spi[XLXN_ZYNQMP_GIC_NUM_SPI_INTR];
> Error *err = NULL;
> + DeviceState *splitter;
I think you can put this variable declaration inside the
loop where it is used, so it has a much smaller scope.
> ram_size = memory_region_size(s->ddr_ram);
>
> @@ -502,13 +518,21 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error
> **errp)
> g_free(ocm_name);
> }
>
> - qdev_prop_set_uint32(DEVICE(&s->gic), "num-irq", GIC_NUM_SPI_INTR + 32);
> + qdev_prop_set_uint32(DEVICE(&s->gic), "num-irq",
> XLXN_ZYNQMP_GIC_NUM_SPI_INTR + 32);
> qdev_prop_set_uint32(DEVICE(&s->gic), "revision", 2);
> qdev_prop_set_uint32(DEVICE(&s->gic), "num-cpu", num_apus);
> qdev_prop_set_bit(DEVICE(&s->gic), "has-security-extensions", s->secure);
> qdev_prop_set_bit(DEVICE(&s->gic),
> "has-virtualization-extensions", s->virt);
>
> + if (num_rpus > 0) {
> + qdev_prop_set_uint32(DEVICE(&s->rpu_gic), "num-irq",
> + XLXN_ZYNQMP_GIC_NUM_SPI_INTR + 32);
> + qdev_prop_set_uint32(DEVICE(&s->rpu_gic), "revision", 1);
> + qdev_prop_set_uint32(DEVICE(&s->rpu_gic), "num-cpu", num_rpus);
> + qdev_prop_set_uint32(DEVICE(&s->rpu_gic), "first-cpu-index", 4);
> + }
> +
> qdev_realize(DEVICE(&s->apu_cluster), NULL, &error_fatal);
>
> /* Realize APUs before realizing the GIC. KVM requires this. */
> diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h
> index c137ac59e8..a69953650d 100644
> --- a/include/hw/arm/xlnx-zynqmp.h
> +++ b/include/hw/arm/xlnx-zynqmp.h
> @@ -42,6 +42,7 @@
> #include "hw/misc/xlnx-zynqmp-crf.h"
> #include "hw/timer/cadence_ttc.h"
> #include "hw/usb/hcd-dwc3.h"
> +#include "hw/core/split-irq.h"
>
> #define TYPE_XLNX_ZYNQMP "xlnx-zynqmp"
> OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPState, XLNX_ZYNQMP)
> @@ -87,12 +88,14 @@ OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPState, XLNX_ZYNQMP)
> XLNX_ZYNQMP_MAX_HIGH_RAM_SIZE)
>
> #define XLNX_ZYNQMP_NUM_TTC 4
> +#define XLXN_ZYNQMP_GIC_NUM_SPI_INTR 160
>
> /*
> * Unimplemented mmio regions needed to boot some images.
> */
> #define XLNX_ZYNQMP_NUM_UNIMP_AREAS 1
>
> +
Stray extra whitespace change.
> struct XlnxZynqMPState {
> /*< private >*/
> DeviceState parent_obj;
> @@ -105,6 +108,9 @@ struct XlnxZynqMPState {
> GICState gic;
> MemoryRegion gic_mr[XLNX_ZYNQMP_GIC_REGIONS][XLNX_ZYNQMP_GIC_ALIASES];
>
> + GICState rpu_gic;
> + SplitIRQ splitter[XLXN_ZYNQMP_GIC_NUM_SPI_INTR];
> +
> MemoryRegion ocm_ram[XLNX_ZYNQMP_NUM_OCM_BANKS];
>
> MemoryRegion *ddr_ram;
thanks
-- PMM
