[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 33/38] hw/ppc: set machine->fdt in xilinx_load_device_tree()
From: |
Daniel Henrique Barboza |
Subject: |
[PULL 33/38] hw/ppc: set machine->fdt in xilinx_load_device_tree() |
Date: |
Mon, 17 Oct 2022 16:20:04 -0300 |
This will enable support for 'dumpdtb' QMP/HMP command for the
virtex_ml507 machine.
Setting machine->fdt requires a MachineState pointer to be used inside
xilinx_load_device_tree(). Let's change the function to receive this
pointer from the caller. kernel_cmdline' can be retrieved directly from
the 'machine' pointer. 'ramsize' wasn't being used so can be removed.
Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20220926173855.1159396-11-danielhb413@gmail.com>
---
hw/ppc/virtex_ml507.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 493ea0c19f..13cace229b 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -45,6 +45,8 @@
#include "hw/qdev-properties.h"
#include "ppc405.h"
+#include <libfdt.h>
+
#define EPAPR_MAGIC (0x45504150)
#define FLASH_SIZE (16 * MiB)
@@ -144,11 +146,10 @@ static void main_cpu_reset(void *opaque)
}
#define BINARY_DEVICE_TREE_FILE "virtex-ml507.dtb"
-static int xilinx_load_device_tree(hwaddr addr,
- uint32_t ramsize,
- hwaddr initrd_base,
- hwaddr initrd_size,
- const char *kernel_cmdline)
+static int xilinx_load_device_tree(MachineState *machine,
+ hwaddr addr,
+ hwaddr initrd_base,
+ hwaddr initrd_size)
{
char *path;
int fdt_size;
@@ -190,18 +191,21 @@ static int xilinx_load_device_tree(hwaddr addr,
error_report("couldn't set /chosen/linux,initrd-end");
}
- r = qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", kernel_cmdline);
+ r = qemu_fdt_setprop_string(fdt, "/chosen", "bootargs",
+ machine->kernel_cmdline);
if (r < 0)
fprintf(stderr, "couldn't set /chosen/bootargs\n");
cpu_physical_memory_write(addr, fdt, fdt_size);
- g_free(fdt);
+
+ /* Set machine->fdt for 'dumpdtb' QMP/HMP command */
+ machine->fdt = fdt;
+
return fdt_size;
}
static void virtex_init(MachineState *machine)
{
const char *kernel_filename = machine->kernel_filename;
- const char *kernel_cmdline = machine->kernel_cmdline;
hwaddr initrd_base = 0;
int initrd_size = 0;
MemoryRegion *address_space_mem = get_system_memory();
@@ -294,9 +298,8 @@ static void virtex_init(MachineState *machine)
boot_info.fdt = high + (8192 * 2);
boot_info.fdt &= ~8191;
- xilinx_load_device_tree(boot_info.fdt, machine->ram_size,
- initrd_base, initrd_size,
- kernel_cmdline);
+ xilinx_load_device_tree(machine, boot_info.fdt,
+ initrd_base, initrd_size);
}
env->load_info = &boot_info;
}
--
2.37.3
- [PULL 22/38] docs/system/ppc/ppce500: Add heading for networking chapter, (continued)
- [PULL 22/38] docs/system/ppc/ppce500: Add heading for networking chapter, Daniel Henrique Barboza, 2022/10/17
- [PULL 27/38] target/ppc: Fix xvcmp* clearing FI bit, Daniel Henrique Barboza, 2022/10/17
- [PULL 19/38] ppc440_uc.c: Remove unneeded parenthesis, Daniel Henrique Barboza, 2022/10/17
- [PULL 20/38] hw/ppc/meson: Allow e500 boards to be enabled separately, Daniel Henrique Barboza, 2022/10/17
- [PULL 21/38] hw/gpio/meson: Introduce dedicated config switch for hw/gpio/mpc8xxx, Daniel Henrique Barboza, 2022/10/17
- [PULL 29/38] qmp/hmp, device_tree.c: introduce dumpdtb, Daniel Henrique Barboza, 2022/10/17
- [PULL 31/38] hw/ppc: set machine->fdt in bamboo_load_device_tree(), Daniel Henrique Barboza, 2022/10/17
- [PULL 23/38] hw/ppc/e500: Reduce usage of sysbus API, Daniel Henrique Barboza, 2022/10/17
- [PULL 25/38] hw/ppc/mpc8544ds: Add platform bus, Daniel Henrique Barboza, 2022/10/17
- [PULL 24/38] hw/ppc/mpc8544ds: Rename wrongly named method, Daniel Henrique Barboza, 2022/10/17
- [PULL 33/38] hw/ppc: set machine->fdt in xilinx_load_device_tree(),
Daniel Henrique Barboza <=
- [PULL 35/38] hw/ppc: set machine->fdt in pnv_reset(), Daniel Henrique Barboza, 2022/10/17
- [PULL 28/38] hw/ppc/spapr_pci.c: Use device_cold_reset() rather than device_legacy_reset(), Daniel Henrique Barboza, 2022/10/17
- [PULL 30/38] hw/nios2: set machine->fdt in nios2_load_dtb(), Daniel Henrique Barboza, 2022/10/17
- [PULL 32/38] hw/ppc: set machine->fdt in sam460ex_load_device_tree(), Daniel Henrique Barboza, 2022/10/17
- [PULL 34/38] hw/ppc: set machine->fdt in pegasos2_machine_reset(), Daniel Henrique Barboza, 2022/10/17
- [PULL 36/38] hw/ppc: set machine->fdt in spapr machine, Daniel Henrique Barboza, 2022/10/17
- [PULL 37/38] hw/riscv: set machine->fdt in sifive_u_machine_init(), Daniel Henrique Barboza, 2022/10/17
- [PULL 38/38] hw/riscv: set machine->fdt in spike_board_init(), Daniel Henrique Barboza, 2022/10/17
- Re: [PULL 00/38] ppc queue, Stefan Hajnoczi, 2022/10/18