Skip to content

Commit

Permalink
fast-reboot: occ: Call occ_pstates_init() on fast-reset on all machines
Browse files Browse the repository at this point in the history
Commit 815417d ("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: 815417d ("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>
  • Loading branch information
shilpasri authored and stewartsmith committed Mar 15, 2019
1 parent 27e4943 commit 961b712
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions core/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);

Expand All @@ -566,6 +567,7 @@ void __noreturn load_and_boot_kernel(bool is_reboot)
fdt = NULL;

nvram_reinit();
occ_pstates_init();
}

fsp_console_select_stdout();
Expand Down

0 comments on commit 961b712

Please sign in to comment.