From: Alistair Francis <alistair23@gmail.com>
To: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Cc: qemu-devel@nongnu.org, qemu-riscv@nongnu.org,
alistair.francis@wdc.com, liwei1518@gmail.com,
zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com,
joel@jms.id.au
Subject: Re: [PATCH v2 7/9] hw/riscv/virt.c: use s->memmap in create_fdt_virtio()
Date: Thu, 1 May 2025 10:11:54 +1000 [thread overview]
Message-ID: <CAKmqyKM-1Uxsn-VDVXmwOAikb76xAzBoSpZfJhk4MFL6eKNtjg@mail.gmail.com> (raw)
In-Reply-To: <20250429125811.224803-8-dbarboza@ventanamicro.com>
On Tue, Apr 29, 2025 at 11:02 PM Daniel Henrique Barboza
<dbarboza@ventanamicro.com> wrote:
>
> create_fdt_virtio() can use s->memmap instead of having an extra
> argument for it.
>
> While we're at it rewrite it a little bit to avoid the clunky line in
> 'name' and code repetition:
>
> - declare 'virtio_base' out of the loop since it never changes;
> - declare a 'size' variable. Use it to calculate the address of the
> virtio device in an 'addr' variable;
> - use 'addr' in the 'name' g_strdup_printf();
> - use 'addr' and 'size' when creating the 'reg' property.
>
> Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> hw/riscv/virt.c | 17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> index 2383a557bd..46ac42058e 100644
> --- a/hw/riscv/virt.c
> +++ b/hw/riscv/virt.c
> @@ -841,21 +841,24 @@ static void create_fdt_sockets(RISCVVirtState *s,
> riscv_socket_fdt_write_distance_matrix(ms);
> }
>
> -static void create_fdt_virtio(RISCVVirtState *s, const MemMapEntry *memmap,
> - uint32_t irq_virtio_phandle)
> +static void create_fdt_virtio(RISCVVirtState *s, uint32_t irq_virtio_phandle)
> {
> int i;
> MachineState *ms = MACHINE(s);
> + hwaddr virtio_base = s->memmap[VIRT_VIRTIO].base;
>
> for (i = 0; i < VIRTIO_COUNT; i++) {
> - g_autofree char *name = g_strdup_printf("/soc/virtio_mmio@%lx",
> - (long)(memmap[VIRT_VIRTIO].base + i * memmap[VIRT_VIRTIO].size));
> + g_autofree char *name = NULL;
> + uint64_t size = s->memmap[VIRT_VIRTIO].size;
> + hwaddr addr = virtio_base + i * size;
> +
> + name = g_strdup_printf("/soc/virtio_mmio@%"HWADDR_PRIx, addr);
>
> qemu_fdt_add_subnode(ms->fdt, name);
> qemu_fdt_setprop_string(ms->fdt, name, "compatible", "virtio,mmio");
> qemu_fdt_setprop_cells(ms->fdt, name, "reg",
> - 0x0, memmap[VIRT_VIRTIO].base + i * memmap[VIRT_VIRTIO].size,
> - 0x0, memmap[VIRT_VIRTIO].size);
> + 0x0, addr,
> + 0x0, size);
> qemu_fdt_setprop_cell(ms->fdt, name, "interrupt-parent",
> irq_virtio_phandle);
> if (s->aia_type == VIRT_AIA_TYPE_NONE) {
> @@ -1134,7 +1137,7 @@ static void finalize_fdt(RISCVVirtState *s)
> &irq_pcie_phandle, &irq_virtio_phandle,
> &msi_pcie_phandle);
>
> - create_fdt_virtio(s, s->memmap, irq_virtio_phandle);
> + create_fdt_virtio(s, irq_virtio_phandle);
>
> if (virt_is_iommu_sys_enabled(s)) {
> create_fdt_iommu_sys(s, irq_mmio_phandle, msi_pcie_phandle,
> --
> 2.49.0
>
>
next prev parent reply other threads:[~2025-05-01 0:12 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-29 12:58 [PATCH v2 0/9] hw/riscv/virt.c: memmap usage cleanup Daniel Henrique Barboza
2025-04-29 12:58 ` [PATCH v2 1/9] hw/riscv/virt.c: enforce s->memmap use in machine_init() Daniel Henrique Barboza
2025-04-29 12:58 ` [PATCH v2 2/9] hw/riscv/virt.c: remove trivial virt_memmap references Daniel Henrique Barboza
2025-04-30 23:59 ` Alistair Francis
2025-04-29 12:58 ` [PATCH v2 3/9] hw/riscv/virt.c: use s->memmap in virt_machine_done() Daniel Henrique Barboza
2025-05-01 0:02 ` Alistair Francis
2025-04-29 12:58 ` [PATCH v2 4/9] hw/riscv/virt.c: add 'base' arg in create_fw_cfg() Daniel Henrique Barboza
2025-05-01 0:03 ` Alistair Francis
2025-04-29 12:58 ` [PATCH v2 5/9] hw/riscv/virt.c: use s->memmap in create_fdt() path Daniel Henrique Barboza
2025-05-01 0:08 ` Alistair Francis
2025-04-29 12:58 ` [PATCH v2 6/9] hw/riscv/virt.c: use s->memmap in create_fdt_sockets() path Daniel Henrique Barboza
2025-05-01 0:10 ` Alistair Francis
2025-04-29 12:58 ` [PATCH v2 7/9] hw/riscv/virt.c: use s->memmap in create_fdt_virtio() Daniel Henrique Barboza
2025-05-01 0:11 ` Alistair Francis [this message]
2025-04-29 12:58 ` [PATCH v2 8/9] hw/riscv/virt.c: use s->memmap in finalize_fdt() functions Daniel Henrique Barboza
2025-05-01 0:12 ` Alistair Francis
2025-04-29 12:58 ` [PATCH v2 9/9] hw/riscv/virt.c: remove 'long' casts in fmt strings Daniel Henrique Barboza
2025-05-01 0:13 ` Alistair Francis
2025-05-01 0:33 ` [PATCH v2 0/9] hw/riscv/virt.c: memmap usage cleanup Alistair Francis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAKmqyKM-1Uxsn-VDVXmwOAikb76xAzBoSpZfJhk4MFL6eKNtjg@mail.gmail.com \
--to=alistair23@gmail.com \
--cc=alistair.francis@wdc.com \
--cc=dbarboza@ventanamicro.com \
--cc=joel@jms.id.au \
--cc=liwei1518@gmail.com \
--cc=palmer@rivosinc.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=zhiwei_liu@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).