motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-12-11 16:00:50 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/riscv/virt: Use setprop_sized_cells for aclint

Browse source 
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 <dbarboza@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Message-ID: <20250604025450.85327-6-joel@jms.id.au>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Joel Stanley 2025-06-04 12:24:41 +09:30 • committed by Alistair Francis
parent 4b7b4f9cb4
commit dd3d4fd992
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
hw/riscv/virt.c
View file

@ -387,8 +387,8 @@ static void create_fdt_socket_aclint(RISCVVirtState *s,
qemu_fdt_add_subnode(ms->fdt, name); qemu_fdt_add_subnode(ms->fdt, name);
qemu_fdt_setprop_string(ms->fdt, name, "compatible", qemu_fdt_setprop_string(ms->fdt, name, "compatible",
"riscv,aclint-mswi"); "riscv,aclint-mswi");
qemu_fdt_setprop_cells(ms->fdt, name, "reg", qemu_fdt_setprop_sized_cells(ms->fdt, name, "reg",
0x0, addr, 0x0, RISCV_ACLINT_SWI_SIZE); 2, addr, 2, RISCV_ACLINT_SWI_SIZE);
qemu_fdt_setprop(ms->fdt, name, "interrupts-extended", qemu_fdt_setprop(ms->fdt, name, "interrupts-extended",
aclint_mswi_cells, aclint_cells_size); aclint_mswi_cells, aclint_cells_size);
qemu_fdt_setprop(ms->fdt, name, "interrupt-controller", NULL, 0); qemu_fdt_setprop(ms->fdt, name, "interrupt-controller", NULL, 0);
@ -410,11 +410,11 @@ static void create_fdt_socket_aclint(RISCVVirtState *s,
qemu_fdt_add_subnode(ms->fdt, name); qemu_fdt_add_subnode(ms->fdt, name);
qemu_fdt_setprop_string(ms->fdt, name, "compatible", qemu_fdt_setprop_string(ms->fdt, name, "compatible",
"riscv,aclint-mtimer"); "riscv,aclint-mtimer");
qemu_fdt_setprop_cells(ms->fdt, name, "reg", qemu_fdt_setprop_sized_cells(ms->fdt, name, "reg",
0x0, addr + RISCV_ACLINT_DEFAULT_MTIME, 2, addr + RISCV_ACLINT_DEFAULT_MTIME,
0x0, size - RISCV_ACLINT_DEFAULT_MTIME, 2, size - RISCV_ACLINT_DEFAULT_MTIME,
0x0, addr + RISCV_ACLINT_DEFAULT_MTIMECMP, 2, addr + RISCV_ACLINT_DEFAULT_MTIMECMP,
0x0, RISCV_ACLINT_DEFAULT_MTIME); 2, RISCV_ACLINT_DEFAULT_MTIME);
qemu_fdt_setprop(ms->fdt, name, "interrupts-extended", qemu_fdt_setprop(ms->fdt, name, "interrupts-extended",
aclint_mtimer_cells, aclint_cells_size); aclint_mtimer_cells, aclint_cells_size);
riscv_socket_fdt_write_id(ms, name, socket); riscv_socket_fdt_write_id(ms, name, socket);
@ -428,8 +428,8 @@ static void create_fdt_socket_aclint(RISCVVirtState *s,
qemu_fdt_add_subnode(ms->fdt, name); qemu_fdt_add_subnode(ms->fdt, name);
qemu_fdt_setprop_string(ms->fdt, name, "compatible", qemu_fdt_setprop_string(ms->fdt, name, "compatible",
"riscv,aclint-sswi"); "riscv,aclint-sswi");
qemu_fdt_setprop_cells(ms->fdt, name, "reg", qemu_fdt_setprop_sized_cells(ms->fdt, name, "reg",
0x0, addr, 0x0, s->memmap[VIRT_ACLINT_SSWI].size); 2, addr, 2, s->memmap[VIRT_ACLINT_SSWI].size);
qemu_fdt_setprop(ms->fdt, name, "interrupts-extended", qemu_fdt_setprop(ms->fdt, name, "interrupts-extended",
aclint_sswi_cells, aclint_cells_size); aclint_sswi_cells, aclint_cells_size);
qemu_fdt_setprop(ms->fdt, name, "interrupt-controller", NULL, 0); qemu_fdt_setprop(ms->fdt, name, "interrupt-controller", NULL, 0);