[Skiboot-stable] [PATCH 2/2] fast-reboot: occ: Call occ_pstates_init() on fast-reset on all machines

[Shilpasri G Bhat]

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 at lists.ozlabs.org
Fixes: 815417dcda2e ("init, occ: Initialise OCC earlier on BMC systems")
Reported-by: Vasant Hegde <hegdevasant at linux.vnet.ibm.com>
Signed-off-by: Shilpasri G Bhat <shilpa.bhat at linux.vnet.ibm.com>
---
 core/init.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/init.c b/core/init.c
index 6630a92..29a6bf4 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();
-- 
1.8.3.1