Re: [PATCH v2 21/47] hw/arm/xlnx-versal: add the mp_affinity property to the CPU mapping

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

Hi Luc,

On 20/8/25 10:25, Luc Michel wrote:
> Add a way to configure the MP affinity value of the CPUs given their
> core and cluster IDs. For the Versal APU CPUs, the MP affinity value is
> directly given by the core ID.
> 
> Signed-off-by: Luc Michel <luc.michel@amd.com>
> Reviewed-by: Francisco Iglesias <francisco.iglesias@amd.com>
> ---
>   hw/arm/xlnx-versal.c | 21 +++++++++++++++++++++
>   1 file changed, 21 insertions(+)
> 
> diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c
> index 5a08ad07b28..35c32de0159 100644
> --- a/hw/arm/xlnx-versal.c
> +++ b/hw/arm/xlnx-versal.c
> @@ -88,10 +88,18 @@ typedef struct VersalCpuClusterMap {
>       size_t num_core;
>       size_t num_cluster;
>       uint32_t qemu_cluster_id;
>       bool dtb_expose;
>   
> +    struct {
> +        uint64_t base;
> +        uint64_t core_mask;
> +        uint64_t core_shift;
> +        uint64_t cluster_mask;
> +        uint64_t cluster_shift;
> +    } mp_affinity;


> @@ -565,23 +578,31 @@ static DeviceState *versal_create_cpu(Versal *s,
>                                         size_t core_idx)
>   {
>       DeviceState *cpu = qdev_new(map->cpu_model);
>       ARMCPU *arm_cpu = ARM_CPU(cpu);
>       Object *obj = OBJECT(cpu);
> +    uint64_t affinity;
>       bool start_off;
>       size_t idx = cluster_idx * map->num_core + core_idx;
>       g_autofree char *name;
>       g_autofree char *node = NULL;
>   
> +    affinity = map->mp_affinity.base;
> +    affinity |= (cluster_idx & map->mp_affinity.cluster_mask)
> +        << map->mp_affinity.cluster_shift;
> +    affinity |= (core_idx & map->mp_affinity.core_mask)
> +        << map->mp_affinity.core_shift;

Could we expand/re-use arm_build_mp_affinity() here?