[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v1 2/4] hw/riscv: migrate fdt field to generic MachineState
From: |
Alistair Francis |
Subject: |
Re: [PATCH v1 2/4] hw/riscv: migrate fdt field to generic MachineState |
Date: |
Fri, 23 Oct 2020 08:35:43 -0700 |
On Wed, Oct 21, 2020 at 10:13 AM Alex Bennée <alex.bennee@linaro.org> wrote:
>
> This is a mechanical change to make the fdt available through
> MachineState.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> include/hw/riscv/virt.h | 1 -
> hw/riscv/virt.c | 18 +++++++++---------
> 2 files changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h
> index b4ed9a32eb..6505ae8d23 100644
> --- a/include/hw/riscv/virt.h
> +++ b/include/hw/riscv/virt.h
> @@ -41,7 +41,6 @@ struct RISCVVirtState {
> DeviceState *plic[VIRT_SOCKETS_MAX];
> PFlashCFI01 *flash[2];
>
> - void *fdt;
> int fdt_size;
> };
>
> diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> index 41bd2f38ba..17c0706156 100644
> --- a/hw/riscv/virt.c
> +++ b/hw/riscv/virt.c
> @@ -194,7 +194,7 @@ static void create_fdt(RISCVVirtState *s, const struct
> MemmapEntry *memmap,
> hwaddr flashsize = virt_memmap[VIRT_FLASH].size / 2;
> hwaddr flashbase = virt_memmap[VIRT_FLASH].base;
>
> - fdt = s->fdt = create_device_tree(&s->fdt_size);
> + fdt = mc->fdt = create_device_tree(&s->fdt_size);
> if (!fdt) {
> error_report("create_device_tree() failed");
> exit(1);
> @@ -434,12 +434,12 @@ static void create_fdt(RISCVVirtState *s, const struct
> MemmapEntry *memmap,
> g_free(name);
>
> name = g_strdup_printf("/soc/flash@%" PRIx64, flashbase);
> - qemu_fdt_add_subnode(s->fdt, name);
> - qemu_fdt_setprop_string(s->fdt, name, "compatible", "cfi-flash");
> - qemu_fdt_setprop_sized_cells(s->fdt, name, "reg",
> + qemu_fdt_add_subnode(mc->fdt, name);
> + qemu_fdt_setprop_string(mc->fdt, name, "compatible", "cfi-flash");
> + qemu_fdt_setprop_sized_cells(mc->fdt, name, "reg",
> 2, flashbase, 2, flashsize,
> 2, flashbase + flashsize, 2, flashsize);
> - qemu_fdt_setprop_cell(s->fdt, name, "bank-width", 4);
> + qemu_fdt_setprop_cell(mc->fdt, name, "bank-width", 4);
> g_free(name);
> }
>
> @@ -613,9 +613,9 @@ static void virt_machine_init(MachineState *machine)
> hwaddr end = riscv_load_initrd(machine->initrd_filename,
> machine->ram_size, kernel_entry,
> &start);
> - qemu_fdt_setprop_cell(s->fdt, "/chosen",
> + qemu_fdt_setprop_cell(machine->fdt, "/chosen",
> "linux,initrd-start", start);
> - qemu_fdt_setprop_cell(s->fdt, "/chosen", "linux,initrd-end",
> + qemu_fdt_setprop_cell(machine->fdt, "/chosen",
> "linux,initrd-end",
> end);
> }
> } else {
> @@ -636,11 +636,11 @@ static void virt_machine_init(MachineState *machine)
>
> /* Compute the fdt load address in dram */
> fdt_load_addr = riscv_load_fdt(memmap[VIRT_DRAM].base,
> - machine->ram_size, s->fdt);
> + machine->ram_size, machine->fdt);
> /* load the reset vector */
> riscv_setup_rom_reset_vec(start_addr, virt_memmap[VIRT_MROM].base,
> virt_memmap[VIRT_MROM].size, kernel_entry,
> - fdt_load_addr, s->fdt);
> + fdt_load_addr, machine->fdt);
>
> /* SiFive Test MMIO device */
> sifive_test_create(memmap[VIRT_TEST].base);
> --
> 2.20.1
>
>