From: Joel Stanley Date: Wed, 4 Jun 2025 02:54:47 +0000 (+0930) Subject: hw/riscv/virt: Use setprop_sized_cells for iommu X-Git-Tag: v10.1.0-rc0~31^2~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e7e0ee63939a09b098279a475698d73243ffc76;p=thirdparty%2Fqemu.git hw/riscv/virt: Use setprop_sized_cells for iommu The current device tree property uses two cells for the address (and for the size), but assumes the they are less than 32 bits by hard coding the high cell to zero. Use qemu_fdt_setprop_sized_cells to do the job of splitting the upper and lower 32 bits across cells. Reviewed-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis Signed-off-by: Joel Stanley Message-ID: <20250604025450.85327-12-joel@jms.id.au> Signed-off-by: Alistair Francis --- diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 4fa2bad2480..67490c5c693 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1088,8 +1088,7 @@ static void create_fdt_iommu_sys(RISCVVirtState *s, uint32_t irq_chip, qemu_fdt_setprop_cell(fdt, iommu_node, "#iommu-cells", 1); qemu_fdt_setprop_cell(fdt, iommu_node, "phandle", iommu_phandle); - qemu_fdt_setprop_cells(fdt, iommu_node, "reg", - addr >> 32, addr, size >> 32, size); + qemu_fdt_setprop_sized_cells(fdt, iommu_node, "reg", 2, addr, 2, size); qemu_fdt_setprop_cell(fdt, iommu_node, "interrupt-parent", irq_chip); qemu_fdt_setprop_cells(fdt, iommu_node, "interrupts",