| Message ID | 20201105175153.30489-3-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Xen guest-loader and arm64 build fixes/enhancements | expand |
On 11/5/20 6:51 PM, Alex Bennée 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> > Message-Id: <20201021170842.25762-3-alex.bennee@linaro.org> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > include/hw/riscv/virt.h | 1 - > hw/riscv/virt.c | 20 ++++++++++---------- > 2 files changed, 10 insertions(+), 11 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
On Fri, Nov 6, 2020 at 1:57 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> > Message-Id: <20201021170842.25762-3-alex.bennee@linaro.org> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > include/hw/riscv/virt.h | 1 - > hw/riscv/virt.c | 20 ++++++++++---------- > 2 files changed, 10 insertions(+), 11 deletions(-) What about the 'sifive_u' and 'spike' machines? Regards, Bin
Bin Meng <bmeng.cn@gmail.com> writes: > On Fri, Nov 6, 2020 at 1:57 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> >> Message-Id: <20201021170842.25762-3-alex.bennee@linaro.org> >> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >> --- >> include/hw/riscv/virt.h | 1 - >> hw/riscv/virt.c | 20 ++++++++++---------- >> 2 files changed, 10 insertions(+), 11 deletions(-) > > What about the 'sifive_u' and 'spike' machines? If they support direct -kernel loading then we could certainly do the same for them. > > Regards, > Bin -- Alex Bennée
On Fri, Nov 6, 2020 at 6:21 PM Alex Bennée <alex.bennee@linaro.org> wrote: > > > Bin Meng <bmeng.cn@gmail.com> writes: > > > On Fri, Nov 6, 2020 at 1:57 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> > >> Message-Id: <20201021170842.25762-3-alex.bennee@linaro.org> > >> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > >> --- > >> include/hw/riscv/virt.h | 1 - > >> hw/riscv/virt.c | 20 ++++++++++---------- > >> 2 files changed, 10 insertions(+), 11 deletions(-) > > > > What about the 'sifive_u' and 'spike' machines? > > If they support direct -kernel loading then we could certainly do the > same for them. Yes, they do. Regards, Bin
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 25cea7aa67..377400e02a 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -197,14 +197,14 @@ static void create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, dtb_filename = qemu_opt_get(qemu_get_machine_opts(), "dtb"); if (dtb_filename) { - fdt = s->fdt = load_device_tree(dtb_filename, &s->fdt_size); + fdt = mc->fdt = load_device_tree(dtb_filename, &s->fdt_size); if (!fdt) { error_report("load_device_tree() failed"); exit(1); } goto update_bootargs; } else { - 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); @@ -442,12 +442,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); update_bootargs: @@ -631,9 +631,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 { @@ -654,11 +654,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);