Skip to content

hw/arm/xlnx-versal: fix Versal2 VxWorks CPU boot #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ho28 merged 1 commit into from
Jun 13, 2026
Merged

hw/arm/xlnx-versal: fix Versal2 VxWorks CPU boot #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hw/arm/xlnx-versal-virt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 3 additions & 4 deletions hw/arm/xlnx-versal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
uint64_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");
}
Expand Down
Loading