From: Shivang Upadhyay <shivangu@linux.ibm.com>
To: shivangu@linux.ibm.com
Cc: adityag@linux.ibm.com, harshpb@linux.ibm.com,
milesg@linux.ibm.com, npiggin@gmail.com, qemu-devel@nongnu.org,
qemu-ppc@nongnu.org
Subject: [PATCH v2 1/2] ppc/pnv: avoid regenerating DTB if external DTB is present
Date: Fri, 26 Jun 2026 16:52:38 +0530 [thread overview]
Message-ID: <20260626112239.177191-2-shivangu@linux.ibm.com> (raw)
In-Reply-To: <20260626112239.177191-1-shivangu@linux.ibm.com>
Currently externally provided dtb is overwritten in `pnv_reset`.
Fix this by only creating dtb if not provided from `-dtb`.
Signed-off-by: Shivang Upadhyay <shivangu@linux.ibm.com>
---
hw/ppc/pnv.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 62812f22f8..e44fb7e2dc 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -803,9 +803,13 @@ static void pnv_reset(MachineState *machine, ResetType type)
mpipl_write_succeeded = do_mpipl_write(pnv);
}
- /* Regenerate device tree */
- fdt = pnv_dt_create(machine);
- _FDT((fdt_pack(fdt)));
+ /* Only create new dt if not provided in -dtb */
+ if (!machine->dtb) {
+ fdt = pnv_dt_create(machine);
+ _FDT((fdt_pack(fdt)));
+ } else {
+ fdt = machine->fdt;
+ }
/*
* If it's a MPIPL boot, add the "mpipl-boot" property, and reset the
--
2.54.0
next prev parent reply other threads:[~2026-06-26 11:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-23 6:31 [PATCH 0/2] ppc/pnv: fixing external dtb Shivang Upadhyay
2026-06-23 6:31 ` [PATCH 1/2] ppc/pnv: avoid regenerating DTB if external DTB is present Shivang Upadhyay
2026-06-25 7:51 ` Aditya Gupta
2026-06-25 7:54 ` Shivang Upadhyay
2026-06-23 6:31 ` [PATCH 2/2] ppc/pnv: add test to verify external DTB is honored Shivang Upadhyay
2026-06-23 6:57 ` Amit Machhiwal
2026-06-23 15:42 ` Shivang Upadhyay
2026-06-25 7:02 ` Aditya Gupta
2026-06-25 7:30 ` Shivang Upadhyay
2026-06-26 11:22 ` [PATCH v2 0/2] ppc/pnv: fixing external dtb Shivang Upadhyay
2026-06-26 11:22 ` Shivang Upadhyay [this message]
2026-06-29 11:41 ` [PATCH v2 1/2] ppc/pnv: avoid regenerating DTB if external DTB is present Aditya Gupta
2026-06-26 11:22 ` [PATCH v2 2/2] ppc/pnv: add test to verify external DTB is honored Shivang Upadhyay
2026-06-29 11:53 ` Aditya Gupta
2026-06-30 9:37 ` Shivang Upadhyay
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=20260626112239.177191-2-shivangu@linux.ibm.com \
--to=shivangu@linux.ibm.com \
--cc=adityag@linux.ibm.com \
--cc=harshpb@linux.ibm.com \
--cc=milesg@linux.ibm.com \
--cc=npiggin@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.