diff mbox series

[02/17] Move more FSP functions to FSP platform

Message ID 20190618072925.5299-3-stewart@linux.ibm.com
State Accepted
Headers show
Series FSP code free OPAL | expand

Checks

Context Check Description
snowpatch_ozlabs/apply_patch success Successfully applied on branch master (dbf27b6c4af84addb36bd3be34f96580aba9c873)
snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot fail Test snowpatch/job/snowpatch-skiboot on branch master
snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot-dco success Signed-off-by present

Commit Message

Stewart Smith June 18, 2019, 7:29 a.m. UTC 
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
---
 core/init.c                | 12 ------------
 platforms/ibm-fsp/common.c | 13 +++++++++++++
 2 files changed, 13 insertions(+), 12 deletions(-)
diff mbox series

Patch

diff --git a/core/init.c b/core/init.c
index 3db9df314292..9990483a599b 100644
--- a/core/init.c
+++ b/core/init.c
@@ -558,16 +558,6 @@  void __noreturn load_and_boot_kernel(bool is_reboot)
 		 */
 		nvram_wait_for_load();
 
-		/* Wait for FW VPD data read to complete */
-		fsp_code_update_wait_vpd(true);
-
-		/*
-		 * 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);
 
@@ -580,8 +570,6 @@  void __noreturn load_and_boot_kernel(bool is_reboot)
 		occ_pstates_init();
 	}
 
-	fsp_console_select_stdout();
-
 	/* Use nvram bootargs over device tree */
 	cmdline = nvram_query_safe("bootargs");
 	if (cmdline) {
diff --git a/platforms/ibm-fsp/common.c b/platforms/ibm-fsp/common.c
index a7f2beedcb78..573cd51861ee 100644
--- a/platforms/ibm-fsp/common.c
+++ b/platforms/ibm-fsp/common.c
@@ -180,6 +180,19 @@  void ibm_fsp_exit(void)
 	 * ensure we have all the LED information.
 	 */
 	create_led_device_nodes();
+
+	/* Wait for FW VPD data read to complete */
+	fsp_code_update_wait_vpd(true);
+
+	/*
+	 * OCC takes few secs to boot.  Call this as late as
+	 * as possible to avoid delay.
+	 */
+	if (fsp_present())
+		occ_pstates_init();
+
+	fsp_console_select_stdout();
+
 }
 
 int64_t ibm_fsp_cec_reboot(void)