[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 31/38] hw/ppc: set machine->fdt in bamboo_load_device_tree()
From: |
Daniel Henrique Barboza |
Subject: |
[PULL 31/38] hw/ppc: set machine->fdt in bamboo_load_device_tree() |
Date: |
Mon, 17 Oct 2022 16:20:02 -0300 |
This will enable support for 'dumpdtb' QMP/HMP command for the bamboo
machine.
Setting machine->fdt requires a MachineState pointer to be used inside
bamboo_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.
Cc: Cédric Le Goater <clg@kaod.org>
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20220926173855.1159396-9-danielhb413@gmail.com>
---
hw/ppc/ppc440_bamboo.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index 56f47e7509..81d71adf34 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -34,6 +34,8 @@
#include "hw/qdev-properties.h"
#include "qapi/error.h"
+#include <libfdt.h>
+
#define BINARY_DEVICE_TREE_FILE "bamboo.dtb"
/* from u-boot */
@@ -50,14 +52,13 @@
static hwaddr entry;
-static int bamboo_load_device_tree(hwaddr addr,
- uint32_t ramsize,
- hwaddr initrd_base,
- hwaddr initrd_size,
- const char *kernel_cmdline)
+static int bamboo_load_device_tree(MachineState *machine,
+ hwaddr addr,
+ hwaddr initrd_base,
+ hwaddr initrd_size)
{
int ret = -1;
- 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;
int fdt_size;
void *fdt;
@@ -92,7 +93,7 @@ static int bamboo_load_device_tree(hwaddr addr,
fprintf(stderr, "couldn't set /chosen/linux,initrd-end\n");
}
ret = qemu_fdt_setprop_string(fdt, "/chosen", "bootargs",
- kernel_cmdline);
+ machine->kernel_cmdline);
if (ret < 0) {
fprintf(stderr, "couldn't set /chosen/bootargs\n");
}
@@ -113,7 +114,10 @@ static int bamboo_load_device_tree(hwaddr addr,
tb_freq);
rom_add_blob_fixed(BINARY_DEVICE_TREE_FILE, fdt, fdt_size, addr);
- g_free(fdt);
+
+ /* Set ms->fdt for 'dumpdtb' QMP/HMP command */
+ machine->fdt = fdt;
+
return 0;
}
@@ -157,7 +161,6 @@ static void main_cpu_reset(void *opaque)
static void bamboo_init(MachineState *machine)
{
const char *kernel_filename = machine->kernel_filename;
- const char *kernel_cmdline = machine->kernel_cmdline;
const char *initrd_filename = machine->initrd_filename;
unsigned int pci_irq_nrs[4] = { 28, 27, 26, 25 };
MemoryRegion *address_space_mem = get_system_memory();
@@ -280,8 +283,8 @@ static void bamboo_init(MachineState *machine)
/* If we're loading a kernel directly, we must load the device tree too. */
if (kernel_filename) {
- if (bamboo_load_device_tree(FDT_ADDR, machine->ram_size, RAMDISK_ADDR,
- initrd_size, kernel_cmdline) < 0) {
+ if (bamboo_load_device_tree(machine, FDT_ADDR,
+ RAMDISK_ADDR, initrd_size) < 0) {
error_report("couldn't load device tree");
exit(1);
}
--
2.37.3
- [PULL 18/38] ppc440_uc.c: Move some macros to ppc4xx.h, (continued)
- [PULL 18/38] ppc440_uc.c: Move some macros to ppc4xx.h, Daniel Henrique Barboza, 2022/10/17
- [PULL 16/38] ppc440_sdram: Move RAM size check to ppc440_sdram_init, Daniel Henrique Barboza, 2022/10/17
- [PULL 17/38] ppc440_sdram: QOM'ify, Daniel Henrique Barboza, 2022/10/17
- [PULL 26/38] hw/ppc/e500: Remove if statement which is now always true, Daniel Henrique Barboza, 2022/10/17
- [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 <=
- [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, 2022/10/17
- [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