summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2017-01-09 11:40:12 -0600
committerStewart Smith <stewart@linux.vnet.ibm.com>2017-01-10 14:17:43 +1100
commitc70fc78ebe0b1599635ce9c51be2dfd26a3af905 (patch)
tree2b6429dfe93a87fac5c22f96e4173fdfbd8a0c22 /core
parent4fc81592c7d913af2a8dc15cd29ab616682e4126 (diff)
downloadtalos-skiboot-c70fc78ebe0b1599635ce9c51be2dfd26a3af905.tar.gz
talos-skiboot-c70fc78ebe0b1599635ce9c51be2dfd26a3af905.zip
init: Print some more info before booting linux
The kernel command line from nvram and the stdout-path are useful to know when debugging console related problems. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'core')
-rw-r--r--core/init.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/core/init.c b/core/init.c
index 81939dd0..a5701576 100644
--- a/core/init.c
+++ b/core/init.c
@@ -458,7 +458,7 @@ void *fdt;
void __noreturn load_and_boot_kernel(bool is_reboot)
{
const struct dt_property *memprop;
- const char *cmdline;
+ const char *cmdline, *stdoutp;
uint64_t mem_top;
memprop = dt_find_property(dt_root, DT_PRIVATE "maxmem");
@@ -507,6 +507,8 @@ void __noreturn load_and_boot_kernel(bool is_reboot)
if (cmdline) {
dt_check_del_prop(dt_chosen, "bootargs");
dt_add_property_string(dt_chosen, "bootargs", cmdline);
+ prlog(PR_DEBUG, "INIT: Command line from NVRAM: %s\n",
+ cmdline);
}
op_display(OP_LOG, OP_MOD_INIT, 0x000B);
@@ -534,6 +536,11 @@ void __noreturn load_and_boot_kernel(bool is_reboot)
/* Take processours out of nap */
cpu_set_pm_enable(false);
+ /* Dump the selected console */
+ stdoutp = dt_prop_get_def(dt_chosen, "linux,stdout-path", NULL);
+ printf("INIT: stdout-path: %s\n", stdoutp ? stdoutp : "");
+
+
printf("INIT: Starting kernel at 0x%llx, fdt at %p (size 0x%x)\n",
kernel_entry, fdt, fdt_totalsize(fdt));
OpenPOWER on IntegriCloud