SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/ppc: set machine->fdt in sam460ex_load_device_tree()

Browse Source 
This will enable support for 'dumpdtb' QMP/HMP command for the sam460ex
machine.

Setting machine->fdt requires a MachineState pointer to be used inside
sam460ex_load_device_tree(). Let's change the function to receive this
pointer from the caller. 'ramsize' and 'kernel_cmdline' can be retrieved
directly from the 'machine' pointer.

Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20220926173855.1159396-10-danielhb413@gmail.com>
This commit is contained in:
Daniel Henrique Barboza 2022-09-26 14:38:48 -03:00
parent 8d42c851ed
commit 698af4cb35
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/ppc/sam460ex.c
View File

@ -123,13 +123,12 @@ static int sam460ex_load_uboot(void)
return 0; return 0;
} }
static int sam460ex_load_device_tree(hwaddr addr, static int sam460ex_load_device_tree(MachineState *machine,
uint32_t ramsize, hwaddr addr,
hwaddr initrd_base, hwaddr initrd_base,
hwaddr initrd_size, hwaddr initrd_size)
const char *kernel_cmdline)
{ {
uint32_t mem_reg_property[] = { 0, 0, cpu_to_be32(ramsize) }; uint32_t mem_reg_property[] = { 0, 0, cpu_to_be32(machine->ram_size) };
char *filename; char *filename;
int fdt_size; int fdt_size;
void *fdt; void *fdt;
@ -163,7 +162,8 @@ static int sam460ex_load_device_tree(hwaddr addr,
qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end", qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end",
(initrd_base + initrd_size)); (initrd_base + initrd_size));
qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", kernel_cmdline); qemu_fdt_setprop_string(fdt, "/chosen", "bootargs",
machine->kernel_cmdline);
/* Copy data from the host device tree into the guest. Since the guest can /* Copy data from the host device tree into the guest. Since the guest can
* directly access the timebase without host involvement, we must expose * directly access the timebase without host involvement, we must expose
@ -200,7 +200,9 @@ static int sam460ex_load_device_tree(hwaddr addr,
EBC_FREQ); EBC_FREQ);
rom_add_blob_fixed(BINARY_DEVICE_TREE_FILE, fdt, fdt_size, addr); rom_add_blob_fixed(BINARY_DEVICE_TREE_FILE, fdt, fdt_size, addr);
g_free(fdt);
/* Set machine->fdt for 'dumpdtb' QMP/HMP command */
machine->fdt = fdt;
return fdt_size; return fdt_size;
} }
@ -500,9 +502,8 @@ static void sam460ex_init(MachineState *machine)
if (machine->kernel_filename) { if (machine->kernel_filename) {
int dt_size; int dt_size;
dt_size = sam460ex_load_device_tree(FDT_ADDR, machine->ram_size, dt_size = sam460ex_load_device_tree(machine, FDT_ADDR,
RAMDISK_ADDR, initrd_size, RAMDISK_ADDR, initrd_size);
machine->kernel_cmdline);
boot_info->dt_base = FDT_ADDR; boot_info->dt_base = FDT_ADDR;
boot_info->dt_size = dt_size; boot_info->dt_size = dt_size;