aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStewart Smith <stewart@linux.ibm.com>2018-09-18 00:27:40 -0500
committerStewart Smith <stewart@linux.ibm.com>2018-10-31 17:33:34 +1100
commit64f24480050e50ba67582263b5b62ea156b8f4bd (patch)
tree720af2d34a3f19ed76f97ff4600f0a3ea37efef0
parent240eb43b982b68b222dda407241c007d9c5be975 (diff)
downloadskiboot-64f24480050e50ba67582263b5b62ea156b8f4bd.zip
skiboot-64f24480050e50ba67582263b5b62ea156b8f4bd.tar.gz
skiboot-64f24480050e50ba67582263b5b62ea156b8f4bd.tar.bz2
Add fast-reboot property to /ibm,opal DT node
[ Upstream commit 7c8e1c6f89f3aac77661cfcee75ab515bd053d75 ] this means that if it's permanently disabled on boot, the test suite can pick that up and not try a fast reboot test. Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
-rw-r--r--core/init.c2
-rw-r--r--doc/device-tree/ibm,opal.rst10
-rw-r--r--include/skiboot.h1
3 files changed, 13 insertions, 0 deletions
diff --git a/core/init.c b/core/init.c
index 3b887a2..99ce92d 100644
--- a/core/init.c
+++ b/core/init.c
@@ -543,6 +543,8 @@ void __noreturn load_and_boot_kernel(bool is_reboot)
op_display(OP_LOG, OP_MOD_INIT, 0x000B);
+ add_fast_reboot_dt_entries();
+
/* Create the device tree blob to boot OS. */
fdt = create_dtb(dt_root, false);
if (!fdt) {
diff --git a/doc/device-tree/ibm,opal.rst b/doc/device-tree/ibm,opal.rst
index 2fa446d..25f905d 100644
--- a/doc/device-tree/ibm,opal.rst
+++ b/doc/device-tree/ibm,opal.rst
@@ -71,3 +71,13 @@ supported POWER8 systems.
On the earliest POWER8 OPAL systems, there was `ibm,heartbeat-freq` instead.
However, no OS at the time ever looked at that value, so it can be ignored
by any new operating systems.
+
+fast-reboot property
+^^^^^^^^^^^^^^^^^^^^
+
+This property of the `ibm,opal` node is an option property that will either be
+the string `okay` or the reason the fast reboot feature was disabled on boot.
+
+The motivation behind adding this property is to help the OPAL test suite work
+out if it should even try the fast reboot test on a particular platform
+(without it having to resort to grepping firmware logs).
diff --git a/include/skiboot.h b/include/skiboot.h
index b4bdf37..a1b4894 100644
--- a/include/skiboot.h
+++ b/include/skiboot.h
@@ -217,6 +217,7 @@ extern int64_t opal_signal_system_reset(int cpu_nr);
/* Fast reboot support */
extern void disable_fast_reboot(const char *reason);
+extern void add_fast_reboot_dt_entries(void);
extern void fast_reboot(void);
extern void __noreturn __secondary_cpu_entry(void);
extern void __noreturn load_and_boot_kernel(bool is_reboot);