Make MCS acker workaround changes permanent

Workaround moved the p9_revert_sbe_mcs_setup HWP from istep06 to istep14. Remove call_host_revert_sbe_mcs_setup.C from istep06 and remove workaround comments in istep14. Change-Id: I93c70364b7dde013bf003cf1920535ba78b9a58b RTC:184860 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/70792 Tested-by: Jenkins Server <[email protected]> Tested-by: Jenkins OP Build CI <[email protected]> Reviewed-by: Christian R. Geddes <[email protected]> Tested-by: FSP CI Jenkins <[email protected]> Tested-by: Jenkins OP HW <[email protected]> Reviewed-by: Matt Derksen <[email protected]> Reviewed-by: Daniel M. Crowell <[email protected]>
open-power · Feb 4, 2019 · ddae90c · ddae90c
1 parent 52080a9
commit ddae90c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 118 deletions.
diff --git a/src/include/usr/isteps/istep06list.H b/src/include/usr/isteps/istep06list.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2018                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2019                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -52,7 +52,7 @@
  *  06.9    host_gard
  *      :   Do Gard
  *  06.10   host_revert_sbe_mcs_setup
- *      :   Clean up MCS extent regs
+ *      :   Clean up MCS extent regs (moved to istep14)
  *  06.11   host_start_occ_xstop_handler
  *      :   Start OpenPOWER xstop
  *  06.12   host_voltage_config
@@ -128,13 +128,9 @@ void* call_host_update_master_tpm( void *io_pArgs );
 void* host_gard( void *io_pArgs );
 
 /**
- * @brief   host_revert_sbe_mcs_setup (istep 6.10)
- *
- *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
- *                              or NULL.
- *  return  any error logs to istep
+ * host_revert_sbe_mcs_setup (istep 6.10)
+ *    Moved to istep14 call_proc_setup_bars.C
  */
-void* call_host_revert_sbe_mcs_setup (void * io_pArgs);
 
 /**
  * @brief   host_start_occ_xstop_handler (istep 6.11)
@@ -213,9 +209,9 @@ const   TaskInfo    g_istep06[]  =   {
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
         },
         {
-                ISTEPNAME(06,10,"host_revert_sbe_mcs_setup"),
-                ISTEP_06::call_host_revert_sbe_mcs_setup,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+                ISTEPNAME(06,10,""),        // not used. moved to istep14
+                NULL,
+                { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
         {
                 ISTEPNAME(06,11,"host_start_occ_xstop_handler"),

diff --git a/src/usr/isteps/istep06/call_host_revert_sbe_mcs_setup.C b/src/usr/isteps/istep06/call_host_revert_sbe_mcs_setup.C
diff --git a/src/usr/isteps/istep06/makefile b/src/usr/isteps/istep06/makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2015,2018
+# Contributors Listed Below - COPYRIGHT 2015,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -30,7 +30,6 @@ OBJS += host_set_ipl_parms.o
 OBJS += host_discover_targets.o
 OBJS += call_host_update_master_tpm.o
 OBJS += host_gard.o
-OBJS += call_host_revert_sbe_mcs_setup.o
 OBJS += host_start_occ_xstop_handler.o
 OBJS += call_host_voltage_config.o
 

diff --git a/src/usr/isteps/istep14/call_proc_setup_bars.C b/src/usr/isteps/istep14/call_proc_setup_bars.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015,2018                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2019                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -40,7 +40,6 @@
 #include <p9_mss_setup_bars.H>
 #include <p9c_mss_secure_boot.H>
 
-// TODO: RTC 184860 Remove MCS acker workaround
 #include <initservice/initserviceif.H>
 #include <p9_revert_sbe_mcs_setup.H>
 
@@ -68,10 +67,11 @@ void* call_proc_setup_bars (void *io_pArgs)
                "call_proc_setup_bars entry" );
 
 
-    // *******************************
-    // Start MCS acker workaround
-    // TODO: RTC 184860 Remove MCS acker workaround
-    // *******************************
+    // ***************************
+    // Start MCS reset
+    // Reset memory controller configuration written by SBE
+    // Close the MCS acker before enabling the real memory bars
+    // ***************************
     TARGETING::Target * l_masterProc;
     TARGETING::targetService().masterProcChipTargetHandle( l_masterProc );
 
@@ -102,9 +102,9 @@ void* call_proc_setup_bars (void *io_pArgs)
         // Commit error
         errlCommit(l_errl,SBE_COMP_ID);
     }
-    // *******************************
-    // End MCS acker workaround
-    // *******************************
+    // ***************************
+    // End MCS reset
+    // ***************************
 
 
     // Get all processor targets

diff --git a/src/usr/isteps/istep14/makefile b/src/usr/isteps/istep14/makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2015,2018
+# Contributors Listed Below - COPYRIGHT 2015,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -78,7 +78,6 @@ OBJS += p9c_mss_thermal_init.o
 OBJS += p9c_mss_unmask_errors.o
 OBJS += p9c_mss_power_cleanup.o
 OBJS += p9c_cen_stopclocks.o
-# TODO: RTC 184860 Remove MCS acker workaround
 OBJS += p9_revert_sbe_mcs_setup.o
 
 #include ${PROCEDURE_PATH}/hwp/nest/p9_htm_setup.mk