From: Daniel Henrique Barboza <danielhb413@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Daniel Henrique Barboza" <danielhb413@gmail.com>,
"Cédric Le Goater" <clg@kaod.org>,
"BALATON Zoltan" <balaton@eik.bme.hu>
Subject: [PATCH v8 08/16] hw/ppc: set machine->fdt in bamboo_load_device_tree()
Date: Mon, 26 Sep 2022 14:38:47 -0300 [thread overview]
Message-ID: <20220926173855.1159396-9-danielhb413@gmail.com> (raw)
In-Reply-To: <20220926173855.1159396-1-danielhb413@gmail.com>
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>
---
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 ea945a1c99..9cc58fccf9 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 */
@@ -56,14 +58,13 @@ static const ram_addr_t ppc440ep_sdram_bank_sizes[] = {
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;
@@ -98,7 +99,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");
}
@@ -119,7 +120,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;
}
@@ -163,7 +167,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();
@@ -289,8 +292,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
next prev parent reply other threads:[~2022-09-26 18:27 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-26 17:38 [PATCH v8 00/16] QMP/HMP: introduce 'dumpdtb' Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 01/16] qmp/hmp, device_tree.c: introduce dumpdtb Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 02/16] hw/core: free ms->fdt in machine_finalize() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 03/16] hw/arm: do not free machine->fdt in arm_load_dtb() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 04/16] hw/mips: set machine->fdt in boston_mach_init() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 05/16] hw/microblaze: set machine->fdt in microblaze_load_dtb() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 06/16] hw/nios2: set machine->fdt in nios2_load_dtb() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 07/16] hw/ppc: set machine->fdt in ppce500_load_device_tree() Daniel Henrique Barboza
2022-09-26 17:38 ` Daniel Henrique Barboza [this message]
2022-09-26 17:38 ` [PATCH v8 09/16] hw/ppc: set machine->fdt in sam460ex_load_device_tree() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 10/16] hw/ppc: set machine->fdt in xilinx_load_device_tree() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 11/16] hw/ppc: set machine->fdt in pegasos2_machine_reset() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 12/16] hw/ppc: set machine->fdt in pnv_reset() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 13/16] hw/ppc: set machine->fdt in spapr machine Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 14/16] hw/riscv: set machine->fdt in sifive_u_machine_init() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 15/16] hw/riscv: set machine->fdt in spike_board_init() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 16/16] hw/xtensa: set machine->fdt in xtfpga_init() Daniel Henrique Barboza
2022-10-08 10:52 ` [PATCH v8 00/16] QMP/HMP: introduce 'dumpdtb' Daniel Henrique Barboza
2022-10-15 12:06 ` Daniel Henrique Barboza
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220926173855.1159396-9-danielhb413@gmail.com \
--to=danielhb413@gmail.com \
--cc=balaton@eik.bme.hu \
--cc=clg@kaod.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).