From: David Gibson <david@gibson.dropbear.id.au>
To: groug@kaod.org, clg@kaod.org, philmd@redhat.com
Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org,
David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH 2/4] spapr: Move creation of ibm,architecture-vec-5 property
Date: Fri, 13 Mar 2020 15:05:37 +1100 [thread overview]
Message-ID: <20200313040539.819138-3-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20200313040539.819138-1-david@gibson.dropbear.id.au>
This is currently called from spapr_dt_cas_updates() which is a hang over
from when we created this only as a diff to the DT at CAS time. Now that
we fully rebuild the DT at CAS time, just create it alon with the rest
of the properties in /chosen.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
hw/ppc/spapr.c | 26 +++-----------------------
1 file changed, 3 insertions(+), 23 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 66289ffef5..fc28d9df25 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -889,22 +889,6 @@ static int spapr_rng_populate_dt(void *fdt)
return ret ? -1 : 0;
}
-static int spapr_dt_cas_updates(SpaprMachineState *spapr, void *fdt,
- SpaprOptionVector *ov5_updates)
-{
- int offset;
-
- offset = fdt_path_offset(fdt, "/chosen");
- if (offset < 0) {
- offset = fdt_add_subnode(fdt, 0, "chosen");
- if (offset < 0) {
- return offset;
- }
- }
- return spapr_ovec_populate_dt(fdt, offset, spapr->ov5_cas,
- "ibm,architecture-vec-5");
-}
-
static void spapr_dt_rtas(SpaprMachineState *spapr, void *fdt)
{
MachineState *ms = MACHINE(spapr);
@@ -1115,6 +1099,9 @@ static void spapr_dt_chosen(SpaprMachineState *spapr, void *fdt)
spapr_dt_ov5_platform_support(spapr, fdt, chosen);
+ _FDT(spapr_ovec_populate_dt(fdt, offset, spapr->ov5_cas,
+ "ibm,architecture-vec-5"));
+
g_free(stdout_path);
g_free(bootlist);
}
@@ -1263,13 +1250,6 @@ void *spapr_build_fdt(SpaprMachineState *spapr, bool reset, size_t space)
}
}
- /* ibm,client-architecture-support updates */
- ret = spapr_dt_cas_updates(spapr, fdt, spapr->ov5_cas);
- if (ret < 0) {
- error_report("couldn't setup CAS properties fdt");
- exit(1);
- }
-
if (smc->dr_phb_enabled) {
ret = spapr_dt_drc(fdt, 0, NULL, SPAPR_DR_CONNECTOR_TYPE_PHB);
if (ret < 0) {
--
2.24.1
next prev parent reply other threads:[~2020-03-13 4:06 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-13 4:05 [PATCH 0/4] spapr: Assorted minor cleanups David Gibson
2020-03-13 4:05 ` [PATCH 1/4] spapr: Move creation of ibm, dynamic-reconfiguration-memory dt node David Gibson
2020-03-13 11:30 ` Greg Kurz
2020-03-16 2:42 ` David Gibson
2020-03-13 4:05 ` David Gibson [this message]
2020-03-13 11:40 ` [PATCH 2/4] spapr: Move creation of ibm,architecture-vec-5 property Greg Kurz
2020-03-16 2:42 ` David Gibson
2020-03-13 4:05 ` [PATCH 3/4] spapr: Rename DT functions to newer naming convention David Gibson
2020-03-13 9:10 ` Cédric Le Goater
2020-03-13 11:54 ` Greg Kurz
2020-03-16 2:51 ` David Gibson
2020-03-13 4:05 ` [PATCH 4/4] spapr: Fold spapr_node0_size() into its only caller David Gibson
2020-03-13 9:33 ` Greg Kurz
2020-03-16 2:55 ` David Gibson
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=20200313040539.819138-3-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=clg@kaod.org \
--cc=groug@kaod.org \
--cc=philmd@redhat.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.