diff options
| author | Shilpasri G Bhat <shilpa.bhat@linux.vnet.ibm.com> | 2019-03-06 14:53:19 +0530 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.ibm.com> | 2019-03-15 14:31:18 +1100 |
| commit | 961b7128ebd86dc7054f1483a17cdbc6ab3540ad (patch) | |
| tree | 15b8bc0bfc6f71f505c309dba27f849a4affe430 /core | |
| parent | 27e4943eade205da99c885cb0a879a92e63ce53f (diff) | |
| download | talos-skiboot-961b7128ebd86dc7054f1483a17cdbc6ab3540ad.tar.gz talos-skiboot-961b7128ebd86dc7054f1483a17cdbc6ab3540ad.zip | |
fast-reboot: occ: Call occ_pstates_init() on fast-reset on all machines
Commit 815417dcda2e ("init, occ: Initialise OCC earlier on BMC systems")
conditionally invoked occ_pstates_init() only on FSP based systems in
load_and_boot_kernel(). Due to this pstate table is re-parsed on FSP
system and skipped on BMC system during fast-reboot. So this patch fixes
this by invoking occ_pstates_init() on all boxes during fast-reboot.
Cc: skiboot-stable@lists.ozlabs.org
Fixes: 815417dcda2e ("init, occ: Initialise OCC earlier on BMC systems")
Reported-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Shilpasri G Bhat <shilpa.bhat@linux.vnet.ibm.com>
Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/init.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/init.c b/core/init.c index 6630a925..29a6bf49 100644 --- a/core/init.c +++ b/core/init.c @@ -541,8 +541,6 @@ void __noreturn load_and_boot_kernel(bool is_reboot) ipmi_set_fw_progress_sensor(IPMI_FW_OS_BOOT); - if (fsp_present()) - occ_pstates_init(); if (!is_reboot) { /* We wait for the nvram read to complete here so we can @@ -557,6 +555,9 @@ void __noreturn load_and_boot_kernel(bool is_reboot) * OCC takes few secs to boot. Call this as late as * as possible to avoid delay. */ + if (fsp_present()) + occ_pstates_init(); + if (!occ_sensors_init()) dts_sensor_create_nodes(sensor_node); @@ -566,6 +567,7 @@ void __noreturn load_and_boot_kernel(bool is_reboot) fdt = NULL; nvram_reinit(); + occ_pstates_init(); } fsp_console_select_stdout(); |
