hw/arm/xlnx-versal: fix Versal2 VxWorks SMP boot

VxWorks requires the Versal2 compatible string and looks up secondary CPU nodes using MPIDR-based CPU IDs.
Add the amd,versal2 compatible string for the Versal2 virt machine and generate CPU node unit addresses from the MPIDR affinity value instead of the linear CPU index. This keeps CPU node names aligned with their reg values, for example cpu@100 with reg = <0x100>.
With this change, VxWorks can match the Versal2 DTB, discover secondary CPU nodes, reach the PSCI CPU_ON path, and bring all application CPUs online.

Signed-off-by: shivkd <shiveshkd@gmail.com>

Author: shivkd

hw/arm/xlnx-versal-virt.c

@@ -66,7 +66,7 @@ static void fdt_create(VersalVirt *s)
     MachineClass *mc = MACHINE_GET_CLASS(s);
     VersalVirtClass *vvc = XLNX_VERSAL_VIRT_BASE_MACHINE_GET_CLASS(s);
     const char versal_compat[] = "xlnx,versal\0amd,versal\0amd-versal-virt\0xlnx-versal-virt";
-    const char versal2_compat[] = "amd-versal2-virt";
+    const char versal2_compat[] = "amd,versal2\0amd-versal2-virt";
 
     s->fdt = create_device_tree(&s->fdt_size);
     if (!s->fdt) {

hw/arm/xlnx-versal.c

@@ -1122,14 +1122,13 @@ static void versal_create_cpu_dtb(Versal *s, const VersalCpuClusterMap *map,
                                   size_t core_idx)
 {
     ARMCPU *arm_cpu = ARM_CPU(cpu);
-    size_t idx = cluster_idx * map->num_core + core_idx;
+    uint32_t affinity = arm_cpu_mp_affinity(arm_cpu) & ARM64_AFFINITY_MASK;
     g_autofree char *node = NULL;
 
-    node = versal_fdt_add_subnode(s, "/cpus/cpu", idx,
+    node = versal_fdt_add_subnode(s, "/cpus/cpu", affinity,
                                   arm_cpu->dtb_compatible,
                                   strlen(arm_cpu->dtb_compatible) + 1);
-    qemu_fdt_setprop_cell(s->cfg.fdt, node, "reg",
-                          arm_cpu_mp_affinity(arm_cpu) & ARM64_AFFINITY_MASK);
+    qemu_fdt_setprop_cell(s->cfg.fdt, node, "reg", affinity);
     qemu_fdt_setprop_string(s->cfg.fdt, node, "device_type", "cpu");
     qemu_fdt_setprop_string(s->cfg.fdt, node, "enable-method", "psci");
 }