Re: [PATCH v4 20/47] hw/arm/xlnx-versal: refactor CPU cluster creation

["Philippe Mathieu-Daudé" <philmd@linaro.org>]

On 22/8/25 17:15, Luc Michel wrote:
> Refactor the CPU cluster creation using the VersalMap structure. There
> is no functional change. The clusters properties are now described in
> the VersalMap structure. For now only the APU is converted. The RPU will
> be taken care of by next commits.
> 
> Signed-off-by: Luc Michel <luc.michel@amd.com>
> Reviewed-by: Francisco Iglesias <francisco.iglesias@amd.com>
> ---
>   include/hw/arm/xlnx-versal.h |  12 +-
>   hw/arm/xlnx-versal-virt.c    |  80 +-------
>   hw/arm/xlnx-versal.c         | 352 ++++++++++++++++++++++++++---------
>   3 files changed, 275 insertions(+), 169 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

> diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c
> index b981d012558..27594f78c8f 100644
> --- a/hw/arm/xlnx-versal-virt.c
> +++ b/hw/arm/xlnx-versal-virt.c


> @@ -394,20 +328,18 @@ static void versal_virt_init(MachineState *machine)
>       fdt_create(s);
>       versal_set_fdt(&s->soc, s->fdt);
>       sysbus_realize(SYS_BUS_DEVICE(&s->soc), &error_fatal);
>       create_virtio_regions(s);
>   
> -    fdt_add_gic_nodes(s);
> -    fdt_add_timer_nodes(s);
> -    fdt_add_cpu_nodes(s, psci_conduit);
>       fdt_add_clk_node(s, "/old-clk125", 125000000, s->phandle.clk_125Mhz);
>       fdt_add_clk_node(s, "/old-clk25", 25000000, s->phandle.clk_25Mhz);
>   
> -    /* Make the APU cpu address space visible to virtio and other
> -     * modules unaware of multiple address-spaces.  */
> -    memory_region_add_subregion_overlap(get_system_memory(),
> -                                        0, &s->soc.fpd.apu.mr, 0);
> +    /*
> +     * Map the SoC address space onto system memory. This will allow virtio and
> +     * other modules unaware of multiple address-spaces to work.
> +     */
> +    memory_region_add_subregion(get_system_memory(), 0, &s->soc.mr_ps);

I was not aware of that shortcoming (Cc'ing Manos & Alex).