On Wed, Jul 16, 2025 at 11:54:24AM +0200, Luc Michel wrote: > To align with current branding and ensure coherency with the upcoming > versal2 machine, rename the xlnx-versal-virt machine to amd-versal-virt. > Keep an alias of the old name to the new one for command-line backward > compatibility. > > Signed-off-by: Luc Michel <luc.mic...@amd.com>
Reviewed-by: Francisco Iglesias <francisco.igles...@amd.com> > --- > docs/system/arm/xlnx-versal-virt.rst | 26 +++++++++++++++----------- > hw/arm/xlnx-versal-virt.c | 11 +++++++---- > 2 files changed, 22 insertions(+), 15 deletions(-) > > diff --git a/docs/system/arm/xlnx-versal-virt.rst > b/docs/system/arm/xlnx-versal-virt.rst > index c5f35f28e4f..2c63fbf519f 100644 > --- a/docs/system/arm/xlnx-versal-virt.rst > +++ b/docs/system/arm/xlnx-versal-virt.rst > @@ -1,21 +1,25 @@ > -Xilinx Versal Virt (``xlnx-versal-virt``) > -========================================= > +AMD Versal Virt (``amd-versal-virt``) > +===================================== > > -Xilinx Versal is a family of heterogeneous multi-core SoCs > +AMD Versal is a family of heterogeneous multi-core SoCs > (System on Chip) that combine traditional hardened CPUs and I/O > peripherals in a Processing System (PS) with runtime programmable > FPGA logic (PL) and an Artificial Intelligence Engine (AIE). > > +QEMU implements the Versal Series variant of Versal SoCs, with the > +``amd-versal-virt`` machine. The alias ``xlnx-versal-virt`` is kept for > +backward compatibility. > + > More details here: > -https://www.xilinx.com/products/silicon-devices/acap/versal.html > +https://www.amd.com/en/products/adaptive-socs-and-fpgas/versal.html > > The family of Versal SoCs share a single architecture but come in > different parts with different speed grades, amounts of PL and > other differences. > > -The Xilinx Versal Virt board in QEMU is a model of a virtual board > +The AMD Versal Virt board in QEMU is a model of a virtual board > (does not exist in reality) with a virtual Versal SoC without I/O > limitations. Currently, we support the following cores and devices: > > Implemented CPU cores: > > @@ -72,11 +76,11 @@ A few examples: > > Direct Linux boot of a generic ARM64 upstream Linux kernel: > > .. code-block:: bash > > - $ qemu-system-aarch64 -M xlnx-versal-virt -m 2G \ > + $ qemu-system-aarch64 -M amd-versal-virt -m 2G \ > -serial mon:stdio -display none \ > -kernel arch/arm64/boot/Image \ > -nic user -nic user \ > -device virtio-rng-device,bus=virtio-mmio-bus.0 \ > -drive if=none,index=0,file=hd0.qcow2,id=hd0,snapshot \ > @@ -85,11 +89,11 @@ Direct Linux boot of a generic ARM64 upstream Linux > kernel: > > Direct Linux boot of PetaLinux 2019.2: > > .. code-block:: bash > > - $ qemu-system-aarch64 -M xlnx-versal-virt -m 2G \ > + $ qemu-system-aarch64 -M amd-versal-virt -m 2G \ > -serial mon:stdio -display none \ > -kernel petalinux-v2019.2/Image \ > -append "rdinit=/sbin/init console=ttyAMA0,115200n8 > earlycon=pl011,mmio,0xFF000000,115200n8" \ > -net nic,model=cadence_gem,netdev=net0 -netdev user,id=net0 \ > -device virtio-rng-device,bus=virtio-mmio-bus.0,rng=rng0 \ > @@ -98,11 +102,11 @@ Direct Linux boot of PetaLinux 2019.2: > Boot PetaLinux 2019.2 via ARM Trusted Firmware (2018.3 because the 2019.2 > version of ATF tries to configure the CCI which we don't model) and U-boot: > > .. code-block:: bash > > - $ qemu-system-aarch64 -M xlnx-versal-virt -m 2G \ > + $ qemu-system-aarch64 -M amd-versal-virt -m 2G \ > -serial stdio -display none \ > -device loader,file=petalinux-v2018.3/bl31.elf,cpu-num=0 \ > -device loader,file=petalinux-v2019.2/u-boot.elf \ > -device loader,addr=0x20000000,file=petalinux-v2019.2/Image \ > -nic user -nic user \ > @@ -123,11 +127,11 @@ Run the following at the U-Boot prompt: > > Boot Linux as DOM0 on Xen via U-Boot: > > .. code-block:: bash > > - $ qemu-system-aarch64 -M xlnx-versal-virt -m 4G \ > + $ qemu-system-aarch64 -M amd-versal-virt -m 4G \ > -serial stdio -display none \ > -device loader,file=petalinux-v2019.2/u-boot.elf,cpu-num=0 \ > -device loader,addr=0x30000000,file=linux/2018-04-24/xen \ > -device loader,addr=0x40000000,file=petalinux-v2019.2/Image \ > -nic user -nic user \ > @@ -151,11 +155,11 @@ Run the following at the U-Boot prompt: > > Boot Linux as Dom0 on Xen via ARM Trusted Firmware and U-Boot: > > .. code-block:: bash > > - $ qemu-system-aarch64 -M xlnx-versal-virt -m 4G \ > + $ qemu-system-aarch64 -M amd-versal-virt -m 4G \ > -serial stdio -display none \ > -device loader,file=petalinux-v2018.3/bl31.elf,cpu-num=0 \ > -device loader,file=petalinux-v2019.2/u-boot.elf \ > -device loader,addr=0x30000000,file=linux/2018-04-24/xen \ > -device loader,addr=0x40000000,file=petalinux-v2019.2/Image \ > @@ -225,11 +229,11 @@ To use a different index value, N, from default of 1, > add: > > Thus, a file backend should be used with caution, and 'format=luks' > is highly recommended (albeit with usage complexity). > > Better yet, do not use actual product data when running guest image > - on this Xilinx Versal Virt board. > + on this AMD Versal Virt board. > > Using CANFDs for Versal Virt > """""""""""""""""""""""""""" > Versal CANFD controller is developed based on SocketCAN and QEMU CAN bus > implementation. Bus connection and socketCAN connection for each CAN module > diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c > index 5e47a20922a..daacbfb984e 100644 > --- a/hw/arm/xlnx-versal-virt.c > +++ b/hw/arm/xlnx-versal-virt.c > @@ -1,7 +1,7 @@ > /* > - * Xilinx Versal Virtual board. > + * AMD/Xilinx Versal Virtual board. > * > * Copyright (c) 2018 Xilinx Inc. > * Copyright (c) 2025, Advanced Micro Devices, Inc. > * Written by Edgar E. Iglesias > * > @@ -24,11 +24,11 @@ > #include "hw/arm/boot.h" > #include "target/arm/multiprocessing.h" > #include "qom/object.h" > #include "target/arm/cpu.h" > > -#define TYPE_XLNX_VERSAL_VIRT_MACHINE MACHINE_TYPE_NAME("xlnx-versal-virt") > +#define TYPE_XLNX_VERSAL_VIRT_MACHINE MACHINE_TYPE_NAME("amd-versal-virt") > OBJECT_DECLARE_SIMPLE_TYPE(VersalVirt, XLNX_VERSAL_VIRT_MACHINE) > > #define XLNX_VERSAL_NUM_OSPI_FLASH 4 > > struct VersalVirt { > @@ -53,10 +53,11 @@ struct VersalVirt { > }; > > static void fdt_create(VersalVirt *s) > { > MachineClass *mc = MACHINE_GET_CLASS(s); > + const char versal_compat[] = "amd-versal-virt\0xlnx-versal-virt"; > > s->fdt = create_device_tree(&s->fdt_size); > if (!s->fdt) { > error_report("create_device_tree() failed"); > exit(1); > @@ -70,11 +71,12 @@ static void fdt_create(VersalVirt *s) > qemu_fdt_add_subnode(s->fdt, "/chosen"); > qemu_fdt_add_subnode(s->fdt, "/aliases"); > > /* Header */ > qemu_fdt_setprop_string(s->fdt, "/", "model", mc->desc); > - qemu_fdt_setprop_string(s->fdt, "/", "compatible", "xlnx-versal-virt"); > + qemu_fdt_setprop(s->fdt, "/", "compatible", versal_compat, > + sizeof(versal_compat)); > } > > static void fdt_add_clk_node(VersalVirt *s, const char *name, > unsigned int freq_hz, uint32_t phandle) > { > @@ -346,11 +348,12 @@ static void versal_virt_machine_finalize(Object *obj) > static void versal_virt_machine_class_init(ObjectClass *oc, const void *data) > { > MachineClass *mc = MACHINE_CLASS(oc); > int num_cpu = versal_get_num_cpu(VERSAL_VER_VERSAL); > > - mc->desc = "Xilinx Versal Virtual development board"; > + mc->desc = "AMD Versal Virtual development board"; > + mc->alias = "xlnx-versal-virt"; > mc->init = versal_virt_init; > mc->min_cpus = num_cpu; > mc->max_cpus = num_cpu; > mc->default_cpus = num_cpu; > mc->no_cdrom = true; > -- > 2.50.0 >
