Hostboot IPL Flow v0.95 Updates

Change-Id: Idb12755e59948c260124b07fe20a31396f7f41fe
RTC: 155066
CMVC-Coreq:995561
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25117
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: RAJESWARAN THILLAIGOVINDAN <rajeswgo@in.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

6 files changed, 94 insertions, 97 deletions

diff --git a/src/include/usr/isteps/istep06list.H b/src/include/usr/isteps/istep06list.H
index 79cfc92a0..a35169c29 100644
--- a/src/include/usr/isteps/istep06list.H
+++ b/src/include/usr/isteps/istep06list.H
@@ -31,7 +31,7 @@
  * @note    IStep definition for Hostboot - Slave SBE
  *
  *  IStep 06    Slave SBE
- *  IPL FLow Doc        v0.93 (04/04/16)
+ *  IPL FLow Doc        v0.95
  *
  *  06.1    host_bootloader
  *        : Host Bootloader (non-executable istep)
@@ -128,13 +128,13 @@ void* call_host_update_master_tpm( void *io_pArgs );
 void* host_gard( void *io_pArgs );
 
 /**
- * @brief   proc_revert_sbe_mcs_setup (istep 6.10)
+ * @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
  */
-void* call_proc_revert_sbe_mcs_setup (void * io_pArgs);
+void* call_host_revert_sbe_mcs_setup (void * io_pArgs);
 
 /**
  * @brief   host_start_occ_xstop_handler (istep 6.11)
@@ -146,13 +146,13 @@ void* call_proc_revert_sbe_mcs_setup (void * io_pArgs);
 void* host_start_occ_xstop_handler (void * io_pArgs);
 
 /**
- * @brief   host_setup_voltages (istep 6.12)
+ * @brief   host_voltage_config (istep 6.12)
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                              or NULL.
  *  return  any error logs to istep
  */
-void* call_host_setup_voltages (void * io_pArgs);
+void* call_host_voltage_config (void * io_pArgs);
 
 
 };
@@ -214,8 +214,8 @@ const   TaskInfo    g_istep06[]  =   {
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
         },
         {
-                ISTEPNAME(06,10,"proc_revert_sbe_mcs_setup"),
-                ISTEP_06::call_proc_revert_sbe_mcs_setup,
+                ISTEPNAME(06,10,"host_revert_sbe_mcs_setup"),
+                ISTEP_06::call_host_revert_sbe_mcs_setup,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
         },
         {
@@ -224,8 +224,8 @@ const   TaskInfo    g_istep06[]  =   {
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
         },
         {
-                ISTEPNAME(06,12,"host_setup_voltages"),
-                ISTEP_06::call_host_setup_voltages,
+                ISTEPNAME(06,12,"host_voltage_config"),
+                ISTEP_06::call_host_voltage_config,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
         },
 
diff --git a/src/include/usr/isteps/istep08list.H b/src/include/usr/isteps/istep08list.H
index 779aa2a0c..6f25fbb61 100644
--- a/src/include/usr/isteps/istep08list.H
+++ b/src/include/usr/isteps/istep08list.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -29,7 +29,7 @@
  * @file    istep08list.H
  *
  *  IStep 08        Nest Chiplets
- *  IPL FLow Doc    v0.67 (11/02/15)
+ *  IPL FLow Doc    v0.95
  *
  *    08.01    host_slave_sbe_config
  *           : Configure host slave sbe
@@ -39,29 +39,37 @@
  *           : Start cbs
  *    08.04    proc_check_slave_sbe_seeprom_complete
  *           : Check Slave SBE Complete
- *    08.05    proc_cen_ref_clk_enable
+ *    08.05    host_attnlisten_proc
+ *           : Start attention poll for all P9(s)
+ *    08.06    proc_cen_ref_clk_enable
  *           : Setup centaur ref clocks
- *    08.06    proc_attr_update
+ *    08.07    host_set_voltages
+ *           : Set correct chip voltages
+ *    08.08    host_p9_fbc_eff_config
+ *           : Determine powerbus config
+ *    08.09    host_p9_eff_config_links
+ *           : Powerbus link config
+ *    08.10    proc_attr_update
  *           : Proc ATTR Update
- *    08.07    proc_enable_osclite
+ *    08.11    proc_enable_osclite
  *           : Enable Osclite
- *    08.08    proc_chiplet_scominit
+ *    08.12    proc_chiplet_scominit
  *           : Scom inits to all chiplets (sans Quad)
- *    08.09    proc_xbus_scominit
+ *    08.13    proc_xbus_scominit
  *           : Apply scom inits to Xbus
- *    08.10    proc_abus_scominit
+ *    08.14    proc_abus_scominit
  *           : Apply scom inits to Abus
- *    08.11    proc_obus_scominit
+ *    08.15    proc_obus_scominit
  *           : Apply scom inits to Obus
- *    08.12    proc_npu_scominit
+ *    08.16    proc_npu_scominit
  *           : Apply scom inits to Npu
- *    08.13    proc_pcie_scominit
+ *    08.17    proc_pcie_scominit
  *           : Apply scom inits to PCIechiplets
- *    08.14    proc_scomoverride_chiplets
+ *    08.18    proc_scomoverride_chiplets
  *           : Apply sequenced scom inits
- *    08.15    proc_chiplet_enable_ridi
+ *    08.19    proc_chiplet_enable_ridi
  *           : Enable RI/DI chip wide
- *    08.16    host_rng_bist
+ *    08.20    host_rng_bist
  *           : Trigger Built In Self Test for RNG
  *  Please see the note in initsvcstructs.H for description of
  *      the ISTEPNAME macro.
@@ -277,62 +285,82 @@ namespace   INITSERVICE
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
         },
         {
-                ISTEPNAME(08,05,"proc_cen_ref_clk_enable"),
+                ISTEPNAME(08,05,"host_attnlisten_proc"),    // @TODO-RTC:154658
+                NULL,
+                { NONE, EXT_IMAGE, IPL_NOOP, false }
+        },
+        {
+                ISTEPNAME(08,06,"proc_cen_ref_clk_enable"),
                 ISTEP_08::call_proc_cen_ref_clk_enable,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
         },
         {
-                ISTEPNAME(08,06,"proc_attr_update"),
+                ISTEPNAME(08,07,"host_set_voltages"),       // @TODO-RTC:144620
+                NULL,
+                { NONE, EXT_IMAGE, IPL_NOOP, false }
+        },
+        {
+                ISTEPNAME(08,08,"host_p9_fbc_eff_config"),  // @TODO-RTC:154376
+                NULL,
+                { NONE, EXT_IMAGE, IPL_NOOP, false }
+        },
+        {
+                ISTEPNAME(08,09,"host_p9_eff_config_links"),// @TODO-RTC:154376
+                NULL,
+                { NONE, EXT_IMAGE, IPL_NOOP, false }
+        },
+        {
+                ISTEPNAME(08,10,"proc_attr_update"),
                 ISTEP_08::call_proc_attr_update,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
         },
         {
-                ISTEPNAME(08,07,"proc_enable_osclite"),
+                ISTEPNAME(08,11,"proc_enable_osclite"),
                 ISTEP_08::call_proc_enable_osclite,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
         },
         {
-                ISTEPNAME(08,08,"proc_chiplet_scominit"),
+                ISTEPNAME(08,12,"proc_chiplet_scominit"),
                 ISTEP_08::call_proc_chiplet_scominit,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
         },
         {
-                ISTEPNAME(08,09,"proc_xbus_scominit"),
+                ISTEPNAME(08,13,"proc_xbus_scominit"),
                 ISTEP_08::call_proc_xbus_scominit,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
         },
         {
-                ISTEPNAME(08,10,"proc_abus_scominit"),
+                ISTEPNAME(08,14,"proc_abus_scominit"),
                 ISTEP_08::call_proc_abus_scominit,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
         },
         {
-                ISTEPNAME(08,11,"proc_obus_scominit"),
+                ISTEPNAME(08,15,"proc_obus_scominit"),
                 ISTEP_08::call_proc_obus_scominit,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
         },
         {
-                ISTEPNAME(08,12,"proc_npu_scominit"),
+                ISTEPNAME(08,16,"proc_npu_scominit"),
                 ISTEP_08::call_proc_npu_scominit,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
         },
         {
-                ISTEPNAME(08,13,"proc_pcie_scominit"),
+                ISTEPNAME(08,17,"proc_pcie_scominit"),
                 ISTEP_08::call_proc_pcie_scominit,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
         },
         {
-                ISTEPNAME(08,14,"proc_scomoverride_chiplets"),
+                ISTEPNAME(08,18,"proc_scomoverride_chiplets"),
                 ISTEP_08::call_proc_scomoverride_chiplets,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
         },
         {
-                ISTEPNAME(08,15,"proc_chiplet_enable_ridi"),
+                ISTEPNAME(08,19,"proc_chiplet_enable_ridi"),
                 ISTEP_08::call_proc_chiplet_enable_ridi,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
         },
         {
-                ISTEPNAME(08,16,"host_rng_bist"),
+                ISTEPNAME(08,20,"host_rng_bist"),
                 ISTEP_08::call_host_rng_bist,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
         },
diff --git a/src/include/usr/isteps/istep09list.H b/src/include/usr/isteps/istep09list.H
index e133ad84c..10b2b9c9b 100644
--- a/src/include/usr/isteps/istep09list.H
+++ b/src/include/usr/isteps/istep09list.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -30,7 +30,7 @@
  * @file    istep09list.H
  *
  *  IStep 09    Activate PowerBus
- *  IPL FLow Doc        v0.67 (11/11/15)
+ *  IPL FLow Doc        v0.95
  *
  *    09.1    fabric_erepair
  *          : Restore Fabric Bus eRepair data
@@ -44,10 +44,10 @@
  *          : Advanced post EI/EDI training
  *    09.6    proc_smp_link_layer
  *          : Start SMP link layer
- *    09.7    host_startprd_pbus
- *          : Load PRD for powerbus domain
- *    09.9    proc_fab_iovalid
+ *    09.7    proc_fab_iovalid
  *          : Lower functional fences on local SMP
+ *    09.8    host_fbc_eff_config_aggregate
+ *          : Pick link(s) for coherency
  *
  *  Please see the note in initsvcstructs.H for description of
  *      the ISTEPNAME macro.
@@ -229,21 +229,16 @@ namespace   INITSERVICE
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
         },
         {
-                ISTEPNAME(09,07,"host_startprd_pbus"),
-                ISTEP_09::call_host_startprd_pbus,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(09,08,"host_attnlisten_proc"),
-                ISTEP_09::call_host_attnlisten_proc,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(09,09,"proc_fab_iovalid"),
+                ISTEPNAME(09,07,"proc_fab_iovalid"),
                 ISTEP_09::call_proc_fab_iovalid,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
-};
+        {
+                ISTEPNAME(09,08,"host_fbc_eff_config_aggregate"),
+                NULL,                                       // @TODO-RTC:154376
+                { NONE, EXT_IMAGE, IPL_NOOP, false }
+        },
+    };
 
 const DepModInfo  g_istep09Dependancies = {
     {
diff --git a/src/include/usr/isteps/istep12list.H b/src/include/usr/isteps/istep12list.H
index d44cf3ba8..5c1fde875 100644
--- a/src/include/usr/isteps/istep12list.H
+++ b/src/include/usr/isteps/istep12list.H
@@ -30,7 +30,7 @@
  * @file    istep12list.H
  *
  *  IStep 12    Step 12 DMI Training
- *  IPL FLow Doc        v0.93 (04/04/16)
+ *  IPL FLow Doc        v0.95
  *
  *  Please see the note in initsvcstructs.H for description of
  *      the ISTEPNAME macro.
@@ -75,6 +75,11 @@ const   TaskInfo    g_istep12[]  =   {
                 ISTEP_12::call_mss_getecid,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
+        {
+                ISTEPNAME(12,02,"host_attnlisten_memb"),    // @TODO-RTC:154658
+                NULL,
+                { NONE, EXT_IMAGE, IPL_NOOP, false }
+        },
 
 };
 
diff --git a/src/include/usr/isteps/istep13list.H b/src/include/usr/isteps/istep13list.H
index 3c737f1ae..2cb5fbd18 100644
--- a/src/include/usr/isteps/istep13list.H
+++ b/src/include/usr/isteps/istep13list.H
@@ -31,7 +31,7 @@
  * @file    istep13list.H
  *
  *  IStep 13    Step 13
- *  IPL FLow Doc        v0.93 (04/04/16)
+ *  IPL FLow Doc        v0.95
  *
  *  Please see the note in initsvcstructs.H for description of
  *      the ISTEPNAME macro.
@@ -93,16 +93,6 @@ void*    call_mem_pll_initf( void    *io_pArgs );
  */
 void*    call_mem_pll_setup( void    *io_pArgs );
 
-/**
- *  @brief   proc_mcs_skewadjust
- *
- *  param[in,out]   -   pointer to any arguments, usually NULL
- *
- *  return  any errlogs to istep
- *
- */
-void*    call_proc_mcs_skewadjust( void    *io_pArgs );
-
 
 /**
  *  @brief   mem_startclocks
@@ -221,8 +211,8 @@ const   TaskInfo    g_istep13[]  =   {
         },
         {
                 ISTEPNAME(13,05,"proc_mcs_skewadjust"),
-                ISTEP_13::call_proc_mcs_skewadjust,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
+                NULL,
+                { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
         {
                 ISTEPNAME(13,06,"mem_startclocks"),
diff --git a/src/include/usr/isteps/istep14list.H b/src/include/usr/isteps/istep14list.H
index aa6ccdce0..e55e2e095 100644
--- a/src/include/usr/isteps/istep14list.H
+++ b/src/include/usr/isteps/istep14list.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -29,9 +29,7 @@
  * @file    istep14list.H
  *
  *  IStep 14
- *  IPL FLow Doc        v0.67 (11/11/15)
- *    14.7    proc_setup_bars
- *          : Setup Memory BARs
+ *  IPL FLow Doc        v0.95
  *
  *  Please see the note in initsvcstructs.H for description of
  *      the ISTEPNAME macro.
@@ -45,17 +43,6 @@
 namespace   ISTEP_14
 {
 
-/**
- *  @brief   host_startprd_dram
- *
- *  param[in,out]   -   pointer to any arguments, usually NULL
- *
- *  return any errlogs to istep
- *
- */
-void*  call_host_startprd_dram( void    *io_pArgs );
-
-
 
 /**
  *  @brief   mss_memdiag
@@ -67,8 +54,6 @@ void*  call_host_startprd_dram( void    *io_pArgs );
  */
 void*    call_mss_memdiag( void    *io_pArgs );
 
-
-
 /**
  *  @brief   mss_thermal_init
  *
@@ -89,7 +74,6 @@ void*    call_mss_thermal_init( void    *io_pArgs );
  */
 void*    call_proc_pcie_config( void    *io_pArgs );
 
-
 /**
  *  @brief   mss_power_cleanup
  *
@@ -151,47 +135,42 @@ namespace   INITSERVICE
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
         {
-                ISTEPNAME(14,01,"host_startprd_dram"),
-                ISTEP_14::call_host_startprd_dram,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(14,02,"mss_memdiag"),
+                ISTEPNAME(14,01,"mss_memdiag"),
                 ISTEP_14::call_mss_memdiag,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
-                ISTEPNAME(14,03,"mss_thermal_init"),
+                ISTEPNAME(14,02,"mss_thermal_init"),
                 ISTEP_14::call_mss_thermal_init,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
-                ISTEPNAME(14,04,"proc_pcie_config"),
+                ISTEPNAME(14,03,"proc_pcie_config"),
                 ISTEP_14::call_proc_pcie_config,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
-                ISTEPNAME(14,05,"mss_power_cleanup"),
+                ISTEPNAME(14,04,"mss_power_cleanup"),
                 ISTEP_14::call_mss_power_cleanup,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
-                ISTEPNAME(14,06,"proc_setup_bars"),
+                ISTEPNAME(14,05,"proc_setup_bars"),
                 ISTEP_14::call_proc_setup_bars,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
-                ISTEPNAME(14,07,"proc_htm_setup"),
+                ISTEPNAME(14,06,"proc_htm_setup"),
                 ISTEP_14::call_proc_htm_setup,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
-                ISTEPNAME(14,08,"proc_exit_cache_contained"),
+                ISTEPNAME(14,07,"proc_exit_cache_contained"),
                 ISTEP_14::call_proc_exit_cache_contained,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
-                ISTEPNAME(14,09,"host_mpipl_service"),
+                ISTEPNAME(14,08,"host_mpipl_service"),
                 ISTEP_14::call_host_mpipl_service,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },