P9 - added new HWP's and removed old functions

Change-Id: Id64878834504858e7febf110bf50413ffaca0b73
RTC: 127334
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/17966
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

13 files changed, 261 insertions, 326 deletions

diff --git a/src/include/usr/isteps/istep06list.H b/src/include/usr/isteps/istep06list.H
index 6c1fade4f..d776c1f31 100644
--- a/src/include/usr/isteps/istep06list.H
+++ b/src/include/usr/isteps/istep06list.H
@@ -50,32 +50,24 @@ namespace   INITSERVICE
  * @note    IStep definition for Hostboot - Slave SBE
  *
  *  IStep 06    Slave SBE
- *  IPL FLow Doc        v1.37 (08/13/13)
+ *  IPL FLow Doc        v0.60 (06/02/15)
  *
- *  06.1    host_setup
+ *  06.1    host_bootloader
+ *        : Host Bootloader (non-executable istep)
+ *  06.2    host_setup
  *        : Setup host environment (non-executable istep)
- *  06.2    host_istep_enable
+ *  06.3    host_istep_enable
  *        : Hostboot istep ready (non-executable istep)
- *  06.3    host_init_fsi
+ *  06.4    host_init_fsi
  *        : Setup the FSI links to slave chips
- *  06.4    host_set_ipl_parms
+ *  06.5    host_set_ipl_parms
  *        : Build ipl parameters
- *  06.5    host_discover_targets
+ *  06.6    host_discover_targets
  *      :   Builds targeting
- *  06.6    host_gard
+ *  06.7    host_gard
  *      :   Do Gard
- *  06.7    host_cancontinue_clear
- *      :   Clear deconfigured states
- *  06.8    proc_revert_sbe_mcs_setup
+ *  06.8    host_revert_sbe_mcs_setup
  *      :   Clean up MCS extent regs
- *  06.9   host_slave_sbe_config
- *  06.10   host_sbe_start
- *  06.11   proc_check_slave_sbe_seeprom_complete
- *        : Check Slave SBE Complete
- *  06.12    proc_cen_ref_clk_enable
- *      :   Setup centaur ref clocks
- *  06.13   proc_xmit_sbe
- *        : vSBE Init of Slave Chips
  *
  */
 const   TaskInfo    g_istep06[]  =   {
@@ -85,27 +77,46 @@ const   TaskInfo    g_istep06[]  =   {
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
         {
-                ISTEPNAME(06,01,""),        // not used.
+                ISTEPNAME(06,01,""),        // not used. host bootloader
                 NULL,
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
         {
-                ISTEPNAME(06,02,""),        // not used.
+                ISTEPNAME(06,02,""),        // not used. host setup
                 NULL,
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
-
         {
-                ISTEPNAME(06,03,"host_init_fsi"),
+                ISTEPNAME(06,03,""),        // not used. host istep enable
+                NULL,
+                { NONE, EXT_IMAGE, IPL_NOOP, false }
+        },
+        {
+                ISTEPNAME(06,04,"host_init_fsi"),
                 HWAS::host_init_fsi,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false,
                         BASE_INITIALIZATION }
         },
         {
-                ISTEPNAME(06,05,"host_discover_targets"),
+                ISTEPNAME(06,05,"host_set_ipl_parms"),
+                HWAS::host_set_ipl_parms,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
+        },
+        {
+                ISTEPNAME(06,06,"host_discover_targets"),
                 HWAS::host_discover_targets,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
         },
+        {
+                ISTEPNAME(06,07, "host_gard"),
+                HWAS::host_gard,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
+        },
+        {
+                ISTEPNAME(06,08,"host_revert_sbe_mcs_setup"),
+                HWAS::call_p9_revert_sbe_mcs_setup,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
 };
 
 const DepModInfo  g_istep06Dependancies = {
diff --git a/src/include/usr/isteps/istep07list.H b/src/include/usr/isteps/istep07list.H
index 0563a036e..7520bdbed 100644
--- a/src/include/usr/isteps/istep07list.H
+++ b/src/include/usr/isteps/istep07list.H
@@ -29,26 +29,18 @@
  * @file    istep07list.H
  *
  *  IStep 07    Nest Chiplets
- *  IPL FLow Doc        v1.35 (04/11/13)
+ *  IPL FLow Doc        v0.60 (06/02/15)
  *
- *    07.1    proc_attr_update
- *          : Proc attr update
- *    07.2    proc_a_x_pci_dmi_pll_initf
- *          : PLL Initfile for A, X, PCIe, DMI
- *    07.3    proc_a_x_pci_dmi_pll_setup
- *          : Setup PLL for A, X, PCIe, DMI
- *    07.4    proc_startclock_chiplets
- *          : Start clocks on A, X, PCIe chiplets
- *    07.5    proc_chiplet_scominit
- *          : Apply scom inits to chiplets
- *    07.6    proc_xbus_scominit
- *          : Apply scom inits to Xbus
- *    07.7    proc_abus_scominit
- *          : Apply scom inits to Abus
- *    07.8    proc_pcie_scominit
- *          : Apply scom inits to PCIE  chiplets
- *    07.9    proc_scomoverride_chiplets
- *          : Apply sequenced scom inits
+ *    07.1    host_collect_dimm_spd
+ *          : Collect Master dimm SPD
+ *    07.2    mss_volt
+ *          : Calc dimm voltage
+ *    07.3    mss_freq
+ *          : Calc dimm frequency
+ *    07.4    mss_eff_config
+ *          : Determine effective config
+ *    07.5    mss_attr_update
+ *          : MSS ATTR update
  *
  *  Please see the note in initsvcstructs.H for description of
  *      the ISTEPNAME macro.
@@ -59,7 +51,7 @@
 #include    <initservice/initsvcreasoncodes.H>
 
 //  include prototypes file
-#include    "../../../usr/hwpf/hwp/nest_chiplets/nest_chiplets.H"
+#include    "../../../usr/hwpf/hwp/mc_config/mc_config.H"
 
 namespace   INITSERVICE
 {
@@ -69,14 +61,38 @@ namespace   INITSERVICE
                 NULL,
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
+        {
+                ISTEPNAME(07,01,"host_collect_dimm_spd"),
+                MC_CONFIG::call_host_collect_dimm_spd,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
+        },
+        {
+                ISTEPNAME(07,02,"mss_volt"),
+                MC_CONFIG::call_mss_volt,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
+        },
+        {
+                ISTEPNAME(07,03,"mss_freq"),
+                MC_CONFIG::call_mss_freq,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
+        },
+        {
+                ISTEPNAME(07,04,"mss_eff_config"),
+                MC_CONFIG::call_mss_eff_config,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
+        },
+        {
+                ISTEPNAME(07,05,"mss_attr_update"),
+                MC_CONFIG::call_mss_attr_update,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
+        },
 };
 
 
 const DepModInfo g_istep07Dependancies = {
     {
-        DEP_LIB(libnest_chiplets.so),
-        DEP_LIB(libslave_sbe.so),
-        DEP_LIB(libsecure_boot.so),
+        DEP_LIB(libmc_config.so),
+        DEP_LIB(libsbe.so),
         NULL
     }
 };
diff --git a/src/include/usr/isteps/istep08list.H b/src/include/usr/isteps/istep08list.H
index 7434b2abf..8bd0f19d1 100644
--- a/src/include/usr/isteps/istep08list.H
+++ b/src/include/usr/isteps/istep08list.H
@@ -28,29 +28,39 @@
 /**
  * @file    istep08list.H
  *
- *  IStep 08    EDI, EI Initialization
- *  IPL FLow Doc        v1.28 (12/03/12)
+ *  IStep 08        Nest Chiplets
+ *  IPL FLow Doc    v0.60 (06/02/15)
  *
- *    08.1    fabric_erepair
- *          : Restore Fabric/EDI Bus eRepair data
- *    08.2    fabric_io_dccal
- *          : Calibrate Fabric/EDI interfaces
- *    08.3    fabric_pre_trainadv
- *          : Advanced pre EI/EDI training
- *    08.4    fabric_io_run_training
- *          : Run training on internal buses
- *    08.5    fabric_post_trainadv
- *          : Advanced post EI/EDI training
- *    08.6    host_startprd_pbus
- *          : Load prd for powerbus domain
- *    08.7    host_attnlisten_proc
- *          : Start listening for attentions
- *    08.8    proc_fab_iovalid
- *          : Lower functional fences on local SMP
- *
- *  *****************************************************************
- *  THIS FILE WAS GENERATED ON 2012-04-11:1606
- *  *****************************************************************
+ *    08.01    host_slave_sbe_config
+ *           : Configure host slave sbe
+ *    08.02    host_setup_sbe
+ *           : Setup host sbe
+ *    08.03    host_cbs_start
+ *           : Start cbs
+ *    08.04    proc_check_slave_sbe_seeprom_complete
+ *           : Check Slave SBE Complete
+ *    08.05    proc_cen_ref_clk_enable
+ *           : Setup centaur ref clocks
+ *    08.06    proc_attr_update
+ *           : Proc ATTR Update
+ *    08.07    proc_enable_osclite
+ *           : Enable Osclite
+ *    08.08    proc_chiplet_scominit
+ *           : Scom inits to all chiplets (sans Quad)
+ *    08.09    proc_xbus_scominit
+ *           : Apply scom inits to Xbus
+ *    08.10    proc_abus_scominit
+ *           : Apply scom inits to Abus
+ *    08.11    proc_obus_scominit
+ *           : Apply scom inits to Obus
+ *    08.12    proc_npu_scominit
+ *           : Apply scom inits to Npu
+ *    08.13    proc_pcie_scominit
+ *           : Apply scom inits to PCIechiplets
+ *    08.14    proc_scomoverride_chiplets
+ *           : Apply sequenced scom inits
+ *    08.15    proc_chiplet_enable_ridi
+ *           : Enable RI/DI chip wide
  *
  *  Please see the note in initsvcstructs.H for description of
  *      the ISTEPNAME macro.
@@ -61,7 +71,8 @@
 #include    <initservice/initsvcreasoncodes.H>
 
 //  include prototypes file
-#include    "../../../usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.H"
+#include    "../../../usr/hwpf/hwp/nest_chiplets/nest_chiplets.H"
+#include    "../../../usr/hwpf/hwp/slave_sbe/slave_sbe.H"
 
 namespace   INITSERVICE
 {
@@ -71,20 +82,90 @@ namespace   INITSERVICE
                 NULL,
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
+        {
+                ISTEPNAME(08,01,"host_slave_sbe_config"),
+                SLAVE_SBE::call_host_slave_sbe_config,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+        {
+                ISTEPNAME(08,02,"host_setup_sbe"),
+                SLAVE_SBE::call_host_setup_sbe,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+        {
+                ISTEPNAME(08,03,"host_cbs_start"),
+                SLAVE_SBE::call_host_cbs_start,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+        {
+                ISTEPNAME(08,04,"proc_check_slave_sbe_seeprom_complete"),
+                SLAVE_SBE::call_proc_check_slave_sbe_seeprom_complete,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
+        },
+        {
+                ISTEPNAME(08,05,"proc_cen_ref_clk_enable"),
+                SLAVE_SBE::call_proc_cen_ref_clk_enable,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+        {
+                ISTEPNAME(08,06,"proc_attr_update"),
+                NEST_CHIPLETS::call_proc_attr_update,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+        {
+                ISTEPNAME(08,07,"proc_enable_osclite"),
+                NEST_CHIPLETS::call_proc_enable_osclite,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+        {
+                ISTEPNAME(08,08,"proc_chiplet_scominit"),
+                NEST_CHIPLETS::call_proc_chiplet_scominit,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+        {
+                ISTEPNAME(08,09,"proc_xbus_scominit"),
+                NEST_CHIPLETS::call_proc_xbus_scominit,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+        {
+                ISTEPNAME(08,10,"proc_abus_scominit"),
+                NEST_CHIPLETS::call_proc_abus_scominit,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+        {
+                ISTEPNAME(08,11,"proc_obus_scominit"),
+                NEST_CHIPLETS::call_proc_obus_scominit,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+        {
+                ISTEPNAME(08,12,"proc_npu_scominit"),
+                NEST_CHIPLETS::call_proc_npu_scominit,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+        {
+                ISTEPNAME(08,13,"proc_pcie_scominit"),
+                NEST_CHIPLETS::call_proc_pcie_scominit,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+        {
+                ISTEPNAME(08,14,"proc_scomoverride_chiplets"),
+                NEST_CHIPLETS::call_proc_scomoverride_chiplets,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+        {
+                ISTEPNAME(08,15,"proc_chiplet_enable_ridi"),
+                NEST_CHIPLETS::call_proc_chiplet_enable_ridi,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+
 };
 
 const DepModInfo g_istep08Dependancies = {
     {
-        DEP_LIB(libedi_ei_initialization.so),
-        DEP_LIB(libdmi_training.so),
         DEP_LIB(libnest_chiplets.so),
-        DEP_LIB(libsecure_boot.so),
         DEP_LIB(libslave_sbe.so),
         DEP_LIB(libsbe.so),
-        DEP_LIB(libbuild_winkle_images.so),
-#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
-        DEP_LIB(libocc.so),
-#endif
+        DEP_LIB(libpstates.so),
         NULL
     }
 };
diff --git a/src/include/usr/isteps/istep09list.H b/src/include/usr/isteps/istep09list.H
index 4ff5b9c2c..42441e25e 100644
--- a/src/include/usr/isteps/istep09list.H
+++ b/src/include/usr/isteps/istep09list.H
@@ -30,16 +30,24 @@
  * @file    istep09list.H
  *
  *  IStep 09    Activate PowerBus
- *  IPL FLow Doc        v1.28 (12/03/12)
+ *  IPL FLow Doc        v0.60 (06/02/15)
  *
- *    09.1    proc_build_smp
- *          : Integrate PgP Islands into SMP
- *    09.2    host_slave_sbe_update
- *          : placeholder for secure boot
- *
- *  *****************************************************************
- *  THIS FILE WAS GENERATED ON 2012-04-11:1607
- *  *****************************************************************
+ *    09.1    fabric_erepair
+ *          : Restore Fabric Bus eRepair data
+ *    09.2    fabric_io_dccal
+ *          : Calibrate Fabric interfaces
+ *    09.3    fabric_pre_trainadv
+ *          : Advanced pre training
+ *    09.4    fabric_io_run_training
+ *          : Run training on internal buses
+ *    09.5    fabric_post_trainadv
+ *          : 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
+ *          : Lower functional fences on local SMP
  *
  *  Please see the note in initsvcstructs.H for description of
  *      the ISTEPNAME macro.
@@ -50,7 +58,7 @@
 #include    <initservice/initsvcreasoncodes.H>
 
 //  include prototypes file
-#include    "../../../usr/hwpf/hwp/activate_powerbus/activate_powerbus.H"
+#include "../../../usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.H"
 #include <config.h>
 
 namespace   INITSERVICE
@@ -61,16 +69,57 @@ namespace   INITSERVICE
                 NULL,
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
+        {
+                ISTEPNAME(09,01,"fabric_erepair"),
+                EDI_EI_INITIALIZATION::call_fabric_erepair,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+        {
+                ISTEPNAME(09,02,"fabric_io_dccal"),
+                EDI_EI_INITIALIZATION::call_fabric_io_dccal,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+        {
+                ISTEPNAME(09,03,"fabric_pre_trainadv"),
+                EDI_EI_INITIALIZATION::call_fabric_pre_trainadv,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+        {
+                ISTEPNAME(09,04,"fabric_io_run_training"),
+                EDI_EI_INITIALIZATION::call_fabric_io_run_training,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+        {
+                ISTEPNAME(09,05,"fabric_post_trainadv"),
+                EDI_EI_INITIALIZATION::call_fabric_post_trainadv,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+        {
+                ISTEPNAME(09,06,"proc_smp_link_layer"),
+                EDI_EI_INITIALIZATION::call_proc_smp_link_layer,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+        {
+                ISTEPNAME(09,07,"host_startprd_pbus"),
+                EDI_EI_INITIALIZATION::call_host_startprd_pbus,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+        {
+                ISTEPNAME(09,08,"host_attnlisten_proc"),
+                EDI_EI_INITIALIZATION::call_host_attnlisten_proc,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+        {
+                ISTEPNAME(09,09,"proc_fab_iovalid"),
+                EDI_EI_INITIALIZATION::call_proc_fab_iovalid,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
+        },
 };
 
 const DepModInfo  g_istep09Dependancies = {
     {
-#ifndef CONFIG_VPO_COMPILE
-        DEP_LIB(libactivate_powerbus.so),
-        DEP_LIB(libdram_initialization.so),
+        DEP_LIB(libedi_ei_initialization.so),
         DEP_LIB(libsbe.so),
-        DEP_LIB(libbuild_winkle_images.so),
-#endif
         NULL
     }
 };
diff --git a/src/include/usr/isteps/istep10list.H b/src/include/usr/isteps/istep10list.H
index 50f3efcf1..155c924b5 100644
--- a/src/include/usr/isteps/istep10list.H
+++ b/src/include/usr/isteps/istep10list.H
@@ -30,40 +30,10 @@
  * @file    istep10list.H
  *
  *  Step 10 Hostboot SBE Centaur Init
- *  IPL FLow Doc        v1.28 (12/03/12)
+ *  IPL FLow Doc        v0.60 (06/02/15)
  *
- *    10.1    host_prd_hwreconfig
- *          : Hook for prd to handle reconfig
- *    10.2    cen_sbe_tp_chiplet_init1
- *          : TP Chiplet init
- *    10.3    cen_sbe_pll_initf
- *          : Program Nest PLL
- *    10.4    cen_sbe_pll_setup
- *          : Setup Nest PLL
- *    10.5    cen_sbe_tp_chiplet_init2
- *          : Cen TP Chiplet init 2
- *    10.6    cen_sbe_tp_arrayinit 
- *          : Cen TP Chiplet array init
- *    10.7    cen_sbe_tp_chiplet_init3
- *          : Cen TP Chiplet Start clocks
- *    10.8    cen_sbe_chiplet_init
- *          : Cen Chiplet Init
- *    10.9    cen_sbe_arrayinit
- *          : Chiplet arrayinit
- *    10.10   cen_sbe_dts_init
- *          : Cen DTS init
- *    10.11   cen_sbe_initf
- *          : Cen Scan overrides
- *    10.12   cen_sbe_do_manual_inits
- *          : Manual Cen Scans
- *    10.13   cen_sbe_nest_startclocks
- *          : Start Cen Nest
- *    10.14   cen_sbe_scominits
- *          : Perform any Cen scom inits
-
  *  Please see the note in initsvcstructs.H for description of
  *      the ISTEPNAME macro.
- *
  */
 
 #include    <initservice/initsvcstructs.H>
@@ -86,18 +56,6 @@ const   TaskInfo    g_istep10[]  =   {
 
 const DepModInfo g_istep10Dependancies = {
     {
-#ifndef CONFIG_VPO_COMPILE
-        DEP_LIB(libsbe_centaur_init.so),
-        DEP_LIB(libfapiporeve.so),
-        DEP_LIB(libporeve.so),
-        DEP_LIB(libbuild_winkle_images.so),
-        DEP_LIB(libsbe.so),
-        DEP_LIB(libproc_hwreconfig.so),
-        DEP_LIB(libslave_sbe.so),
-#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
-        DEP_LIB(libocc.so),
-#endif
-#endif
         NULL
     }
 };
diff --git a/src/include/usr/isteps/istep11list.H b/src/include/usr/isteps/istep11list.H
index b92df8018..df30a3758 100644
--- a/src/include/usr/isteps/istep11list.H
+++ b/src/include/usr/isteps/istep11list.H
@@ -26,35 +26,9 @@
 #define __ISTEPS_ISTEP11LIST_H
 
 /**
- * list of functions called for DMI Training - ISTEP 11 according to Dean's
- *  IPL Flow Doc        v1.35 (04/11/13)
+ * list of functions called for ISTEP 11 according to Dean's
+ *  IPL Flow Doc        v0.60 (06/02/15)
  *
- * 11.1  mss_getecid
- *       :  Read out ECID orff all Centaurs
- * 11.2  dmi_attr_update
- *       :DMI ATTR update
- * 11.3  proc_dmi_scominit
- *       :  DMI Scom setup on P8 MCS
- * 11.4  dmi_scominit
- *       :  Scom setup on centaur
- * 11.5  dmi_erepair
- *          : Restore EDI Bus eRepair data
- * 11.6  dmi_io_dccal
- *       : Calibrate DMI interfaces
- * 11.7  dmi_pre_trainadv
- *       : Advanced pre DMI training
- * 11.8  dmi_io_run_training
- *       : Run training on MC buses
- * 11.9  dmi_post_trainadv
- *       : Advanced post DMI training
- * 11.10 proc_cen_framelock
- *       : Initialize EDI Frame
- * 11.11 host_startprd_dmi
- *       : Load prd for DMI domain
- * 11.12 host_attnlisten_cen
- *       : Start listening for attentions
- * 11.13 cen_set_inband_addr
- *       : Set the Inband base addresses
  */
 
 /**
@@ -86,13 +60,6 @@ const   TaskInfo    g_istep11[]  =   {
 
 const DepModInfo g_istep11Dependancies = {
     {
-#ifndef CONFIG_VPO_COMPILE
-        DEP_LIB(libdmi_training.so),
-        DEP_LIB(libedi_ei_initialization.so),
-        DEP_LIB(libnest_chiplets.so),
-        DEP_LIB(libsecure_boot.so),
-        DEP_LIB(libslave_sbe.so),
-#endif
         NULL
     }
 };
diff --git a/src/include/usr/isteps/istep12list.H b/src/include/usr/isteps/istep12list.H
index 9d2c213f4..111a16b58 100644
--- a/src/include/usr/isteps/istep12list.H
+++ b/src/include/usr/isteps/istep12list.H
@@ -29,23 +29,8 @@
 /**
  * @file    istep12list.H
  *
- *  IStep 12    Step 12 MC Config
- *  IPL FLow Doc        v1.35 (04/11/13)
- *
- *  12.1      host_collect_dimm_spd
- *  	: Collect Master dimm SPD
-  *  12.2     mss_volt
- *  	: Calc dimm voltage
- *  12.3      mss_freq
- *  	: Calc dimm frequency
- *  12.4      mss_eff_config
- *  	: Determine effective config
- *  12.5      mss_attr_update
- *      : MSS ATTR update
-*
-*  *****************************************************************
- *  THIS FILE WAS GENERATED ON 2012-03-01:1032
- *  *****************************************************************
+ *  IStep 12    Step 12 DMI Training
+ *  IPL FLow Doc        v0.60 (06/02/15)
  *
  *  Please see the note in initsvcstructs.H for description of
  *      the ISTEPNAME macro.
@@ -69,40 +54,11 @@ const   TaskInfo    g_istep12[]  =   {
                 NULL,
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
-// To reduce extended image size for VPO
-#ifndef CONFIG_VPO_COMPILE
-        {
-                ISTEPNAME(12,01,"host_collect_dimm_spd"),
-                MC_CONFIG::call_host_collect_dimm_spd,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(12,02,"mss_volt"),
-                MC_CONFIG::call_mss_volt,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(12,03,"mss_freq"),
-                MC_CONFIG::call_mss_freq,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(12,04,"mss_eff_config"),
-                MC_CONFIG::call_mss_eff_config,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-#endif
 
 };
 
 const DepModInfo g_istep12Dependancies = {
     {
-// To reduce extended image size for VPO
-#ifndef CONFIG_VPO_COMPILE
-        DEP_LIB(libmc_config.so),
-#endif
-        DEP_LIB(libsbe.so),
-        DEP_LIB(libbuild_winkle_images.so),
         NULL
     }
 };
diff --git a/src/include/usr/isteps/istep13list.H b/src/include/usr/isteps/istep13list.H
index 73ea3483b..b8169edcc 100644
--- a/src/include/usr/isteps/istep13list.H
+++ b/src/include/usr/isteps/istep13list.H
@@ -30,36 +30,8 @@
 /**
  * @file    istep13list.H
  *
- *  IStep 13    Step 13 DRAM Training
- *  IPL FLow Doc        v1.37 (08/13/13)
- *
- *  13.1      host_disable_vddr
- *      : Disable VDDR on CanContinue loops
- *  13.2      mem_pll_initf
- *      : PLL Initfile for MBAs
- *  13.3      mem_pll_setup
- *      : Setup PLL for MBAs
- *  13.4      mem_startclocks
- *      : Start clocks on MBAs
- *  13.5      host_enable_vddr
- *      : Enable the VDDR3 Voltage Rail
- *  13.6      mss_scominit
- *      : Perform scom inits to MC and PHY
- *  13.7      mss_ddr_phy_reset
- *      : Soft reset of DDR PHY macros
- *  13.8      mss_draminit
- *      : Dram initialize
- *  13.9      mss_draminit_training
- *      : Dram training
- *  13.10     mss_draminit_trainadv
- *      : Advanced dram training
- *  13.11     mss_draminit_mc
- *      : Hand off control to MC
- *  13.12 mss_dimm_power_test
- *
- *  *****************************************************************
- *  THIS FILE WAS GENERATED ON 2012-02-27:2142
- *  *****************************************************************
+ *  IStep 13    Step 13
+ *  IPL FLow Doc        v0.60 (06/02/15)
  *
  *  Please see the note in initsvcstructs.H for description of
  *      the ISTEPNAME macro.
@@ -85,11 +57,6 @@ const   TaskInfo    g_istep13[]  =   {
 
 const DepModInfo g_istep13Dependancies = {
     {
-#ifndef CONFIG_VPO_COMPILE
-        DEP_LIB(libdram_training.so),
-        DEP_LIB(libdram_initialization.so),
-        DEP_LIB(libmc_config.so),
-#endif
         NULL
     }
 };
diff --git a/src/include/usr/isteps/istep14list.H b/src/include/usr/isteps/istep14list.H
index db0acb600..b21d9c728 100644
--- a/src/include/usr/isteps/istep14list.H
+++ b/src/include/usr/isteps/istep14list.H
@@ -28,28 +28,10 @@
 /**
  * @file    istep14list.H
  *
- *  IStep 14    Dram Initialization
- *  IPL FLow Doc        v1.41 (11/08/13)
- *
- *    14.1    host_startprd_dram
- *          : Load prd for DRAM domain
- *    14.2    mss_extent_setup
- *          : MSS Extent Setup
- *    14.3    mss_memdiag
- *          : Mainstore Pattern Testing
- *    14.4    mss_thermal_init
- *          : Initialize the thermal sensor
- *    14.5    proc_pcie_config
- *          : Configure the PHBs
- *    14.6    mss_power_cleanup
- *          : Clean up any MCS/Centaurs
+ *  IStep 14
+ *  IPL FLow Doc        v0.60 (06/02/15)
  *    14.7    proc_setup_bars
  *          : Setup Memory BARs
- *    14.8    proc_exit_cache_contained
- *          : Allow execution from memory
- *    14.9    host_mpipl_service
- *          : Perform MPIPL tasks
- *
  *
  *  Please see the note in initsvcstructs.H for description of
  *      the ISTEPNAME macro.
@@ -71,28 +53,15 @@ namespace   INITSERVICE
                 NULL,
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
-
-// Reduce ext img for VPO
-#ifndef CONFIG_VPO_COMPILE
         {
                 ISTEPNAME(14,07,"proc_setup_bars"),
                 DRAM_INITIALIZATION::call_proc_setup_bars,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
-#endif
     };
 
 const DepModInfo g_istep14Dependancies = {
     {
-#ifndef CONFIG_VPO_COMPILE
-        DEP_LIB(libdram_initialization.so),
-        DEP_LIB(libdram_training.so),
-        DEP_LIB(libdump.so),
-        DEP_LIB(libnest_chiplets.so),
-#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
-        DEP_LIB(libocc.so),
-#endif
-#endif
         NULL
     }
 };
diff --git a/src/include/usr/isteps/istep15list.H b/src/include/usr/isteps/istep15list.H
index 659e57620..120828eda 100644
--- a/src/include/usr/isteps/istep15list.H
+++ b/src/include/usr/isteps/istep15list.H
@@ -29,15 +29,10 @@
  * @file    istep15list.H
  *
  *  IStep 15    Build Winkle Images
- *  IPL FLow Doc        v1.28 (12/03/12)
+ *  IPL FLow Doc        v0.60 (06/02/15)
  *
  *    15.1    host_build_winkle
  *          : Build runtime winkle images
- *    15.2    proc_set_pore_bar
- *          : Tell SLW Eng where winkle image is
- *    15.3    proc_poreslw_init
- *          : Initialize the PORE-SLW engine
- *
  *
  *  Please see the note in initsvcstructs.H for description of
  *      the ISTEPNAME macro.
@@ -60,25 +55,20 @@ namespace   INITSERVICE
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
 
-// To reduce extended image size for VPO, don't run these isteps in VPO
-#ifndef CONFIG_VPO_COMPILE
         {
                 ISTEPNAME(15,01,"host_build_winkle"),
                 BUILD_WINKLE_IMAGES::call_host_build_winkle,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, true,
                         SEC_PROCESSOR_INIT }
         },
-#endif        
 
 };
 
 
 const DepModInfo g_istep15Dependancies = {
     {
-#ifndef CONFIG_VPO_COMPILE
         DEP_LIB(libocc.so),
         DEP_LIB(libbuild_winkle_images.so),
-#endif
         NULL
     }
 };
diff --git a/src/include/usr/isteps/istep16list.H b/src/include/usr/isteps/istep16list.H
index 9fab5aa6c..1dc407687 100644
--- a/src/include/usr/isteps/istep16list.H
+++ b/src/include/usr/isteps/istep16list.H
@@ -30,20 +30,10 @@
  * @file    istep16list.H
  *
  *  IStep 16    Core Activate
- *  IPL FLow Doc        v1.41 (11/08/13)
+ *  IPL FLow Doc        v0.60 (06/02/15)
  *
  *    16.1    host_activate_master
  *          : Activate master core
- *    16.2    host_activate_slave_cores
- *          : Activate slave cores
- *    16.3    mss_scrub
- *          : Start background scrub
- *    16.4    host_ipl_complete
- *          : Notify FSP drawer ipl complete
- *
- *  *****************************************************************
- *  THIS FILE WAS GENERATED ON 2012-04-11:1609
- *  *****************************************************************
  *
  *  Please see the note in initsvcstructs.H for description of
  *      the ISTEPNAME macro.
diff --git a/src/include/usr/isteps/istep18list.H b/src/include/usr/isteps/istep18list.H
index b96fcd36f..b9112ce29 100644
--- a/src/include/usr/isteps/istep18list.H
+++ b/src/include/usr/isteps/istep18list.H
@@ -29,16 +29,7 @@
  * @file    istep18list.H
  *
  *  IStep 18    Establish System SMP
- *  IPL FLow Doc        v1.39 (12/09/13)
- *
- *    18.13    proc_tod_setup
- *          : Create TOD topology
- *    18.14    proc_tod_init
- *          : Start TOD to running state
- *
- *  *****************************************************************
- *  THIS FILE WAS PARTIALLY GENERATED ON 2012-04-11:1611
- *  *****************************************************************
+ *  IPL FLow Doc        v0.60 (06/02/15)
  *
  *  Please see the note in initsvcstructs.H for description of
  *      the ISTEPNAME macro.
@@ -120,9 +111,6 @@ namespace   INITSERVICE
 
 const DepModInfo g_istep18Dependancies = {
     {
-#ifndef CONFIG_VPO_COMPILE
-        DEP_LIB(libtod_init.so),
-#endif
         NULL
     }
 };
diff --git a/src/include/usr/isteps/istep21list.H b/src/include/usr/isteps/istep21list.H
index d69184b44..5215368b1 100644
--- a/src/include/usr/isteps/istep21list.H
+++ b/src/include/usr/isteps/istep21list.H
@@ -31,7 +31,7 @@
  * @file    istep21list.H
  *
  *  IStep 21    Start Payload
- *  IPL FLow Doc        v1.18 (10/18/12)
+ *  IPL FLow Doc        v0.60 (06/02/15)
  *
  *    21.1    host_runtime_setup
  *          :  Start Payload
@@ -40,9 +40,6 @@
  *    21.3    host_start_payload
  *          :  Start Payload
  *
- *  *****************************************************************
- *  THIS FILE WAS GENERATED ON 2012-04-11:1613
- *  *****************************************************************
  *
  *  Please see the note in initsvcstructs.H for description of
  *      the ISTEPNAME macro.
@@ -64,9 +61,6 @@ namespace   INITSERVICE
                 NULL,
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
-
-// To reduce extended image size for VPO, don't run these isteps in VPO
-#ifndef CONFIG_VPO_COMPILE
         {
                 ISTEPNAME(21,01,"host_runtime_setup"),
                 START_PAYLOAD::call_host_runtime_setup,
@@ -82,7 +76,6 @@ namespace   INITSERVICE
                 START_PAYLOAD::call_host_start_payload,
                 { START_FN, EXT_IMAGE, MPIPL_OP | NORMAL_IPL_OP, false }
         },
-#endif
 
 };