summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver O'Halloran <oohall@gmail.com>2017-02-08 12:16:13 +1100
committerStewart Smith <stewart@linux.vnet.ibm.com>2017-02-17 12:52:05 +1100
commiteeba2d64fb7ac929283ed4611ca04209278eb777 (patch)
tree66e21d02a04f45ed28a25455e9eadf87f582a70c
parent53a08f13e3310bec362c2ddf2aba1851e053fa14 (diff)
downloadblackbird-skiboot-eeba2d64fb7ac929283ed4611ca04209278eb777.tar.gz
blackbird-skiboot-eeba2d64fb7ac929283ed4611ca04209278eb777.zip
core/opal: check ibm,opal exists
The ibm,opal node is normally created by Skiboot either in the HDAT parser or after the input FDT has been unflattened. However, in order to supply the /ibm,opal/power-mgt/enabled-stop-states property FDT we to tolerate /ibm,opal/ existing in the input tree. Signed-off-by: Oliver O'Halloran <oohall@gmail.com> Acked-by: Michael Neuling <mikey@neuling.org> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
-rw-r--r--core/opal.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/core/opal.c b/core/opal.c
index 6087e65a..88ca2af4 100644
--- a/core/opal.c
+++ b/core/opal.c
@@ -149,11 +149,7 @@ void add_opal_node(void)
size = (CPU_STACKS_BASE +
(uint64_t)(cpu_max_pir + 1) * STACK_SIZE) - SKIBOOT_BASE;
- if (!opal_node) {
- opal_node = dt_new(dt_root, "ibm,opal");
- assert(opal_node);
- }
-
+ opal_node = dt_new_check(dt_root, "ibm,opal");
dt_add_property_cells(opal_node, "#address-cells", 0);
dt_add_property_cells(opal_node, "#size-cells", 0);
OpenPOWER on IntegriCloud