All the mail mirrored from lore.kernel.org
 help / color / mirror / Atom feed
From: Bin Meng <bmeng.cn@gmail.com>
To: Anup Patel <anup.patel@wdc.com>
Cc: Peter Maydell <peter.maydell@linaro.org>,
	"open list:RISC-V" <qemu-riscv@nongnu.org>,
	Sagar Karandikar <sagark@eecs.berkeley.edu>,
	Anup Patel <anup@brainfault.org>,
	"qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>,
	Atish Patra <atish.patra@wdc.com>,
	Alistair Francis <Alistair.Francis@wdc.com>,
	Palmer Dabbelt <palmer@dabbelt.com>
Subject: Re: [PATCH v1 2/3] hw/riscv: virt: Re-factor FDT generation
Date: Mon, 14 Jun 2021 20:22:33 +0800	[thread overview]
Message-ID: <CAEUhbmWmFuyLVd95-Jgwqr022N82iBKfXxqvczc8i0C2SWrBuQ@mail.gmail.com> (raw)
In-Reply-To: <20210612160615.330768-3-anup.patel@wdc.com>

On Sun, Jun 13, 2021 at 12:12 AM Anup Patel <anup.patel@wdc.com> wrote:
>
> We re-factor and break the FDT generation into smaller functions
> so that it is easier to modify FDT generation for different
> configurations of virt machine.
>
> Signed-off-by: Anup Patel <anup.patel@wdc.com>
> ---
>  hw/riscv/virt.c | 514 ++++++++++++++++++++++++++++++------------------
>  1 file changed, 320 insertions(+), 194 deletions(-)
>
> diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> index 5eb63f6efd..977d699753 100644
> --- a/hw/riscv/virt.c
> +++ b/hw/riscv/virt.c
> @@ -178,206 +178,253 @@ static void create_pcie_irq_map(void *fdt, char *nodename,
>                             0x1800, 0, 0, 0x7);
>  }
>
> -static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap,
> -                       uint64_t mem_size, const char *cmdline, bool is_32_bit)
> +static void create_fdt_socket_cpus(RISCVVirtState *s, int socket,
> +                                   char *clust_name, uint32_t *phandle,
> +                                   bool is_32_bit, uint32_t *intc_phandles)
>  {
> -    void *fdt;
> -    int i, cpu, socket;
> +    int cpu;
> +    uint32_t cpu_phandle;
>      MachineState *mc = MACHINE(s);
> +    char *name, *cpu_name, *core_name, *intc_name;
> +
> +    for (cpu = s->soc[socket].num_harts - 1; cpu >= 0; cpu--) {
> +        cpu_phandle = (*phandle)++;
> +
> +        cpu_name = g_strdup_printf("/cpus/cpu@%d",
> +            s->soc[socket].hartid_base + cpu);
> +        qemu_fdt_add_subnode(mc->fdt, cpu_name);
> +        qemu_fdt_setprop_string(mc->fdt, cpu_name, "mmu-type",
> +            (is_32_bit) ? "riscv,sv32" : "riscv,sv48");
> +        name = riscv_isa_string(&s->soc[socket].harts[cpu]);
> +        qemu_fdt_setprop_string(mc->fdt, cpu_name, "riscv,isa", name);
> +        g_free(name);
> +        qemu_fdt_setprop_string(mc->fdt, cpu_name, "compatible", "riscv");
> +        qemu_fdt_setprop_string(mc->fdt, cpu_name, "status", "okay");
> +        qemu_fdt_setprop_cell(mc->fdt, cpu_name, "reg",
> +            s->soc[socket].hartid_base + cpu);
> +        qemu_fdt_setprop_string(mc->fdt, cpu_name, "device_type", "cpu");
> +        riscv_socket_fdt_write_id(mc, mc->fdt, cpu_name, socket);
> +        qemu_fdt_setprop_cell(mc->fdt, cpu_name, "phandle", cpu_phandle);
> +
> +        intc_phandles[cpu] = (*phandle)++;
> +
> +        intc_name = g_strdup_printf("%s/interrupt-controller", cpu_name);
> +        qemu_fdt_add_subnode(mc->fdt, intc_name);
> +        qemu_fdt_setprop_cell(mc->fdt, intc_name, "phandle",
> +            intc_phandles[cpu]);
> +        qemu_fdt_setprop_string(mc->fdt, intc_name, "compatible",
> +            "riscv,cpu-intc");
> +        qemu_fdt_setprop(mc->fdt, intc_name, "interrupt-controller", NULL, 0);
> +        qemu_fdt_setprop_cell(mc->fdt, intc_name, "#interrupt-cells", 1);
> +
> +        core_name = g_strdup_printf("%s/core%d", clust_name, cpu);
> +        qemu_fdt_add_subnode(mc->fdt, core_name);
> +        qemu_fdt_setprop_cell(mc->fdt, core_name, "cpu", cpu_phandle);
> +
> +        g_free(core_name);
> +        g_free(intc_name);
> +        g_free(cpu_name);
> +    }
> +}
> +
> +static void create_fdt_socket_memory(RISCVVirtState *s,
> +                                     const MemMapEntry *memmap, int socket)
> +{
> +    char *mem_name;
>      uint64_t addr, size;
> -    uint32_t *clint_cells, *plic_cells;
> -    unsigned long clint_addr, plic_addr;
> -    uint32_t plic_phandle[MAX_NODES];
> -    uint32_t cpu_phandle, intc_phandle, test_phandle;
> -    uint32_t phandle = 1, plic_mmio_phandle = 1;
> -    uint32_t plic_pcie_phandle = 1, plic_virtio_phandle = 1;
> -    char *mem_name, *cpu_name, *core_name, *intc_name;
> -    char *name, *clint_name, *plic_name, *clust_name;
> -    hwaddr flashsize = virt_memmap[VIRT_FLASH].size / 2;
> -    hwaddr flashbase = virt_memmap[VIRT_FLASH].base;
> +    MachineState *mc = MACHINE(s);
>
> -    if (mc->dtb) {
> -        fdt = mc->fdt = load_device_tree(mc->dtb, &s->fdt_size);
> -        if (!fdt) {
> -            error_report("load_device_tree() failed");
> -            exit(1);
> -        }
> -        goto update_bootargs;
> -    } else {
> -        fdt = mc->fdt = create_device_tree(&s->fdt_size);
> -        if (!fdt) {
> -            error_report("create_device_tree() failed");
> -            exit(1);
> -        }
> +    addr = memmap[VIRT_DRAM].base + riscv_socket_mem_offset(mc, socket);
> +    size = riscv_socket_mem_size(mc, socket);
> +    mem_name = g_strdup_printf("/memory@%lx", (long)addr);
> +    qemu_fdt_add_subnode(mc->fdt, mem_name);
> +    qemu_fdt_setprop_cells(mc->fdt, mem_name, "reg",
> +        addr >> 32, addr, size >> 32, size);
> +    qemu_fdt_setprop_string(mc->fdt, mem_name, "device_type", "memory");
> +    riscv_socket_fdt_write_id(mc, mc->fdt, mem_name, socket);
> +    g_free(mem_name);
> +}
> +
> +static void create_fdt_socket_clint(RISCVVirtState *s,
> +                                    const MemMapEntry *memmap, int socket,
> +                                    uint32_t *intc_phandles)
> +{
> +    int cpu;
> +    char *clint_name;
> +    uint32_t *clint_cells;
> +    unsigned long clint_addr;
> +    MachineState *mc = MACHINE(s);
> +
> +    clint_cells = g_new0(uint32_t, s->soc[socket].num_harts * 4);
> +
> +    for (cpu = 0; cpu < s->soc[socket].num_harts; cpu++) {
> +        clint_cells[cpu * 4 + 0] = cpu_to_be32(intc_phandles[cpu]);
> +        clint_cells[cpu * 4 + 1] = cpu_to_be32(IRQ_M_SOFT);
> +        clint_cells[cpu * 4 + 2] = cpu_to_be32(intc_phandles[cpu]);
> +        clint_cells[cpu * 4 + 3] = cpu_to_be32(IRQ_M_TIMER);
>      }
>
> -    qemu_fdt_setprop_string(fdt, "/", "model", "riscv-virtio,qemu");
> -    qemu_fdt_setprop_string(fdt, "/", "compatible", "riscv-virtio");
> -    qemu_fdt_setprop_cell(fdt, "/", "#size-cells", 0x2);
> -    qemu_fdt_setprop_cell(fdt, "/", "#address-cells", 0x2);
> +    clint_addr = memmap[VIRT_CLINT].base + (memmap[VIRT_CLINT].size * socket);
> +    clint_name = g_strdup_printf("/soc/clint@%lx", clint_addr);
> +    qemu_fdt_add_subnode(mc->fdt, clint_name);
> +    qemu_fdt_setprop_string(mc->fdt, clint_name, "compatible",
> +        "riscv,clint0");

This patch seems to be based on some old commit, as the latest QEMU
head has the following commit that supports the official clint
compatible name via:

commit b387236bff95 ("hw/riscv: Support the official CLINT DT bindings")

> +    qemu_fdt_setprop_cells(mc->fdt, clint_name, "reg",
> +        0x0, clint_addr, 0x0, memmap[VIRT_CLINT].size);
> +    qemu_fdt_setprop(mc->fdt, clint_name, "interrupts-extended",
> +        clint_cells, s->soc[socket].num_harts * sizeof(uint32_t) * 4);
> +    riscv_socket_fdt_write_id(mc, mc->fdt, clint_name, socket);
> +    g_free(clint_name);
> +
> +    g_free(clint_cells);
> +}
> +
> +static void create_fdt_socket_plic(RISCVVirtState *s,
> +                                   const MemMapEntry *memmap, int socket,
> +                                   uint32_t *phandle, uint32_t *intc_phandles,
> +                                   uint32_t *plic_phandles)
> +{
> +    int cpu;
> +    char *plic_name;
> +    uint32_t *plic_cells;
> +    unsigned long plic_addr;
> +    MachineState *mc = MACHINE(s);
>
> -    qemu_fdt_add_subnode(fdt, "/soc");
> -    qemu_fdt_setprop(fdt, "/soc", "ranges", NULL, 0);
> -    qemu_fdt_setprop_string(fdt, "/soc", "compatible", "simple-bus");
> -    qemu_fdt_setprop_cell(fdt, "/soc", "#size-cells", 0x2);
> -    qemu_fdt_setprop_cell(fdt, "/soc", "#address-cells", 0x2);
> +    plic_cells = g_new0(uint32_t, s->soc[socket].num_harts * 4);
>
> -    qemu_fdt_add_subnode(fdt, "/cpus");
> -    qemu_fdt_setprop_cell(fdt, "/cpus", "timebase-frequency",
> +    for (cpu = 0; cpu < s->soc[socket].num_harts; cpu++) {
> +        plic_cells[cpu * 4 + 0] = cpu_to_be32(intc_phandles[cpu]);
> +        plic_cells[cpu * 4 + 1] = cpu_to_be32(IRQ_M_EXT);
> +        plic_cells[cpu * 4 + 2] = cpu_to_be32(intc_phandles[cpu]);
> +        plic_cells[cpu * 4 + 3] = cpu_to_be32(IRQ_S_EXT);
> +    }
> +
> +    plic_phandles[socket] = (*phandle)++;
> +    plic_addr = memmap[VIRT_PLIC].base + (memmap[VIRT_PLIC].size * socket);
> +    plic_name = g_strdup_printf("/soc/plic@%lx", plic_addr);
> +    qemu_fdt_add_subnode(mc->fdt, plic_name);
> +    qemu_fdt_setprop_cell(mc->fdt, plic_name,
> +        "#address-cells", FDT_PLIC_ADDR_CELLS);
> +    qemu_fdt_setprop_cell(mc->fdt, plic_name,
> +        "#interrupt-cells", FDT_PLIC_INT_CELLS);
> +    qemu_fdt_setprop_string(mc->fdt, plic_name, "compatible", "riscv,plic0");
> +    qemu_fdt_setprop(mc->fdt, plic_name, "interrupt-controller", NULL, 0);
> +    qemu_fdt_setprop(mc->fdt, plic_name, "interrupts-extended",
> +        plic_cells, s->soc[socket].num_harts * sizeof(uint32_t) * 4);
> +    qemu_fdt_setprop_cells(mc->fdt, plic_name, "reg",
> +        0x0, plic_addr, 0x0, memmap[VIRT_PLIC].size);
> +    qemu_fdt_setprop_cell(mc->fdt, plic_name, "riscv,ndev", VIRTIO_NDEV);
> +    riscv_socket_fdt_write_id(mc, mc->fdt, plic_name, socket);
> +    qemu_fdt_setprop_cell(mc->fdt, plic_name, "phandle",
> +        plic_phandles[socket]);
> +    g_free(plic_name);
> +
> +    g_free(plic_cells);
> +}
> +
> +static void create_fdt_sockets(RISCVVirtState *s, const MemMapEntry *memmap,
> +                               bool is_32_bit, uint32_t *phandle,
> +                               uint32_t *irq_mmio_phandle,
> +                               uint32_t *irq_pcie_phandle,
> +                               uint32_t *irq_virtio_phandle)
> +{
> +    int socket;
> +    char *clust_name;
> +    uint32_t *intc_phandles;
> +    MachineState *mc = MACHINE(s);
> +    uint32_t xplic_phandles[MAX_NODES];
> +
> +    qemu_fdt_add_subnode(mc->fdt, "/cpus");
> +    qemu_fdt_setprop_cell(mc->fdt, "/cpus", "timebase-frequency",
>                            RISCV_ACLINT_TIMEBASE_FREQ);
> -    qemu_fdt_setprop_cell(fdt, "/cpus", "#size-cells", 0x0);
> -    qemu_fdt_setprop_cell(fdt, "/cpus", "#address-cells", 0x1);
> -    qemu_fdt_add_subnode(fdt, "/cpus/cpu-map");
> +    qemu_fdt_setprop_cell(mc->fdt, "/cpus", "#size-cells", 0x0);
> +    qemu_fdt_setprop_cell(mc->fdt, "/cpus", "#address-cells", 0x1);
> +    qemu_fdt_add_subnode(mc->fdt, "/cpus/cpu-map");
>
>      for (socket = (riscv_socket_count(mc) - 1); socket >= 0; socket--) {
>          clust_name = g_strdup_printf("/cpus/cpu-map/cluster%d", socket);
> -        qemu_fdt_add_subnode(fdt, clust_name);
> +        qemu_fdt_add_subnode(mc->fdt, clust_name);
>
> -        plic_cells = g_new0(uint32_t, s->soc[socket].num_harts * 4);
> -        clint_cells = g_new0(uint32_t, s->soc[socket].num_harts * 4);
> +        intc_phandles = g_new0(uint32_t, s->soc[socket].num_harts);
>
> -        for (cpu = s->soc[socket].num_harts - 1; cpu >= 0; cpu--) {
> -            cpu_phandle = phandle++;
> +        create_fdt_socket_cpus(s, socket, clust_name, phandle,
> +            is_32_bit, intc_phandles);
>
> -            cpu_name = g_strdup_printf("/cpus/cpu@%d",
> -                s->soc[socket].hartid_base + cpu);
> -            qemu_fdt_add_subnode(fdt, cpu_name);
> -            if (is_32_bit) {
> -                qemu_fdt_setprop_string(fdt, cpu_name, "mmu-type", "riscv,sv32");
> -            } else {
> -                qemu_fdt_setprop_string(fdt, cpu_name, "mmu-type", "riscv,sv48");
> -            }
> -            name = riscv_isa_string(&s->soc[socket].harts[cpu]);
> -            qemu_fdt_setprop_string(fdt, cpu_name, "riscv,isa", name);
> -            g_free(name);
> -            qemu_fdt_setprop_string(fdt, cpu_name, "compatible", "riscv");
> -            qemu_fdt_setprop_string(fdt, cpu_name, "status", "okay");
> -            qemu_fdt_setprop_cell(fdt, cpu_name, "reg",
> -                s->soc[socket].hartid_base + cpu);
> -            qemu_fdt_setprop_string(fdt, cpu_name, "device_type", "cpu");
> -            riscv_socket_fdt_write_id(mc, fdt, cpu_name, socket);
> -            qemu_fdt_setprop_cell(fdt, cpu_name, "phandle", cpu_phandle);
> -
> -            intc_name = g_strdup_printf("%s/interrupt-controller", cpu_name);
> -            qemu_fdt_add_subnode(fdt, intc_name);
> -            intc_phandle = phandle++;
> -            qemu_fdt_setprop_cell(fdt, intc_name, "phandle", intc_phandle);
> -            qemu_fdt_setprop_string(fdt, intc_name, "compatible",
> -                "riscv,cpu-intc");
> -            qemu_fdt_setprop(fdt, intc_name, "interrupt-controller", NULL, 0);
> -            qemu_fdt_setprop_cell(fdt, intc_name, "#interrupt-cells", 1);
> -
> -            clint_cells[cpu * 4 + 0] = cpu_to_be32(intc_phandle);
> -            clint_cells[cpu * 4 + 1] = cpu_to_be32(IRQ_M_SOFT);
> -            clint_cells[cpu * 4 + 2] = cpu_to_be32(intc_phandle);
> -            clint_cells[cpu * 4 + 3] = cpu_to_be32(IRQ_M_TIMER);
> -
> -            plic_cells[cpu * 4 + 0] = cpu_to_be32(intc_phandle);
> -            plic_cells[cpu * 4 + 1] = cpu_to_be32(IRQ_M_EXT);
> -            plic_cells[cpu * 4 + 2] = cpu_to_be32(intc_phandle);
> -            plic_cells[cpu * 4 + 3] = cpu_to_be32(IRQ_S_EXT);
> -
> -            core_name = g_strdup_printf("%s/core%d", clust_name, cpu);
> -            qemu_fdt_add_subnode(fdt, core_name);
> -            qemu_fdt_setprop_cell(fdt, core_name, "cpu", cpu_phandle);
> -
> -            g_free(core_name);
> -            g_free(intc_name);
> -            g_free(cpu_name);
> -        }
> +        create_fdt_socket_memory(s, memmap, socket);
>
> -        addr = memmap[VIRT_DRAM].base + riscv_socket_mem_offset(mc, socket);
> -        size = riscv_socket_mem_size(mc, socket);
> -        mem_name = g_strdup_printf("/memory@%lx", (long)addr);
> -        qemu_fdt_add_subnode(fdt, mem_name);
> -        qemu_fdt_setprop_cells(fdt, mem_name, "reg",
> -            addr >> 32, addr, size >> 32, size);
> -        qemu_fdt_setprop_string(fdt, mem_name, "device_type", "memory");
> -        riscv_socket_fdt_write_id(mc, fdt, mem_name, socket);
> -        g_free(mem_name);
> -
> -        clint_addr = memmap[VIRT_CLINT].base +
> -            (memmap[VIRT_CLINT].size * socket);
> -        clint_name = g_strdup_printf("/soc/clint@%lx", clint_addr);
> -        qemu_fdt_add_subnode(fdt, clint_name);
> -        qemu_fdt_setprop_string(fdt, clint_name, "compatible", "riscv,clint0");
> -        qemu_fdt_setprop_cells(fdt, clint_name, "reg",
> -            0x0, clint_addr, 0x0, memmap[VIRT_CLINT].size);
> -        qemu_fdt_setprop(fdt, clint_name, "interrupts-extended",
> -            clint_cells, s->soc[socket].num_harts * sizeof(uint32_t) * 4);
> -        riscv_socket_fdt_write_id(mc, fdt, clint_name, socket);
> -        g_free(clint_name);
> -
> -        plic_phandle[socket] = phandle++;
> -        plic_addr = memmap[VIRT_PLIC].base + (memmap[VIRT_PLIC].size * socket);
> -        plic_name = g_strdup_printf("/soc/plic@%lx", plic_addr);
> -        qemu_fdt_add_subnode(fdt, plic_name);
> -        qemu_fdt_setprop_cell(fdt, plic_name,
> -            "#address-cells", FDT_PLIC_ADDR_CELLS);
> -        qemu_fdt_setprop_cell(fdt, plic_name,
> -            "#interrupt-cells", FDT_PLIC_INT_CELLS);
> -        qemu_fdt_setprop_string(fdt, plic_name, "compatible", "riscv,plic0");
> -        qemu_fdt_setprop(fdt, plic_name, "interrupt-controller", NULL, 0);
> -        qemu_fdt_setprop(fdt, plic_name, "interrupts-extended",
> -            plic_cells, s->soc[socket].num_harts * sizeof(uint32_t) * 4);
> -        qemu_fdt_setprop_cells(fdt, plic_name, "reg",
> -            0x0, plic_addr, 0x0, memmap[VIRT_PLIC].size);
> -        qemu_fdt_setprop_cell(fdt, plic_name, "riscv,ndev", VIRTIO_NDEV);
> -        riscv_socket_fdt_write_id(mc, fdt, plic_name, socket);
> -        qemu_fdt_setprop_cell(fdt, plic_name, "phandle", plic_phandle[socket]);
> -        g_free(plic_name);
> -
> -        g_free(clint_cells);
> -        g_free(plic_cells);
> +        create_fdt_socket_clint(s, memmap, socket, intc_phandles);
> +
> +        create_fdt_socket_plic(s, memmap, socket, phandle,
> +            intc_phandles, xplic_phandles);
> +
> +        g_free(intc_phandles);
>          g_free(clust_name);
>      }
>
>      for (socket = 0; socket < riscv_socket_count(mc); socket++) {
>          if (socket == 0) {
> -            plic_mmio_phandle = plic_phandle[socket];
> -            plic_virtio_phandle = plic_phandle[socket];
> -            plic_pcie_phandle = plic_phandle[socket];
> +            *irq_mmio_phandle = xplic_phandles[socket];
> +            *irq_virtio_phandle = xplic_phandles[socket];
> +            *irq_pcie_phandle = xplic_phandles[socket];
>          }
>          if (socket == 1) {
> -            plic_virtio_phandle = plic_phandle[socket];
> -            plic_pcie_phandle = plic_phandle[socket];
> +            *irq_virtio_phandle = xplic_phandles[socket];
> +            *irq_pcie_phandle = xplic_phandles[socket];
>          }
>          if (socket == 2) {
> -            plic_pcie_phandle = plic_phandle[socket];
> +            *irq_pcie_phandle = xplic_phandles[socket];
>          }
>      }
>
> -    riscv_socket_fdt_write_distance_matrix(mc, fdt);
> +    riscv_socket_fdt_write_distance_matrix(mc, mc->fdt);
> +}
> +
> +static void create_fdt_virtio(RISCVVirtState *s, const MemMapEntry *memmap,
> +                              uint32_t irq_virtio_phandle)
> +{
> +    int i;
> +    char *name;
> +    MachineState *mc = MACHINE(s);
>
>      for (i = 0; i < VIRTIO_COUNT; i++) {
>          name = g_strdup_printf("/soc/virtio_mmio@%lx",
>              (long)(memmap[VIRT_VIRTIO].base + i * memmap[VIRT_VIRTIO].size));
> -        qemu_fdt_add_subnode(fdt, name);
> -        qemu_fdt_setprop_string(fdt, name, "compatible", "virtio,mmio");
> -        qemu_fdt_setprop_cells(fdt, name, "reg",
> +        qemu_fdt_add_subnode(mc->fdt, name);
> +        qemu_fdt_setprop_string(mc->fdt, name, "compatible", "virtio,mmio");
> +        qemu_fdt_setprop_cells(mc->fdt, name, "reg",
>              0x0, memmap[VIRT_VIRTIO].base + i * memmap[VIRT_VIRTIO].size,
>              0x0, memmap[VIRT_VIRTIO].size);
> -        qemu_fdt_setprop_cell(fdt, name, "interrupt-parent",
> -            plic_virtio_phandle);
> -        qemu_fdt_setprop_cell(fdt, name, "interrupts", VIRTIO_IRQ + i);
> +        qemu_fdt_setprop_cell(mc->fdt, name, "interrupt-parent",
> +            irq_virtio_phandle);
> +        qemu_fdt_setprop_cell(mc->fdt, name, "interrupts", VIRTIO_IRQ + i);
>          g_free(name);
>      }
> +}
> +
> +static void create_fdt_pcie(RISCVVirtState *s, const MemMapEntry *memmap,
> +                            uint32_t irq_pcie_phandle)
> +{
> +    char *name;
> +    MachineState *mc = MACHINE(s);
>
>      name = g_strdup_printf("/soc/pci@%lx",
>          (long) memmap[VIRT_PCIE_ECAM].base);
> -    qemu_fdt_add_subnode(fdt, name);
> -    qemu_fdt_setprop_cell(fdt, name, "#address-cells", FDT_PCI_ADDR_CELLS);
> -    qemu_fdt_setprop_cell(fdt, name, "#interrupt-cells", FDT_PCI_INT_CELLS);
> -    qemu_fdt_setprop_cell(fdt, name, "#size-cells", 0x2);
> -    qemu_fdt_setprop_string(fdt, name, "compatible", "pci-host-ecam-generic");
> -    qemu_fdt_setprop_string(fdt, name, "device_type", "pci");
> -    qemu_fdt_setprop_cell(fdt, name, "linux,pci-domain", 0);
> -    qemu_fdt_setprop_cells(fdt, name, "bus-range", 0,
> +    qemu_fdt_add_subnode(mc->fdt, name);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "#address-cells",
> +        FDT_PCI_ADDR_CELLS);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "#interrupt-cells",
> +        FDT_PCI_INT_CELLS);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "#size-cells", 0x2);
> +    qemu_fdt_setprop_string(mc->fdt, name, "compatible",
> +        "pci-host-ecam-generic");
> +    qemu_fdt_setprop_string(mc->fdt, name, "device_type", "pci");
> +    qemu_fdt_setprop_cell(mc->fdt, name, "linux,pci-domain", 0);
> +    qemu_fdt_setprop_cells(mc->fdt, name, "bus-range", 0,
>          memmap[VIRT_PCIE_ECAM].size / PCIE_MMCFG_SIZE_MIN - 1);
> -    qemu_fdt_setprop(fdt, name, "dma-coherent", NULL, 0);
> -    qemu_fdt_setprop_cells(fdt, name, "reg", 0,
> +    qemu_fdt_setprop(mc->fdt, name, "dma-coherent", NULL, 0);
> +    qemu_fdt_setprop_cells(mc->fdt, name, "reg", 0,
>          memmap[VIRT_PCIE_ECAM].base, 0, memmap[VIRT_PCIE_ECAM].size);
> -    qemu_fdt_setprop_sized_cells(fdt, name, "ranges",
> +    qemu_fdt_setprop_sized_cells(mc->fdt, name, "ranges",
>          1, FDT_PCI_RANGE_IOPORT, 2, 0,
>          2, memmap[VIRT_PCIE_PIO].base, 2, memmap[VIRT_PCIE_PIO].size,
>          1, FDT_PCI_RANGE_MMIO,
> @@ -387,63 +434,93 @@ static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap,
>          2, virt_high_pcie_memmap.base,
>          2, virt_high_pcie_memmap.base, 2, virt_high_pcie_memmap.size);
>
> -    create_pcie_irq_map(fdt, name, plic_pcie_phandle);
> +    create_pcie_irq_map(mc->fdt, name, irq_pcie_phandle);
>      g_free(name);
> +}
> +
> +static void create_fdt_reset(RISCVVirtState *s, const MemMapEntry *memmap,
> +                             uint32_t *phandle)
> +{
> +    char *name;
> +    uint32_t test_phandle;
> +    MachineState *mc = MACHINE(s);
>
> -    test_phandle = phandle++;
> +    test_phandle = (*phandle)++;
>      name = g_strdup_printf("/soc/test@%lx",
>          (long)memmap[VIRT_TEST].base);
> -    qemu_fdt_add_subnode(fdt, name);
> +    qemu_fdt_add_subnode(mc->fdt, name);
>      {
>          const char compat[] = "sifive,test1\0sifive,test0\0syscon";
> -        qemu_fdt_setprop(fdt, name, "compatible", compat, sizeof(compat));
> +        qemu_fdt_setprop(mc->fdt, name, "compatible", compat, sizeof(compat));
>      }
> -    qemu_fdt_setprop_cells(fdt, name, "reg",
> -        0x0, memmap[VIRT_TEST].base,
> -        0x0, memmap[VIRT_TEST].size);
> -    qemu_fdt_setprop_cell(fdt, name, "phandle", test_phandle);
> -    test_phandle = qemu_fdt_get_phandle(fdt, name);
> +    qemu_fdt_setprop_cells(mc->fdt, name, "reg",
> +        0x0, memmap[VIRT_TEST].base, 0x0, memmap[VIRT_TEST].size);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "phandle", test_phandle);
> +    test_phandle = qemu_fdt_get_phandle(mc->fdt, name);
>      g_free(name);
>
>      name = g_strdup_printf("/soc/reboot");
> -    qemu_fdt_add_subnode(fdt, name);
> -    qemu_fdt_setprop_string(fdt, name, "compatible", "syscon-reboot");
> -    qemu_fdt_setprop_cell(fdt, name, "regmap", test_phandle);
> -    qemu_fdt_setprop_cell(fdt, name, "offset", 0x0);
> -    qemu_fdt_setprop_cell(fdt, name, "value", FINISHER_RESET);
> +    qemu_fdt_add_subnode(mc->fdt, name);
> +    qemu_fdt_setprop_string(mc->fdt, name, "compatible", "syscon-reboot");
> +    qemu_fdt_setprop_cell(mc->fdt, name, "regmap", test_phandle);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "offset", 0x0);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "value", FINISHER_RESET);
>      g_free(name);
>
>      name = g_strdup_printf("/soc/poweroff");
> -    qemu_fdt_add_subnode(fdt, name);
> -    qemu_fdt_setprop_string(fdt, name, "compatible", "syscon-poweroff");
> -    qemu_fdt_setprop_cell(fdt, name, "regmap", test_phandle);
> -    qemu_fdt_setprop_cell(fdt, name, "offset", 0x0);
> -    qemu_fdt_setprop_cell(fdt, name, "value", FINISHER_PASS);
> +    qemu_fdt_add_subnode(mc->fdt, name);
> +    qemu_fdt_setprop_string(mc->fdt, name, "compatible", "syscon-poweroff");
> +    qemu_fdt_setprop_cell(mc->fdt, name, "regmap", test_phandle);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "offset", 0x0);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "value", FINISHER_PASS);
>      g_free(name);
> +}
> +
> +static void create_fdt_uart(RISCVVirtState *s, const MemMapEntry *memmap,
> +                            uint32_t irq_mmio_phandle)
> +{
> +    char *name;
> +    MachineState *mc = MACHINE(s);
>
>      name = g_strdup_printf("/soc/uart@%lx", (long)memmap[VIRT_UART0].base);
> -    qemu_fdt_add_subnode(fdt, name);
> -    qemu_fdt_setprop_string(fdt, name, "compatible", "ns16550a");
> -    qemu_fdt_setprop_cells(fdt, name, "reg",
> +    qemu_fdt_add_subnode(mc->fdt, name);
> +    qemu_fdt_setprop_string(mc->fdt, name, "compatible", "ns16550a");
> +    qemu_fdt_setprop_cells(mc->fdt, name, "reg",
>          0x0, memmap[VIRT_UART0].base,
>          0x0, memmap[VIRT_UART0].size);
> -    qemu_fdt_setprop_cell(fdt, name, "clock-frequency", 3686400);
> -    qemu_fdt_setprop_cell(fdt, name, "interrupt-parent", plic_mmio_phandle);
> -    qemu_fdt_setprop_cell(fdt, name, "interrupts", UART0_IRQ);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "clock-frequency", 3686400);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "interrupt-parent", irq_mmio_phandle);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "interrupts", UART0_IRQ);
>
> -    qemu_fdt_add_subnode(fdt, "/chosen");
> -    qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", name);
> +    qemu_fdt_add_subnode(mc->fdt, "/chosen");
> +    qemu_fdt_setprop_string(mc->fdt, "/chosen", "stdout-path", name);
>      g_free(name);
> +}
> +
> +static void create_fdt_rtc(RISCVVirtState *s, const MemMapEntry *memmap,
> +                           uint32_t irq_mmio_phandle)
> +{
> +    char *name;
> +    MachineState *mc = MACHINE(s);
>
>      name = g_strdup_printf("/soc/rtc@%lx", (long)memmap[VIRT_RTC].base);
> -    qemu_fdt_add_subnode(fdt, name);
> -    qemu_fdt_setprop_string(fdt, name, "compatible", "google,goldfish-rtc");
> -    qemu_fdt_setprop_cells(fdt, name, "reg",
> -        0x0, memmap[VIRT_RTC].base,
> -        0x0, memmap[VIRT_RTC].size);
> -    qemu_fdt_setprop_cell(fdt, name, "interrupt-parent", plic_mmio_phandle);
> -    qemu_fdt_setprop_cell(fdt, name, "interrupts", RTC_IRQ);
> +    qemu_fdt_add_subnode(mc->fdt, name);
> +    qemu_fdt_setprop_string(mc->fdt, name, "compatible",
> +        "google,goldfish-rtc");
> +    qemu_fdt_setprop_cells(mc->fdt, name, "reg",
> +        0x0, memmap[VIRT_RTC].base, 0x0, memmap[VIRT_RTC].size);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "interrupt-parent",
> +        irq_mmio_phandle);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "interrupts", RTC_IRQ);
>      g_free(name);
> +}
> +
> +static void create_fdt_flash(RISCVVirtState *s, const MemMapEntry *memmap)
> +{
> +    char *name;
> +    MachineState *mc = MACHINE(s);
> +    hwaddr flashsize = virt_memmap[VIRT_FLASH].size / 2;
> +    hwaddr flashbase = virt_memmap[VIRT_FLASH].base;
>
>      name = g_strdup_printf("/soc/flash@%" PRIx64, flashbase);
>      qemu_fdt_add_subnode(mc->fdt, name);
> @@ -453,10 +530,59 @@ static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap,
>                                   2, flashbase + flashsize, 2, flashsize);
>      qemu_fdt_setprop_cell(mc->fdt, name, "bank-width", 4);
>      g_free(name);
> +}
> +
> +static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap,
> +                       uint64_t mem_size, const char *cmdline, bool is_32_bit)
> +{
> +    MachineState *mc = MACHINE(s);
> +    uint32_t phandle = 1, irq_mmio_phandle = 1;
> +    uint32_t irq_pcie_phandle = 1, irq_virtio_phandle = 1;
> +
> +    if (mc->dtb) {
> +        mc->fdt = load_device_tree(mc->dtb, &s->fdt_size);
> +        if (!mc->fdt) {
> +            error_report("load_device_tree() failed");
> +            exit(1);
> +        }
> +        goto update_bootargs;
> +    } else {
> +        mc->fdt = create_device_tree(&s->fdt_size);
> +        if (!mc->fdt) {
> +            error_report("create_device_tree() failed");
> +            exit(1);
> +        }
> +    }
> +
> +    qemu_fdt_setprop_string(mc->fdt, "/", "model", "riscv-virtio,qemu");
> +    qemu_fdt_setprop_string(mc->fdt, "/", "compatible", "riscv-virtio");
> +    qemu_fdt_setprop_cell(mc->fdt, "/", "#size-cells", 0x2);
> +    qemu_fdt_setprop_cell(mc->fdt, "/", "#address-cells", 0x2);
> +
> +    qemu_fdt_add_subnode(mc->fdt, "/soc");
> +    qemu_fdt_setprop(mc->fdt, "/soc", "ranges", NULL, 0);
> +    qemu_fdt_setprop_string(mc->fdt, "/soc", "compatible", "simple-bus");
> +    qemu_fdt_setprop_cell(mc->fdt, "/soc", "#size-cells", 0x2);
> +    qemu_fdt_setprop_cell(mc->fdt, "/soc", "#address-cells", 0x2);
> +
> +    create_fdt_sockets(s, memmap, is_32_bit, &phandle,
> +        &irq_mmio_phandle, &irq_pcie_phandle, &irq_virtio_phandle);
> +
> +    create_fdt_virtio(s, memmap, irq_virtio_phandle);
> +
> +    create_fdt_pcie(s, memmap, irq_pcie_phandle);
> +
> +    create_fdt_reset(s, memmap, &phandle);
> +
> +    create_fdt_uart(s, memmap, irq_mmio_phandle);
> +
> +    create_fdt_rtc(s, memmap, irq_mmio_phandle);
> +
> +    create_fdt_flash(s, memmap);
>
>  update_bootargs:
>      if (cmdline) {
> -        qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline);
> +        qemu_fdt_setprop_string(mc->fdt, "/chosen", "bootargs", cmdline);
>      }
>  }

Regards,
Bin


WARNING: multiple messages have this Message-ID (diff)
From: Bin Meng <bmeng.cn@gmail.com>
To: Anup Patel <anup.patel@wdc.com>
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Palmer Dabbelt <palmer@dabbelt.com>,
	 Alistair Francis <Alistair.Francis@wdc.com>,
	Sagar Karandikar <sagark@eecs.berkeley.edu>,
	 Atish Patra <atish.patra@wdc.com>,
	"open list:RISC-V" <qemu-riscv@nongnu.org>,
	 "qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>,
	Anup Patel <anup@brainfault.org>
Subject: Re: [PATCH v1 2/3] hw/riscv: virt: Re-factor FDT generation
Date: Mon, 14 Jun 2021 20:22:33 +0800	[thread overview]
Message-ID: <CAEUhbmWmFuyLVd95-Jgwqr022N82iBKfXxqvczc8i0C2SWrBuQ@mail.gmail.com> (raw)
In-Reply-To: <20210612160615.330768-3-anup.patel@wdc.com>

On Sun, Jun 13, 2021 at 12:12 AM Anup Patel <anup.patel@wdc.com> wrote:
>
> We re-factor and break the FDT generation into smaller functions
> so that it is easier to modify FDT generation for different
> configurations of virt machine.
>
> Signed-off-by: Anup Patel <anup.patel@wdc.com>
> ---
>  hw/riscv/virt.c | 514 ++++++++++++++++++++++++++++++------------------
>  1 file changed, 320 insertions(+), 194 deletions(-)
>
> diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> index 5eb63f6efd..977d699753 100644
> --- a/hw/riscv/virt.c
> +++ b/hw/riscv/virt.c
> @@ -178,206 +178,253 @@ static void create_pcie_irq_map(void *fdt, char *nodename,
>                             0x1800, 0, 0, 0x7);
>  }
>
> -static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap,
> -                       uint64_t mem_size, const char *cmdline, bool is_32_bit)
> +static void create_fdt_socket_cpus(RISCVVirtState *s, int socket,
> +                                   char *clust_name, uint32_t *phandle,
> +                                   bool is_32_bit, uint32_t *intc_phandles)
>  {
> -    void *fdt;
> -    int i, cpu, socket;
> +    int cpu;
> +    uint32_t cpu_phandle;
>      MachineState *mc = MACHINE(s);
> +    char *name, *cpu_name, *core_name, *intc_name;
> +
> +    for (cpu = s->soc[socket].num_harts - 1; cpu >= 0; cpu--) {
> +        cpu_phandle = (*phandle)++;
> +
> +        cpu_name = g_strdup_printf("/cpus/cpu@%d",
> +            s->soc[socket].hartid_base + cpu);
> +        qemu_fdt_add_subnode(mc->fdt, cpu_name);
> +        qemu_fdt_setprop_string(mc->fdt, cpu_name, "mmu-type",
> +            (is_32_bit) ? "riscv,sv32" : "riscv,sv48");
> +        name = riscv_isa_string(&s->soc[socket].harts[cpu]);
> +        qemu_fdt_setprop_string(mc->fdt, cpu_name, "riscv,isa", name);
> +        g_free(name);
> +        qemu_fdt_setprop_string(mc->fdt, cpu_name, "compatible", "riscv");
> +        qemu_fdt_setprop_string(mc->fdt, cpu_name, "status", "okay");
> +        qemu_fdt_setprop_cell(mc->fdt, cpu_name, "reg",
> +            s->soc[socket].hartid_base + cpu);
> +        qemu_fdt_setprop_string(mc->fdt, cpu_name, "device_type", "cpu");
> +        riscv_socket_fdt_write_id(mc, mc->fdt, cpu_name, socket);
> +        qemu_fdt_setprop_cell(mc->fdt, cpu_name, "phandle", cpu_phandle);
> +
> +        intc_phandles[cpu] = (*phandle)++;
> +
> +        intc_name = g_strdup_printf("%s/interrupt-controller", cpu_name);
> +        qemu_fdt_add_subnode(mc->fdt, intc_name);
> +        qemu_fdt_setprop_cell(mc->fdt, intc_name, "phandle",
> +            intc_phandles[cpu]);
> +        qemu_fdt_setprop_string(mc->fdt, intc_name, "compatible",
> +            "riscv,cpu-intc");
> +        qemu_fdt_setprop(mc->fdt, intc_name, "interrupt-controller", NULL, 0);
> +        qemu_fdt_setprop_cell(mc->fdt, intc_name, "#interrupt-cells", 1);
> +
> +        core_name = g_strdup_printf("%s/core%d", clust_name, cpu);
> +        qemu_fdt_add_subnode(mc->fdt, core_name);
> +        qemu_fdt_setprop_cell(mc->fdt, core_name, "cpu", cpu_phandle);
> +
> +        g_free(core_name);
> +        g_free(intc_name);
> +        g_free(cpu_name);
> +    }
> +}
> +
> +static void create_fdt_socket_memory(RISCVVirtState *s,
> +                                     const MemMapEntry *memmap, int socket)
> +{
> +    char *mem_name;
>      uint64_t addr, size;
> -    uint32_t *clint_cells, *plic_cells;
> -    unsigned long clint_addr, plic_addr;
> -    uint32_t plic_phandle[MAX_NODES];
> -    uint32_t cpu_phandle, intc_phandle, test_phandle;
> -    uint32_t phandle = 1, plic_mmio_phandle = 1;
> -    uint32_t plic_pcie_phandle = 1, plic_virtio_phandle = 1;
> -    char *mem_name, *cpu_name, *core_name, *intc_name;
> -    char *name, *clint_name, *plic_name, *clust_name;
> -    hwaddr flashsize = virt_memmap[VIRT_FLASH].size / 2;
> -    hwaddr flashbase = virt_memmap[VIRT_FLASH].base;
> +    MachineState *mc = MACHINE(s);
>
> -    if (mc->dtb) {
> -        fdt = mc->fdt = load_device_tree(mc->dtb, &s->fdt_size);
> -        if (!fdt) {
> -            error_report("load_device_tree() failed");
> -            exit(1);
> -        }
> -        goto update_bootargs;
> -    } else {
> -        fdt = mc->fdt = create_device_tree(&s->fdt_size);
> -        if (!fdt) {
> -            error_report("create_device_tree() failed");
> -            exit(1);
> -        }
> +    addr = memmap[VIRT_DRAM].base + riscv_socket_mem_offset(mc, socket);
> +    size = riscv_socket_mem_size(mc, socket);
> +    mem_name = g_strdup_printf("/memory@%lx", (long)addr);
> +    qemu_fdt_add_subnode(mc->fdt, mem_name);
> +    qemu_fdt_setprop_cells(mc->fdt, mem_name, "reg",
> +        addr >> 32, addr, size >> 32, size);
> +    qemu_fdt_setprop_string(mc->fdt, mem_name, "device_type", "memory");
> +    riscv_socket_fdt_write_id(mc, mc->fdt, mem_name, socket);
> +    g_free(mem_name);
> +}
> +
> +static void create_fdt_socket_clint(RISCVVirtState *s,
> +                                    const MemMapEntry *memmap, int socket,
> +                                    uint32_t *intc_phandles)
> +{
> +    int cpu;
> +    char *clint_name;
> +    uint32_t *clint_cells;
> +    unsigned long clint_addr;
> +    MachineState *mc = MACHINE(s);
> +
> +    clint_cells = g_new0(uint32_t, s->soc[socket].num_harts * 4);
> +
> +    for (cpu = 0; cpu < s->soc[socket].num_harts; cpu++) {
> +        clint_cells[cpu * 4 + 0] = cpu_to_be32(intc_phandles[cpu]);
> +        clint_cells[cpu * 4 + 1] = cpu_to_be32(IRQ_M_SOFT);
> +        clint_cells[cpu * 4 + 2] = cpu_to_be32(intc_phandles[cpu]);
> +        clint_cells[cpu * 4 + 3] = cpu_to_be32(IRQ_M_TIMER);
>      }
>
> -    qemu_fdt_setprop_string(fdt, "/", "model", "riscv-virtio,qemu");
> -    qemu_fdt_setprop_string(fdt, "/", "compatible", "riscv-virtio");
> -    qemu_fdt_setprop_cell(fdt, "/", "#size-cells", 0x2);
> -    qemu_fdt_setprop_cell(fdt, "/", "#address-cells", 0x2);
> +    clint_addr = memmap[VIRT_CLINT].base + (memmap[VIRT_CLINT].size * socket);
> +    clint_name = g_strdup_printf("/soc/clint@%lx", clint_addr);
> +    qemu_fdt_add_subnode(mc->fdt, clint_name);
> +    qemu_fdt_setprop_string(mc->fdt, clint_name, "compatible",
> +        "riscv,clint0");

This patch seems to be based on some old commit, as the latest QEMU
head has the following commit that supports the official clint
compatible name via:

commit b387236bff95 ("hw/riscv: Support the official CLINT DT bindings")

> +    qemu_fdt_setprop_cells(mc->fdt, clint_name, "reg",
> +        0x0, clint_addr, 0x0, memmap[VIRT_CLINT].size);
> +    qemu_fdt_setprop(mc->fdt, clint_name, "interrupts-extended",
> +        clint_cells, s->soc[socket].num_harts * sizeof(uint32_t) * 4);
> +    riscv_socket_fdt_write_id(mc, mc->fdt, clint_name, socket);
> +    g_free(clint_name);
> +
> +    g_free(clint_cells);
> +}
> +
> +static void create_fdt_socket_plic(RISCVVirtState *s,
> +                                   const MemMapEntry *memmap, int socket,
> +                                   uint32_t *phandle, uint32_t *intc_phandles,
> +                                   uint32_t *plic_phandles)
> +{
> +    int cpu;
> +    char *plic_name;
> +    uint32_t *plic_cells;
> +    unsigned long plic_addr;
> +    MachineState *mc = MACHINE(s);
>
> -    qemu_fdt_add_subnode(fdt, "/soc");
> -    qemu_fdt_setprop(fdt, "/soc", "ranges", NULL, 0);
> -    qemu_fdt_setprop_string(fdt, "/soc", "compatible", "simple-bus");
> -    qemu_fdt_setprop_cell(fdt, "/soc", "#size-cells", 0x2);
> -    qemu_fdt_setprop_cell(fdt, "/soc", "#address-cells", 0x2);
> +    plic_cells = g_new0(uint32_t, s->soc[socket].num_harts * 4);
>
> -    qemu_fdt_add_subnode(fdt, "/cpus");
> -    qemu_fdt_setprop_cell(fdt, "/cpus", "timebase-frequency",
> +    for (cpu = 0; cpu < s->soc[socket].num_harts; cpu++) {
> +        plic_cells[cpu * 4 + 0] = cpu_to_be32(intc_phandles[cpu]);
> +        plic_cells[cpu * 4 + 1] = cpu_to_be32(IRQ_M_EXT);
> +        plic_cells[cpu * 4 + 2] = cpu_to_be32(intc_phandles[cpu]);
> +        plic_cells[cpu * 4 + 3] = cpu_to_be32(IRQ_S_EXT);
> +    }
> +
> +    plic_phandles[socket] = (*phandle)++;
> +    plic_addr = memmap[VIRT_PLIC].base + (memmap[VIRT_PLIC].size * socket);
> +    plic_name = g_strdup_printf("/soc/plic@%lx", plic_addr);
> +    qemu_fdt_add_subnode(mc->fdt, plic_name);
> +    qemu_fdt_setprop_cell(mc->fdt, plic_name,
> +        "#address-cells", FDT_PLIC_ADDR_CELLS);
> +    qemu_fdt_setprop_cell(mc->fdt, plic_name,
> +        "#interrupt-cells", FDT_PLIC_INT_CELLS);
> +    qemu_fdt_setprop_string(mc->fdt, plic_name, "compatible", "riscv,plic0");
> +    qemu_fdt_setprop(mc->fdt, plic_name, "interrupt-controller", NULL, 0);
> +    qemu_fdt_setprop(mc->fdt, plic_name, "interrupts-extended",
> +        plic_cells, s->soc[socket].num_harts * sizeof(uint32_t) * 4);
> +    qemu_fdt_setprop_cells(mc->fdt, plic_name, "reg",
> +        0x0, plic_addr, 0x0, memmap[VIRT_PLIC].size);
> +    qemu_fdt_setprop_cell(mc->fdt, plic_name, "riscv,ndev", VIRTIO_NDEV);
> +    riscv_socket_fdt_write_id(mc, mc->fdt, plic_name, socket);
> +    qemu_fdt_setprop_cell(mc->fdt, plic_name, "phandle",
> +        plic_phandles[socket]);
> +    g_free(plic_name);
> +
> +    g_free(plic_cells);
> +}
> +
> +static void create_fdt_sockets(RISCVVirtState *s, const MemMapEntry *memmap,
> +                               bool is_32_bit, uint32_t *phandle,
> +                               uint32_t *irq_mmio_phandle,
> +                               uint32_t *irq_pcie_phandle,
> +                               uint32_t *irq_virtio_phandle)
> +{
> +    int socket;
> +    char *clust_name;
> +    uint32_t *intc_phandles;
> +    MachineState *mc = MACHINE(s);
> +    uint32_t xplic_phandles[MAX_NODES];
> +
> +    qemu_fdt_add_subnode(mc->fdt, "/cpus");
> +    qemu_fdt_setprop_cell(mc->fdt, "/cpus", "timebase-frequency",
>                            RISCV_ACLINT_TIMEBASE_FREQ);
> -    qemu_fdt_setprop_cell(fdt, "/cpus", "#size-cells", 0x0);
> -    qemu_fdt_setprop_cell(fdt, "/cpus", "#address-cells", 0x1);
> -    qemu_fdt_add_subnode(fdt, "/cpus/cpu-map");
> +    qemu_fdt_setprop_cell(mc->fdt, "/cpus", "#size-cells", 0x0);
> +    qemu_fdt_setprop_cell(mc->fdt, "/cpus", "#address-cells", 0x1);
> +    qemu_fdt_add_subnode(mc->fdt, "/cpus/cpu-map");
>
>      for (socket = (riscv_socket_count(mc) - 1); socket >= 0; socket--) {
>          clust_name = g_strdup_printf("/cpus/cpu-map/cluster%d", socket);
> -        qemu_fdt_add_subnode(fdt, clust_name);
> +        qemu_fdt_add_subnode(mc->fdt, clust_name);
>
> -        plic_cells = g_new0(uint32_t, s->soc[socket].num_harts * 4);
> -        clint_cells = g_new0(uint32_t, s->soc[socket].num_harts * 4);
> +        intc_phandles = g_new0(uint32_t, s->soc[socket].num_harts);
>
> -        for (cpu = s->soc[socket].num_harts - 1; cpu >= 0; cpu--) {
> -            cpu_phandle = phandle++;
> +        create_fdt_socket_cpus(s, socket, clust_name, phandle,
> +            is_32_bit, intc_phandles);
>
> -            cpu_name = g_strdup_printf("/cpus/cpu@%d",
> -                s->soc[socket].hartid_base + cpu);
> -            qemu_fdt_add_subnode(fdt, cpu_name);
> -            if (is_32_bit) {
> -                qemu_fdt_setprop_string(fdt, cpu_name, "mmu-type", "riscv,sv32");
> -            } else {
> -                qemu_fdt_setprop_string(fdt, cpu_name, "mmu-type", "riscv,sv48");
> -            }
> -            name = riscv_isa_string(&s->soc[socket].harts[cpu]);
> -            qemu_fdt_setprop_string(fdt, cpu_name, "riscv,isa", name);
> -            g_free(name);
> -            qemu_fdt_setprop_string(fdt, cpu_name, "compatible", "riscv");
> -            qemu_fdt_setprop_string(fdt, cpu_name, "status", "okay");
> -            qemu_fdt_setprop_cell(fdt, cpu_name, "reg",
> -                s->soc[socket].hartid_base + cpu);
> -            qemu_fdt_setprop_string(fdt, cpu_name, "device_type", "cpu");
> -            riscv_socket_fdt_write_id(mc, fdt, cpu_name, socket);
> -            qemu_fdt_setprop_cell(fdt, cpu_name, "phandle", cpu_phandle);
> -
> -            intc_name = g_strdup_printf("%s/interrupt-controller", cpu_name);
> -            qemu_fdt_add_subnode(fdt, intc_name);
> -            intc_phandle = phandle++;
> -            qemu_fdt_setprop_cell(fdt, intc_name, "phandle", intc_phandle);
> -            qemu_fdt_setprop_string(fdt, intc_name, "compatible",
> -                "riscv,cpu-intc");
> -            qemu_fdt_setprop(fdt, intc_name, "interrupt-controller", NULL, 0);
> -            qemu_fdt_setprop_cell(fdt, intc_name, "#interrupt-cells", 1);
> -
> -            clint_cells[cpu * 4 + 0] = cpu_to_be32(intc_phandle);
> -            clint_cells[cpu * 4 + 1] = cpu_to_be32(IRQ_M_SOFT);
> -            clint_cells[cpu * 4 + 2] = cpu_to_be32(intc_phandle);
> -            clint_cells[cpu * 4 + 3] = cpu_to_be32(IRQ_M_TIMER);
> -
> -            plic_cells[cpu * 4 + 0] = cpu_to_be32(intc_phandle);
> -            plic_cells[cpu * 4 + 1] = cpu_to_be32(IRQ_M_EXT);
> -            plic_cells[cpu * 4 + 2] = cpu_to_be32(intc_phandle);
> -            plic_cells[cpu * 4 + 3] = cpu_to_be32(IRQ_S_EXT);
> -
> -            core_name = g_strdup_printf("%s/core%d", clust_name, cpu);
> -            qemu_fdt_add_subnode(fdt, core_name);
> -            qemu_fdt_setprop_cell(fdt, core_name, "cpu", cpu_phandle);
> -
> -            g_free(core_name);
> -            g_free(intc_name);
> -            g_free(cpu_name);
> -        }
> +        create_fdt_socket_memory(s, memmap, socket);
>
> -        addr = memmap[VIRT_DRAM].base + riscv_socket_mem_offset(mc, socket);
> -        size = riscv_socket_mem_size(mc, socket);
> -        mem_name = g_strdup_printf("/memory@%lx", (long)addr);
> -        qemu_fdt_add_subnode(fdt, mem_name);
> -        qemu_fdt_setprop_cells(fdt, mem_name, "reg",
> -            addr >> 32, addr, size >> 32, size);
> -        qemu_fdt_setprop_string(fdt, mem_name, "device_type", "memory");
> -        riscv_socket_fdt_write_id(mc, fdt, mem_name, socket);
> -        g_free(mem_name);
> -
> -        clint_addr = memmap[VIRT_CLINT].base +
> -            (memmap[VIRT_CLINT].size * socket);
> -        clint_name = g_strdup_printf("/soc/clint@%lx", clint_addr);
> -        qemu_fdt_add_subnode(fdt, clint_name);
> -        qemu_fdt_setprop_string(fdt, clint_name, "compatible", "riscv,clint0");
> -        qemu_fdt_setprop_cells(fdt, clint_name, "reg",
> -            0x0, clint_addr, 0x0, memmap[VIRT_CLINT].size);
> -        qemu_fdt_setprop(fdt, clint_name, "interrupts-extended",
> -            clint_cells, s->soc[socket].num_harts * sizeof(uint32_t) * 4);
> -        riscv_socket_fdt_write_id(mc, fdt, clint_name, socket);
> -        g_free(clint_name);
> -
> -        plic_phandle[socket] = phandle++;
> -        plic_addr = memmap[VIRT_PLIC].base + (memmap[VIRT_PLIC].size * socket);
> -        plic_name = g_strdup_printf("/soc/plic@%lx", plic_addr);
> -        qemu_fdt_add_subnode(fdt, plic_name);
> -        qemu_fdt_setprop_cell(fdt, plic_name,
> -            "#address-cells", FDT_PLIC_ADDR_CELLS);
> -        qemu_fdt_setprop_cell(fdt, plic_name,
> -            "#interrupt-cells", FDT_PLIC_INT_CELLS);
> -        qemu_fdt_setprop_string(fdt, plic_name, "compatible", "riscv,plic0");
> -        qemu_fdt_setprop(fdt, plic_name, "interrupt-controller", NULL, 0);
> -        qemu_fdt_setprop(fdt, plic_name, "interrupts-extended",
> -            plic_cells, s->soc[socket].num_harts * sizeof(uint32_t) * 4);
> -        qemu_fdt_setprop_cells(fdt, plic_name, "reg",
> -            0x0, plic_addr, 0x0, memmap[VIRT_PLIC].size);
> -        qemu_fdt_setprop_cell(fdt, plic_name, "riscv,ndev", VIRTIO_NDEV);
> -        riscv_socket_fdt_write_id(mc, fdt, plic_name, socket);
> -        qemu_fdt_setprop_cell(fdt, plic_name, "phandle", plic_phandle[socket]);
> -        g_free(plic_name);
> -
> -        g_free(clint_cells);
> -        g_free(plic_cells);
> +        create_fdt_socket_clint(s, memmap, socket, intc_phandles);
> +
> +        create_fdt_socket_plic(s, memmap, socket, phandle,
> +            intc_phandles, xplic_phandles);
> +
> +        g_free(intc_phandles);
>          g_free(clust_name);
>      }
>
>      for (socket = 0; socket < riscv_socket_count(mc); socket++) {
>          if (socket == 0) {
> -            plic_mmio_phandle = plic_phandle[socket];
> -            plic_virtio_phandle = plic_phandle[socket];
> -            plic_pcie_phandle = plic_phandle[socket];
> +            *irq_mmio_phandle = xplic_phandles[socket];
> +            *irq_virtio_phandle = xplic_phandles[socket];
> +            *irq_pcie_phandle = xplic_phandles[socket];
>          }
>          if (socket == 1) {
> -            plic_virtio_phandle = plic_phandle[socket];
> -            plic_pcie_phandle = plic_phandle[socket];
> +            *irq_virtio_phandle = xplic_phandles[socket];
> +            *irq_pcie_phandle = xplic_phandles[socket];
>          }
>          if (socket == 2) {
> -            plic_pcie_phandle = plic_phandle[socket];
> +            *irq_pcie_phandle = xplic_phandles[socket];
>          }
>      }
>
> -    riscv_socket_fdt_write_distance_matrix(mc, fdt);
> +    riscv_socket_fdt_write_distance_matrix(mc, mc->fdt);
> +}
> +
> +static void create_fdt_virtio(RISCVVirtState *s, const MemMapEntry *memmap,
> +                              uint32_t irq_virtio_phandle)
> +{
> +    int i;
> +    char *name;
> +    MachineState *mc = MACHINE(s);
>
>      for (i = 0; i < VIRTIO_COUNT; i++) {
>          name = g_strdup_printf("/soc/virtio_mmio@%lx",
>              (long)(memmap[VIRT_VIRTIO].base + i * memmap[VIRT_VIRTIO].size));
> -        qemu_fdt_add_subnode(fdt, name);
> -        qemu_fdt_setprop_string(fdt, name, "compatible", "virtio,mmio");
> -        qemu_fdt_setprop_cells(fdt, name, "reg",
> +        qemu_fdt_add_subnode(mc->fdt, name);
> +        qemu_fdt_setprop_string(mc->fdt, name, "compatible", "virtio,mmio");
> +        qemu_fdt_setprop_cells(mc->fdt, name, "reg",
>              0x0, memmap[VIRT_VIRTIO].base + i * memmap[VIRT_VIRTIO].size,
>              0x0, memmap[VIRT_VIRTIO].size);
> -        qemu_fdt_setprop_cell(fdt, name, "interrupt-parent",
> -            plic_virtio_phandle);
> -        qemu_fdt_setprop_cell(fdt, name, "interrupts", VIRTIO_IRQ + i);
> +        qemu_fdt_setprop_cell(mc->fdt, name, "interrupt-parent",
> +            irq_virtio_phandle);
> +        qemu_fdt_setprop_cell(mc->fdt, name, "interrupts", VIRTIO_IRQ + i);
>          g_free(name);
>      }
> +}
> +
> +static void create_fdt_pcie(RISCVVirtState *s, const MemMapEntry *memmap,
> +                            uint32_t irq_pcie_phandle)
> +{
> +    char *name;
> +    MachineState *mc = MACHINE(s);
>
>      name = g_strdup_printf("/soc/pci@%lx",
>          (long) memmap[VIRT_PCIE_ECAM].base);
> -    qemu_fdt_add_subnode(fdt, name);
> -    qemu_fdt_setprop_cell(fdt, name, "#address-cells", FDT_PCI_ADDR_CELLS);
> -    qemu_fdt_setprop_cell(fdt, name, "#interrupt-cells", FDT_PCI_INT_CELLS);
> -    qemu_fdt_setprop_cell(fdt, name, "#size-cells", 0x2);
> -    qemu_fdt_setprop_string(fdt, name, "compatible", "pci-host-ecam-generic");
> -    qemu_fdt_setprop_string(fdt, name, "device_type", "pci");
> -    qemu_fdt_setprop_cell(fdt, name, "linux,pci-domain", 0);
> -    qemu_fdt_setprop_cells(fdt, name, "bus-range", 0,
> +    qemu_fdt_add_subnode(mc->fdt, name);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "#address-cells",
> +        FDT_PCI_ADDR_CELLS);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "#interrupt-cells",
> +        FDT_PCI_INT_CELLS);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "#size-cells", 0x2);
> +    qemu_fdt_setprop_string(mc->fdt, name, "compatible",
> +        "pci-host-ecam-generic");
> +    qemu_fdt_setprop_string(mc->fdt, name, "device_type", "pci");
> +    qemu_fdt_setprop_cell(mc->fdt, name, "linux,pci-domain", 0);
> +    qemu_fdt_setprop_cells(mc->fdt, name, "bus-range", 0,
>          memmap[VIRT_PCIE_ECAM].size / PCIE_MMCFG_SIZE_MIN - 1);
> -    qemu_fdt_setprop(fdt, name, "dma-coherent", NULL, 0);
> -    qemu_fdt_setprop_cells(fdt, name, "reg", 0,
> +    qemu_fdt_setprop(mc->fdt, name, "dma-coherent", NULL, 0);
> +    qemu_fdt_setprop_cells(mc->fdt, name, "reg", 0,
>          memmap[VIRT_PCIE_ECAM].base, 0, memmap[VIRT_PCIE_ECAM].size);
> -    qemu_fdt_setprop_sized_cells(fdt, name, "ranges",
> +    qemu_fdt_setprop_sized_cells(mc->fdt, name, "ranges",
>          1, FDT_PCI_RANGE_IOPORT, 2, 0,
>          2, memmap[VIRT_PCIE_PIO].base, 2, memmap[VIRT_PCIE_PIO].size,
>          1, FDT_PCI_RANGE_MMIO,
> @@ -387,63 +434,93 @@ static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap,
>          2, virt_high_pcie_memmap.base,
>          2, virt_high_pcie_memmap.base, 2, virt_high_pcie_memmap.size);
>
> -    create_pcie_irq_map(fdt, name, plic_pcie_phandle);
> +    create_pcie_irq_map(mc->fdt, name, irq_pcie_phandle);
>      g_free(name);
> +}
> +
> +static void create_fdt_reset(RISCVVirtState *s, const MemMapEntry *memmap,
> +                             uint32_t *phandle)
> +{
> +    char *name;
> +    uint32_t test_phandle;
> +    MachineState *mc = MACHINE(s);
>
> -    test_phandle = phandle++;
> +    test_phandle = (*phandle)++;
>      name = g_strdup_printf("/soc/test@%lx",
>          (long)memmap[VIRT_TEST].base);
> -    qemu_fdt_add_subnode(fdt, name);
> +    qemu_fdt_add_subnode(mc->fdt, name);
>      {
>          const char compat[] = "sifive,test1\0sifive,test0\0syscon";
> -        qemu_fdt_setprop(fdt, name, "compatible", compat, sizeof(compat));
> +        qemu_fdt_setprop(mc->fdt, name, "compatible", compat, sizeof(compat));
>      }
> -    qemu_fdt_setprop_cells(fdt, name, "reg",
> -        0x0, memmap[VIRT_TEST].base,
> -        0x0, memmap[VIRT_TEST].size);
> -    qemu_fdt_setprop_cell(fdt, name, "phandle", test_phandle);
> -    test_phandle = qemu_fdt_get_phandle(fdt, name);
> +    qemu_fdt_setprop_cells(mc->fdt, name, "reg",
> +        0x0, memmap[VIRT_TEST].base, 0x0, memmap[VIRT_TEST].size);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "phandle", test_phandle);
> +    test_phandle = qemu_fdt_get_phandle(mc->fdt, name);
>      g_free(name);
>
>      name = g_strdup_printf("/soc/reboot");
> -    qemu_fdt_add_subnode(fdt, name);
> -    qemu_fdt_setprop_string(fdt, name, "compatible", "syscon-reboot");
> -    qemu_fdt_setprop_cell(fdt, name, "regmap", test_phandle);
> -    qemu_fdt_setprop_cell(fdt, name, "offset", 0x0);
> -    qemu_fdt_setprop_cell(fdt, name, "value", FINISHER_RESET);
> +    qemu_fdt_add_subnode(mc->fdt, name);
> +    qemu_fdt_setprop_string(mc->fdt, name, "compatible", "syscon-reboot");
> +    qemu_fdt_setprop_cell(mc->fdt, name, "regmap", test_phandle);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "offset", 0x0);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "value", FINISHER_RESET);
>      g_free(name);
>
>      name = g_strdup_printf("/soc/poweroff");
> -    qemu_fdt_add_subnode(fdt, name);
> -    qemu_fdt_setprop_string(fdt, name, "compatible", "syscon-poweroff");
> -    qemu_fdt_setprop_cell(fdt, name, "regmap", test_phandle);
> -    qemu_fdt_setprop_cell(fdt, name, "offset", 0x0);
> -    qemu_fdt_setprop_cell(fdt, name, "value", FINISHER_PASS);
> +    qemu_fdt_add_subnode(mc->fdt, name);
> +    qemu_fdt_setprop_string(mc->fdt, name, "compatible", "syscon-poweroff");
> +    qemu_fdt_setprop_cell(mc->fdt, name, "regmap", test_phandle);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "offset", 0x0);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "value", FINISHER_PASS);
>      g_free(name);
> +}
> +
> +static void create_fdt_uart(RISCVVirtState *s, const MemMapEntry *memmap,
> +                            uint32_t irq_mmio_phandle)
> +{
> +    char *name;
> +    MachineState *mc = MACHINE(s);
>
>      name = g_strdup_printf("/soc/uart@%lx", (long)memmap[VIRT_UART0].base);
> -    qemu_fdt_add_subnode(fdt, name);
> -    qemu_fdt_setprop_string(fdt, name, "compatible", "ns16550a");
> -    qemu_fdt_setprop_cells(fdt, name, "reg",
> +    qemu_fdt_add_subnode(mc->fdt, name);
> +    qemu_fdt_setprop_string(mc->fdt, name, "compatible", "ns16550a");
> +    qemu_fdt_setprop_cells(mc->fdt, name, "reg",
>          0x0, memmap[VIRT_UART0].base,
>          0x0, memmap[VIRT_UART0].size);
> -    qemu_fdt_setprop_cell(fdt, name, "clock-frequency", 3686400);
> -    qemu_fdt_setprop_cell(fdt, name, "interrupt-parent", plic_mmio_phandle);
> -    qemu_fdt_setprop_cell(fdt, name, "interrupts", UART0_IRQ);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "clock-frequency", 3686400);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "interrupt-parent", irq_mmio_phandle);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "interrupts", UART0_IRQ);
>
> -    qemu_fdt_add_subnode(fdt, "/chosen");
> -    qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", name);
> +    qemu_fdt_add_subnode(mc->fdt, "/chosen");
> +    qemu_fdt_setprop_string(mc->fdt, "/chosen", "stdout-path", name);
>      g_free(name);
> +}
> +
> +static void create_fdt_rtc(RISCVVirtState *s, const MemMapEntry *memmap,
> +                           uint32_t irq_mmio_phandle)
> +{
> +    char *name;
> +    MachineState *mc = MACHINE(s);
>
>      name = g_strdup_printf("/soc/rtc@%lx", (long)memmap[VIRT_RTC].base);
> -    qemu_fdt_add_subnode(fdt, name);
> -    qemu_fdt_setprop_string(fdt, name, "compatible", "google,goldfish-rtc");
> -    qemu_fdt_setprop_cells(fdt, name, "reg",
> -        0x0, memmap[VIRT_RTC].base,
> -        0x0, memmap[VIRT_RTC].size);
> -    qemu_fdt_setprop_cell(fdt, name, "interrupt-parent", plic_mmio_phandle);
> -    qemu_fdt_setprop_cell(fdt, name, "interrupts", RTC_IRQ);
> +    qemu_fdt_add_subnode(mc->fdt, name);
> +    qemu_fdt_setprop_string(mc->fdt, name, "compatible",
> +        "google,goldfish-rtc");
> +    qemu_fdt_setprop_cells(mc->fdt, name, "reg",
> +        0x0, memmap[VIRT_RTC].base, 0x0, memmap[VIRT_RTC].size);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "interrupt-parent",
> +        irq_mmio_phandle);
> +    qemu_fdt_setprop_cell(mc->fdt, name, "interrupts", RTC_IRQ);
>      g_free(name);
> +}
> +
> +static void create_fdt_flash(RISCVVirtState *s, const MemMapEntry *memmap)
> +{
> +    char *name;
> +    MachineState *mc = MACHINE(s);
> +    hwaddr flashsize = virt_memmap[VIRT_FLASH].size / 2;
> +    hwaddr flashbase = virt_memmap[VIRT_FLASH].base;
>
>      name = g_strdup_printf("/soc/flash@%" PRIx64, flashbase);
>      qemu_fdt_add_subnode(mc->fdt, name);
> @@ -453,10 +530,59 @@ static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap,
>                                   2, flashbase + flashsize, 2, flashsize);
>      qemu_fdt_setprop_cell(mc->fdt, name, "bank-width", 4);
>      g_free(name);
> +}
> +
> +static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap,
> +                       uint64_t mem_size, const char *cmdline, bool is_32_bit)
> +{
> +    MachineState *mc = MACHINE(s);
> +    uint32_t phandle = 1, irq_mmio_phandle = 1;
> +    uint32_t irq_pcie_phandle = 1, irq_virtio_phandle = 1;
> +
> +    if (mc->dtb) {
> +        mc->fdt = load_device_tree(mc->dtb, &s->fdt_size);
> +        if (!mc->fdt) {
> +            error_report("load_device_tree() failed");
> +            exit(1);
> +        }
> +        goto update_bootargs;
> +    } else {
> +        mc->fdt = create_device_tree(&s->fdt_size);
> +        if (!mc->fdt) {
> +            error_report("create_device_tree() failed");
> +            exit(1);
> +        }
> +    }
> +
> +    qemu_fdt_setprop_string(mc->fdt, "/", "model", "riscv-virtio,qemu");
> +    qemu_fdt_setprop_string(mc->fdt, "/", "compatible", "riscv-virtio");
> +    qemu_fdt_setprop_cell(mc->fdt, "/", "#size-cells", 0x2);
> +    qemu_fdt_setprop_cell(mc->fdt, "/", "#address-cells", 0x2);
> +
> +    qemu_fdt_add_subnode(mc->fdt, "/soc");
> +    qemu_fdt_setprop(mc->fdt, "/soc", "ranges", NULL, 0);
> +    qemu_fdt_setprop_string(mc->fdt, "/soc", "compatible", "simple-bus");
> +    qemu_fdt_setprop_cell(mc->fdt, "/soc", "#size-cells", 0x2);
> +    qemu_fdt_setprop_cell(mc->fdt, "/soc", "#address-cells", 0x2);
> +
> +    create_fdt_sockets(s, memmap, is_32_bit, &phandle,
> +        &irq_mmio_phandle, &irq_pcie_phandle, &irq_virtio_phandle);
> +
> +    create_fdt_virtio(s, memmap, irq_virtio_phandle);
> +
> +    create_fdt_pcie(s, memmap, irq_pcie_phandle);
> +
> +    create_fdt_reset(s, memmap, &phandle);
> +
> +    create_fdt_uart(s, memmap, irq_mmio_phandle);
> +
> +    create_fdt_rtc(s, memmap, irq_mmio_phandle);
> +
> +    create_fdt_flash(s, memmap);
>
>  update_bootargs:
>      if (cmdline) {
> -        qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline);
> +        qemu_fdt_setprop_string(mc->fdt, "/chosen", "bootargs", cmdline);
>      }
>  }

Regards,
Bin


  reply	other threads:[~2021-06-14 12:25 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-12 16:06 [PATCH v1 0/3] RISC-V ACLINT Support Anup Patel
2021-06-12 16:06 ` Anup Patel
2021-06-12 16:06 ` [PATCH v1 1/3] hw/intc: Upgrade the SiFive CLINT implementation to RISC-V ACLINT Anup Patel
2021-06-12 16:06   ` Anup Patel
2021-06-14 12:22   ` Bin Meng
2021-06-14 12:22     ` Bin Meng
2021-07-12  5:00     ` Anup Patel
2021-07-12  5:00       ` Anup Patel
2021-06-18  6:50   ` Alistair Francis
2021-06-18  6:50     ` Alistair Francis
2021-07-12  5:32     ` Anup Patel
2021-07-12  5:32       ` Anup Patel
2021-06-12 16:06 ` [PATCH v1 2/3] hw/riscv: virt: Re-factor FDT generation Anup Patel
2021-06-12 16:06   ` Anup Patel
2021-06-14 12:22   ` Bin Meng [this message]
2021-06-14 12:22     ` Bin Meng
2021-07-12  5:40     ` Anup Patel
2021-07-12  5:40       ` Anup Patel
2021-06-12 16:06 ` [PATCH v1 3/3] hw/riscv: virt: Add optional ACLINT support to virt machine Anup Patel
2021-06-12 16:06   ` Anup Patel
2021-06-14 12:22   ` Bin Meng
2021-06-14 12:22     ` Bin Meng
2021-07-12  5:38     ` Anup Patel
2021-07-12  5:38       ` Anup Patel
2021-07-12  6:15       ` Bin Meng
2021-07-12  6:15         ` Bin Meng
2021-07-12 10:53         ` Anup Patel
2021-07-12 10:53           ` Anup Patel
2021-07-12 13:11           ` Bin Meng
2021-07-12 13:11             ` Bin Meng
2021-07-12 15:02             ` Anup Patel
2021-07-12 15:02               ` Anup Patel
2021-07-12 23:05               ` Bin Meng
2021-07-12 23:05                 ` Bin Meng

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=CAEUhbmWmFuyLVd95-Jgwqr022N82iBKfXxqvczc8i0C2SWrBuQ@mail.gmail.com \
    --to=bmeng.cn@gmail.com \
    --cc=Alistair.Francis@wdc.com \
    --cc=anup.patel@wdc.com \
    --cc=anup@brainfault.org \
    --cc=atish.patra@wdc.com \
    --cc=palmer@dabbelt.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-riscv@nongnu.org \
    --cc=sagark@eecs.berkeley.edu \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.