Update ISTEP to IPL Flow v0.93

Includes a lot of deletes and a few renames.

Change-Id: I36ce351d307d43d67c8dfe4dbe3a94e67380cc20
RTC: 147800
CMVC-Prereq:993409
CMVC-Prereq:992647
CMVC-Prereq:993648
CMVC-Prereq:993634
CMVC-Prereq:993940
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/23732
Tested-by: Jenkins Server
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: FSP CI Jenkins
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

6 files changed, 116 insertions, 233 deletions

diff --git a/src/include/usr/isteps/istep06list.H b/src/include/usr/isteps/istep06list.H
index 296c9c053..79cfc92a0 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.67 (11/02/15)
+ *  IPL FLow Doc        v0.93 (04/04/16)
  *
  *  06.1    host_bootloader
  *        : Host Bootloader (non-executable istep)
@@ -39,20 +39,24 @@
  *        : Setup host environment (non-executable istep)
  *  06.3    host_istep_enable
  *        : Hostboot istep ready (non-executable istep)
- *  06.4    host_init_fsi
+ *  06.4    host_init_bmc_pcie
+ *        : Setup the PCIE to the BMC chip
+ *  06.5    host_init_fsi
  *        : Setup the FSI links to slave chips
- *  06.5    host_set_ipl_parms
+ *  06.6    host_set_ipl_parms
  *        : Build ipl parameters
- *  06.6    host_discover_targets
+ *  06.7    host_discover_targets
  *      :   Builds targeting
- *  06.7    host_update_master_tpm
+ *  06.8    host_update_master_tpm
  *      :   Update master TPM
- *  06.8    host_gard
+ *  06.9    host_gard
  *      :   Do Gard
- *  06.9    proc_revert_sbe_mcs_setup
+ *  06.10   proc_revert_sbe_mcs_setup
  *      :   Clean up MCS extent regs
- *  06.10   host_start_occ_xstop_handler
- *      :
+ *  06.11   host_start_occ_xstop_handler
+ *      :   Start OpenPOWER xstop
+ *  06.12   host_setup_voltages
+ *      :   Set correct chip voltage
  *
  */
 
@@ -61,8 +65,9 @@
 
 namespace ISTEP_06
 {
+
 /**
- * @brief   host_init_fsi   Setup the FSI links to slave chips (istep 6.4)
+ * @brief   host_init_fsi   Setup the FSI links to slave chips (istep 6.5)
  *
  *  Call into the hwas platform-specific initHardware() function
  *  to init the FSI hardware.
@@ -74,7 +79,7 @@ namespace ISTEP_06
 void* host_init_fsi( void *io_pArgs );
 
 /**
- * @brief   host_set_ipl_parms  Build ipl parameters (istep 6.5)
+ * @brief   host_set_ipl_parms  Build ipl parameters (istep 6.6)
  *
  *  TBD
  *
@@ -85,7 +90,7 @@ void* host_init_fsi( void *io_pArgs );
 void* host_set_ipl_parms( void *io_pArgs );
 
 /**
- * @brief   host_discover_targets   Builds targeting (istep 6.6)
+ * @brief   host_discover_targets   Builds targeting (istep 6.7)
  *
  *  This routine will walk through all the targets and initialize HWAS STATE
  *  to a known default value.
@@ -102,7 +107,7 @@ void* host_set_ipl_parms( void *io_pArgs );
 void* host_discover_targets( void *io_pArgs );
 
 /**
- * @brief   call_host_update_master_tpm (istep 6.7)
+ * @brief   call_host_update_master_tpm (istep 6.8)
  *
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
@@ -112,7 +117,7 @@ void* host_discover_targets( void *io_pArgs );
 void* call_host_update_master_tpm( void *io_pArgs );
 
 /**
- * @brief   host_gard   Do Gard (istep 6.8)
+ * @brief   host_gard   Do Gard (istep 6.9)
  *
  * Collect GARD information and apply it to the target states.
  *
@@ -123,7 +128,7 @@ void* call_host_update_master_tpm( void *io_pArgs );
 void* host_gard( void *io_pArgs );
 
 /**
- * @brief   proc_revert_sbe_mcs_setup (istep 6.9)
+ * @brief   proc_revert_sbe_mcs_setup (istep 6.10)
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                              or NULL.
@@ -132,7 +137,7 @@ void* host_gard( void *io_pArgs );
 void* call_proc_revert_sbe_mcs_setup (void * io_pArgs);
 
 /**
- * @brief   host_start_occ_xstop_handler (istep 6.10)
+ * @brief   host_start_occ_xstop_handler (istep 6.11)
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                              or NULL.
@@ -140,6 +145,14 @@ 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)
+ *
+ *  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);
 
 
 };
@@ -170,41 +183,51 @@ const   TaskInfo    g_istep06[]  =   {
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
         {
-                ISTEPNAME(06,04,"host_init_fsi"),
+                ISTEPNAME(06,04,""),        // No support for now. init bmc pcie
+                NULL,
+                { NONE, EXT_IMAGE, IPL_NOOP, false }
+        },
+        {
+                ISTEPNAME(06,05,"host_init_fsi"),
                 ISTEP_06::host_init_fsi,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false,
                         BASE_INITIALIZATION }
         },
         {
-                ISTEPNAME(06,05,"host_set_ipl_parms"),
+                ISTEPNAME(06,06,"host_set_ipl_parms"),
                 ISTEP_06::host_set_ipl_parms,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
         },
         {
-                ISTEPNAME(06,06,"host_discover_targets"),
+                ISTEPNAME(06,07,"host_discover_targets"),
                 ISTEP_06::host_discover_targets,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
         },
         {
-                ISTEPNAME(06,07,"host_update_master_tpm"),
+                ISTEPNAME(06,08,"host_update_master_tpm"),
                 ISTEP_06::call_host_update_master_tpm,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
         },
         {
-                ISTEPNAME(06,08, "host_gard"),
+                ISTEPNAME(06,09, "host_gard"),
                 ISTEP_06::host_gard,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
         },
         {
-                ISTEPNAME(06,09,"proc_revert_sbe_mcs_setup"),
+                ISTEPNAME(06,10,"proc_revert_sbe_mcs_setup"),
                 ISTEP_06::call_proc_revert_sbe_mcs_setup,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
         },
         {
-                ISTEPNAME(06,10,"host_start_occ_xstop_handler"),
+                ISTEPNAME(06,11,"host_start_occ_xstop_handler"),
                 ISTEP_06::host_start_occ_xstop_handler,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
         },
+        {
+                ISTEPNAME(06,12,"host_setup_voltages"),
+                ISTEP_06::call_host_setup_voltages,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
 
 };
 
diff --git a/src/include/usr/isteps/istep07list.H b/src/include/usr/isteps/istep07list.H
index 17333e0b5..e18f6a890 100644
--- a/src/include/usr/isteps/istep07list.H
+++ b/src/include/usr/isteps/istep07list.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,10 +29,10 @@
  * @file    istep07list.H
  *
  *  IStep 07    Nest Chiplets
- *  IPL FLow Doc        v0.67 (11/02/15)
+ *  IPL FLow Doc        v0.93 (04/04/16)
  *
- *    07.1    host_collect_dimm_spd
- *          : Collect Master dimm SPD
+ *    07.1    host_mss_attr_cleanup
+ *          : Clean up attributes
  *    07.2    mss_volt
  *          : Calc dimm voltage
  *    07.3    mss_freq
@@ -54,16 +54,18 @@
 namespace   ISTEP_07
 {
 /**
- *  @brief   host_collect_dimm_spd
+ *  @brief   host_mss_attr_cleanup
  *
- *           Collect Master dimm SPD
+ *           Clean up attributes on reconfig loops
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                              or NULL.
  *  return  any error logs to istep
  *
  */
-void*    call_host_collect_dimm_spd( void * io_pArgs );
+void*    call_host_mss_attr_cleanup( void * io_pArgs );
+
+
 
 /**
  *  @brief   mss_volt
@@ -131,9 +133,9 @@ namespace   INITSERVICE
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
         {
-                ISTEPNAME(07,01,"host_collect_dimm_spd"),
-                ISTEP_07::call_host_collect_dimm_spd,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
+                ISTEPNAME(07,01,""),
+                NULL,
+                { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
         {
                 ISTEPNAME(07,02,"mss_volt"),
diff --git a/src/include/usr/isteps/istep11list.H b/src/include/usr/isteps/istep11list.H
index d5fc9afb6..4a44800ee 100644
--- a/src/include/usr/isteps/istep11list.H
+++ b/src/include/usr/isteps/istep11list.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -27,7 +27,7 @@
 
 /**
  * list of functions called for ISTEP 11 according to Dean's
- *  IPL Flow Doc        v0.67 (11/11/15)
+ *  IPL FLow Doc        v0.93 (04/04/16)
  *
  */
 
@@ -60,71 +60,6 @@ namespace   ISTEP_11
 void*  call_host_prd_hwreconfig( void    *io_pArgs );
 
 
-
-/**
- *  @brief   cen sbe tp chiplet init1
- *
- *  param[in,out]   -   pointer to any arguments, usually NULL
- *
- *  return  any errlogs to istep 
- *
- */
-void*    call_cen_sbe_tp_chiplet_init1( void    *io_pArgs );
-
-
-
-/**
- *  @brief   cen sbe pll initf
- *
- *  param[in,out]   -   pointer to any arguments, usually NULL
- *
- *  return  any errlogs to istep 
- *
- */
-void*    call_cen_sbe_pll_initf( void    *io_pArgs );
-
-/**
- *  @brief   cen sbe pll setup
- *
- *  param[in,out]   -   pointer to any arguments, usually NULL
- *
- *  return  any errlogs to istep 
- *
- */
-void*    call_cen_sbe_pll_setup( void    *io_pArgs );
-
-
-/**
- *  @brief   cen sbe tp chiplet init2
- *
- *  param[in,out]   -   pointer to any arguments, usually NULL
- *
- *  return  any errlogs to istep 
- *
- */
-void*    call_cen_sbe_tp_chiplet_init2( void    *io_pArgs );
-
-/**
- *  @brief   cen sbe tp arrayinit
- *
- *  param[in,out]   -   pointer to any arguments, usually NULL
- *
- *  return  any errlogs to istep 
- *
- */
-void*    call_cen_sbe_tp_arrayinit( void    *io_pArgs );
-
-/**
- *  @brief   cen sbe tp chiplet init3
- *
- *  param[in,out]   -   pointer to any arguments, usually NULL
- *
- *  return  any errlogs to istep 
- *
- */
-void*    call_cen_sbe_tp_chiplet_init3( void    *io_pArgs );
-
-
 };
 
 
@@ -142,36 +77,7 @@ const   TaskInfo    g_istep11[]  =   {
                 ISTEP_11::call_host_prd_hwreconfig,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
-        {
-                ISTEPNAME(11,02,"cen_sbe_tp_chiplet_init1"),
-                ISTEP_11::call_cen_sbe_tp_chiplet_init1,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(11,03,"cen_sbe_pll_initf"),
-                ISTEP_11::call_cen_sbe_pll_initf,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(11,04,"cen_sbe_pll_setup"),
-                ISTEP_11::call_cen_sbe_pll_setup,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(11,05,"cen_sbe_tp_chiplet_init2"),
-                ISTEP_11::call_cen_sbe_tp_chiplet_init2,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(11,06,"cen_sbe_tp_arrayinit"),
-                ISTEP_11::call_cen_sbe_tp_arrayinit,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(11,07,"cen_sbe_tp_chiplet_init3"),
-                ISTEP_11::call_cen_sbe_tp_chiplet_init3,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
+
 };
 
 const DepModInfo g_istep11Dependancies = {
diff --git a/src/include/usr/isteps/istep12list.H b/src/include/usr/isteps/istep12list.H
index 281ef6c0d..d44cf3ba8 100644
--- a/src/include/usr/isteps/istep12list.H
+++ b/src/include/usr/isteps/istep12list.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] Google Inc.                                                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
@@ -30,7 +30,7 @@
  * @file    istep12list.H
  *
  *  IStep 12    Step 12 DMI Training
- *  IPL FLow Doc        v0.67 (11/11/15)
+ *  IPL FLow Doc        v0.93 (04/04/16)
  *
  *  Please see the note in initsvcstructs.H for description of
  *      the ISTEPNAME macro.
@@ -58,61 +58,6 @@ namespace   ISTEP_12
 void*  call_mss_getecid( void    *io_pArgs );
 
 
-
-/**
- *  @brief   dmi attr update
- *
- *  param[in,out]   -   pointer to any arguments, usually NULL
- *
- *  return  any errlogs to istep 
- *
- */
-void*    call_dmi_attr_update( void    *io_pArgs );
-
-
-
-/**
- *  @brief   proc dmi scominit
- *
- *  param[in,out]   -   pointer to any arguments, usually NULL
- *
- *  return  any errlogs to istep 
- *
- */
-void*    call_proc_dmi_scominit( void    *io_pArgs );
-
-/**
- *  @brief   dmi scominit
- *
- *  param[in,out]   -   pointer to any arguments, usually NULL
- *
- *  return  any errlogs to istep 
- *
- */
-void*    call_dmi_scominit( void    *io_pArgs );
-
-
-/**
- *  @brief   dmi erepair
- *
- *  param[in,out]   -   pointer to any arguments, usually NULL
- *
- *  return  any errlogs to istep 
- *
- */
-void*    call_dmi_erepair( void    *io_pArgs );
-
-/**
- *  @brief   dmi io dccal
- *
- *  param[in,out]   -   pointer to any arguments, usually NULL
- *
- *  return  any errlogs to istep 
- *
- */
-void*    call_dmi_io_dccal( void    *io_pArgs );
-
-
 };
 
 
@@ -130,31 +75,6 @@ const   TaskInfo    g_istep12[]  =   {
                 ISTEP_12::call_mss_getecid,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
-        {
-                ISTEPNAME(12,02,"dmi_attr_update"),
-                ISTEP_12::call_dmi_attr_update,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(12,03,"proc_dmi_scominit"),
-                ISTEP_12::call_proc_dmi_scominit,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(12,04,"dmi_scominit"),
-                ISTEP_12::call_dmi_scominit,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(12,05,"dmi_erepair"),
-                ISTEP_12::call_dmi_erepair,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(12,06,"dmi_io_dccal"),
-                ISTEP_12::call_dmi_io_dccal,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
 
 };
 
diff --git a/src/include/usr/isteps/istep13list.H b/src/include/usr/isteps/istep13list.H
index 7ab413769..3c737f1ae 100644
--- a/src/include/usr/isteps/istep13list.H
+++ b/src/include/usr/isteps/istep13list.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] Google Inc.                                                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
@@ -31,7 +31,7 @@
  * @file    istep13list.H
  *
  *  IStep 13    Step 13
- *  IPL FLow Doc        v0.67 (11/11/15)
+ *  IPL FLow Doc        v0.93 (04/04/16)
  *
  *  Please see the note in initsvcstructs.H for description of
  *      the ISTEPNAME macro.
@@ -48,14 +48,26 @@ namespace   ISTEP_13
 {
 
 /**
- *  @brief   host_disable_vddr
+ *  @brief   host_disable_memvolt
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
  *  return any errlogs to istep
  *
  */
-void*  call_host_disable_vddr( void    *io_pArgs );
+void*  call_host_disable_memvolt( void    *io_pArgs );
+
+
+
+/**
+ *  @brief   mem_pll_reset
+ *
+ *  param[in,out]   -   pointer to any arguments, usually NULL
+ *
+ *  return  any errlogs to istep
+ *
+ */
+void*    call_mem_pll_reset( void    *io_pArgs );
 
 
 
@@ -103,14 +115,14 @@ void*    call_proc_mcs_skewadjust( void    *io_pArgs );
 void*    call_mem_startclocks( void    *io_pArgs );
 
 /**
- *  @brief   host_enable_vddr
+ *  @brief   host_enable_memvolt
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
  *  return  any errlogs to istep
  *
  */
-void*    call_host_enable_vddr( void    *io_pArgs );
+void*    call_host_enable_memvolt( void    *io_pArgs );
 
 /**
  *  @brief   mss_scominit
@@ -188,62 +200,67 @@ const   TaskInfo    g_istep13[]  =   {
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
         {
-                ISTEPNAME(13,01,"host_disable_vddr"),
-                ISTEP_13::call_host_disable_vddr,
+                ISTEPNAME(13,01,"host_disable_memvolt"),
+                ISTEP_13::call_host_disable_memvolt,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
+        },
+        {
+                ISTEPNAME(13,02,"mem_pll_reset"),
+                ISTEP_13::call_mem_pll_reset,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
-                ISTEPNAME(13,02,"mem_pll_initf"),
+                ISTEPNAME(13,03,"mem_pll_initf"),
                 ISTEP_13::call_mem_pll_initf,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
-                ISTEPNAME(13,03,"mem_pll_setup"),
+                ISTEPNAME(13,04,"mem_pll_setup"),
                 ISTEP_13::call_mem_pll_setup,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
-                ISTEPNAME(13,04,"proc_mcs_skewadjust"),
+                ISTEPNAME(13,05,"proc_mcs_skewadjust"),
                 ISTEP_13::call_proc_mcs_skewadjust,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
-                ISTEPNAME(13,05,"mem_startclocks"),
+                ISTEPNAME(13,06,"mem_startclocks"),
                 ISTEP_13::call_mem_startclocks,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
-                ISTEPNAME(13,06,"host_enable_vddr"),
-                ISTEP_13::call_host_enable_vddr,
+                ISTEPNAME(13,07,"host_enable_memvolt"),
+                ISTEP_13::call_host_enable_memvolt,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
-                ISTEPNAME(13,07,"mss_scominit"),
+                ISTEPNAME(13,08,"mss_scominit"),
                 ISTEP_13::call_mss_scominit,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
-                ISTEPNAME(13,08,"mss_ddr_phy_reset"),
+                ISTEPNAME(13,09,"mss_ddr_phy_reset"),
                 ISTEP_13::call_mss_ddr_phy_reset,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
-                ISTEPNAME(13,09,"mss_draminit"),
+                ISTEPNAME(13,10,"mss_draminit"),
                 ISTEP_13::call_mss_draminit,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
-                ISTEPNAME(13,10,"mss_draminit_training"),
+                ISTEPNAME(13,11,"mss_draminit_training"),
                 ISTEP_13::call_mss_draminit_training,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
-                ISTEPNAME(13,11,"mss_draminit_trainadv"),
+                ISTEPNAME(13,12,"mss_draminit_trainadv"),
                 ISTEP_13::call_mss_draminit_trainadv,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
-                ISTEPNAME(13,12,"mss_draminit_mc"),
+                ISTEPNAME(13,13,"mss_draminit_mc"),
                 ISTEP_13::call_mss_draminit_mc,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
diff --git a/src/include/usr/isteps/istep18list.H b/src/include/usr/isteps/istep18list.H
index b1754ae86..ef565180a 100644
--- a/src/include/usr/isteps/istep18list.H
+++ b/src/include/usr/isteps/istep18list.H
@@ -29,7 +29,7 @@
  * @file    istep18list.H
  *
  *  IStep 18    Establish System SMP
- *  IPL FLow Doc        v0.60 (06/02/15)
+ *  IPL FLow Doc        v0.93 (04/04/16)
  *
  *  Please see the note in initsvcstructs.H for description of
  *      the ISTEPNAME macro.
@@ -105,6 +105,21 @@ namespace   INITSERVICE
                 NULL,
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
+        {
+                ISTEPNAME(18,13,""),
+                NULL,
+                { NONE, EXT_IMAGE, IPL_NOOP, false }
+        },
+        {
+                ISTEPNAME(18,14,""),
+                NULL,
+                { NONE, EXT_IMAGE, IPL_NOOP, false }
+        },
+        {
+                ISTEPNAME(18,15,""),
+                NULL,
+                { NONE, EXT_IMAGE, IPL_NOOP, false }
+        },
 };
 
 const DepModInfo g_istep18Dependancies = {