Create framework for ISTEP 10, 12, 13

istep framework for istep 10 (sbe_centaur_init)
istep 12( mss_volt, etc).
istep 13 ( mss_draminit, etc )

Commented out testHWP, not used anymore.
Fixed bug in hb-istep for simics

fixed review comments
Added section in genIstep.pl to generate include/usr/isteps/istepNlist.H
	( istep 13 generated using script)

NOTE:  10, 11, 12 were partially generated manually, that is why they are
	not consistent.

Change-Id: I28ed8d3e60d2d0438ebe7ca3ed2053c781bc72ed
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/661
Tested-by: Jenkins Server
Reviewed-by: Van H. Lee <vanlee@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

10 files changed, 614 insertions, 141 deletions

diff --git a/src/include/usr/hbotcompid.H b/src/include/usr/hbotcompid.H
index 6ff09dd16..0c36827a3 100644
--- a/src/include/usr/hbotcompid.H
+++ b/src/include/usr/hbotcompid.H
@@ -179,11 +179,12 @@ const compId_t SPD_COMP_ID = 0x1000;
 const char SPD_COMP_NAME[] = "spd";
 //@}
 
+
 /** @name RESERVED
  *  Reserved component ID. x3100 is the component ID
- *  of FipS ERRL component. Due to our use of 
+ *  of FipS ERRL component. Due to our use of
  *  of the FipS errl tool, let no Hostboot component
- *  use this component ID. 
+ *  use this component ID.
  */
 //@{
 const compId_t RESERVED_COMP_ID = 0x3100;
diff --git a/src/include/usr/initservice/initsvcreasoncodes.H b/src/include/usr/initservice/initsvcreasoncodes.H
index c22e59ffe..2fe48948d 100644
--- a/src/include/usr/initservice/initsvcreasoncodes.H
+++ b/src/include/usr/initservice/initsvcreasoncodes.H
@@ -79,10 +79,12 @@ enum    InitServiceModuleID
     INITSVC_DO_SHUTDOWN_MOD_ID          =   0x26,
 
     //
-    //  ISTEP   module id's
+    //  ISTEP   module id's.
+    //      ISTEP_ERRL_ID is a generic Error ID for all the HWP's launched
+    //      by an istep.
     //
-    HWAS_ERRL_ID                =   0x30,
-    DMI_TRAINING_ERRL_ID,
+    HWAS_ERRL_ID                    =   0x30,
+    ISTEP_ERRL_ID                    =   0x31,
 
     //  reserve some tasks for my unit tests...
     START_CXXTEST_ERRL_ID       =   0xf0,
diff --git a/src/include/usr/initservice/isteps_trace.H b/src/include/usr/initservice/isteps_trace.H
new file mode 100644
index 000000000..7613cb53b
--- /dev/null
+++ b/src/include/usr/initservice/isteps_trace.H
@@ -0,0 +1,46 @@
+//  IBM_PROLOG_BEGIN_TAG
+//  This is an automatically generated prolog.
+//
+//  $Source: src/include/usr/initservice/isteps_trace.H $
+//
+//  IBM CONFIDENTIAL
+//
+//  COPYRIGHT International Business Machines Corp. 2012
+//
+//  p1
+//
+//  Object Code Only (OCO) source materials
+//  Licensed Internal Code Source Materials
+//  IBM HostBoot Licensed Internal Code
+//
+//  The source code for this program is not published or other-
+//  wise divested of its trade secrets, irrespective of what has
+//  been deposited with the U.S. Copyright Office.
+//
+//  Origin: 30
+//
+//  IBM_PROLOG_END
+#ifndef __INITSERVICE_ISTEPS_TRACE_H
+#define __INITSERVICE_ISTEPS_TRACE_H
+
+/**
+ * @file    isteps_trace.H
+ *
+ *  Include the Isteps trace buffer pointer for all isteps
+ *  This is initialized in istepdispatcher.C
+ *
+ */
+
+/******************************************************************************/
+// Includes
+/******************************************************************************/
+#include <trace/interface.H>
+
+namespace ISTEPS_TRACE
+{
+
+extern trace_desc_t *g_trac_isteps_trace;
+
+}   //  end namespace
+
+#endif
diff --git a/src/include/usr/isteps/istep4list.H b/src/include/usr/isteps/istep04list.H
index 1250ed25c..b106a71db 100644
--- a/src/include/usr/isteps/istep4list.H
+++ b/src/include/usr/isteps/istep04list.H
@@ -59,7 +59,7 @@ namespace   INITSERVICE
  *  7.  Apply GARD data (call GARD module)
  *
  */
-const   TaskInfo    g_istep4[]  =   {
+const   TaskInfo    g_istep04[]  =   {
 
         {
                 ISTEPNAME(4,0,"init_target_states"),    // substep name
@@ -67,7 +67,7 @@ const   TaskInfo    g_istep4[]  =   {
                 {
                         START_FN,                       // task type
                         EXT_IMAGE,                      // Extended Module
-                        HWAS_ERRL_ID,                 // module id
+                        ISTEP_ERRL_ID,                   // error id for istep
                 }
         },
         {
@@ -76,7 +76,7 @@ const   TaskInfo    g_istep4[]  =   {
                 {
                         START_FN,                       // task type
                         EXT_IMAGE,                      // Extended Module
-                        HWAS_ERRL_ID,                 // module id
+                        ISTEP_ERRL_ID,                   // error id for istep
                 }
         },
         {
@@ -85,7 +85,7 @@ const   TaskInfo    g_istep4[]  =   {
                 {
                         START_FN,                       // task type
                         EXT_IMAGE,                      // Extended Module
-                        HWAS_ERRL_ID,                 // module id
+                        ISTEP_ERRL_ID,                   // error id for istep
                 }
         },
         {
@@ -94,7 +94,7 @@ const   TaskInfo    g_istep4[]  =   {
                 {
                         START_FN,                       // task type
                         EXT_IMAGE,                      // Extended Module
-                        HWAS_ERRL_ID,                 // module id
+                        ISTEP_ERRL_ID,                 // error id for istep
                 }
         },
         {
@@ -103,7 +103,7 @@ const   TaskInfo    g_istep4[]  =   {
                 {
                         START_FN,                       // task type
                         EXT_IMAGE,                      // Extended Module
-                        HWAS_ERRL_ID,                 // module id
+                        ISTEP_ERRL_ID,                   // error id for istep
                 }
         },
         {
@@ -112,35 +112,38 @@ const   TaskInfo    g_istep4[]  =   {
                 {
                         START_FN,                       // task type
                         EXT_IMAGE,                      // Extended Module
-                        HWAS_ERRL_ID,                 // module id
+                        ISTEP_ERRL_ID,                   // error id for istep
                 }
         },
         {
-                ISTEPNAME(4, 6, "apply_gard"),            // substep name
+                ISTEPNAME(4, 6, "apply_gard"),          // substep name
                 HWAS::apply_gard,                       // pointer to fn
                 {
                         START_FN,                       // task type
                         EXT_IMAGE,                      // Extended Module
-                        HWAS_ERRL_ID,                 // module id
+                        ISTEP_ERRL_ID,                  // error id for istep
                 }
         },
+#if 0
+        // NOT USED ANYMORE
         {
-                ISTEPNAME(4,7,"testHWP"),               // substep name
+                ISTEP#NOTUSED#NAME(4,7,"testHWP"),      // substep name
                 HWAS::testHWP,                          // pointer to fn
                 {
                         START_FN,                       // task type
                         EXT_IMAGE,                      // Extended Module
-                        HWAS_ERRL_ID,                 // module id
+                        ISTEP_ERRL_ID,                  // error id for istep
                 }
         }
+#endif
 
         //  END OF LIST!
 };
 
 // make a struct from the above with the number of items included
-const   ExtTaskInfo g_istep4TaskList    =   {
-        &(g_istep4[0]),
-        ( sizeof(g_istep4)/sizeof(TaskInfo) ),
+const   ExtTaskInfo g_istep04TaskList    =   {
+        &(g_istep04[0]),
+        ( sizeof(g_istep04)/sizeof(TaskInfo) ),
         NULL
 };
 
diff --git a/src/include/usr/isteps/istep10list.H b/src/include/usr/isteps/istep10list.H
new file mode 100644
index 000000000..d7c148a49
--- /dev/null
+++ b/src/include/usr/isteps/istep10list.H
@@ -0,0 +1,165 @@
+//  IBM_PROLOG_BEGIN_TAG
+//  This is an automatically generated prolog.
+//
+//  $Source: src/include/usr/isteps/istep10list.H $
+//
+//  IBM CONFIDENTIAL
+//
+//  COPYRIGHT International Business Machines Corp. 2012
+//
+//  p1
+//
+//  Object Code Only (OCO) source materials
+//  Licensed Internal Code Source Materials
+//  IBM HostBoot Licensed Internal Code
+//
+//  The source code for this program is not published or other-
+//  wise divested of its trade secrets, irrespective of what has
+//  been deposited with the U.S. Copyright Office.
+//
+//  Origin: 30
+//
+//  IBM_PROLOG_END
+
+#ifndef __ISTEPS_ISTEP10LIST_H
+#define __ISTEPS_ISTEP10LIST_H
+
+
+/**
+ * @file    istep10list.H
+ *
+ *  Step 10 Hostboot SBE Centaur Init
+ *  IPL FLow Doc    v0.99 (02/10/12)
+ *
+ *  Please see the note in initsvcstructs.H for description of
+ *      the ISTEPNAME macro.
+ *
+ */
+
+
+
+#include    <initservice/initsvcstructs.H>
+#include    <initservice/initsvcreasoncodes.H>
+
+//  include prototypes file
+#include    "../../../usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.H"
+
+namespace   INITSERVICE
+{
+
+const   TaskInfo    g_istep10[]  =   {
+
+        {
+                ISTEPNAME(10,00,"cen_sbe_tp_chiplet_init1"),
+                SBE_CENTAUR_INIT::call_cen_sbe_tp_chiplet_init1,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },
+        {
+                ISTEPNAME( 10, 01, "cen_sbe_tp_arrayinit"),
+                SBE_CENTAUR_INIT::call_cen_sbe_tp_arrayinit,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },
+        {
+                ISTEPNAME(10,02,"cen_sbe_tp_chiplet_init2"),
+                SBE_CENTAUR_INIT::call_cen_sbe_tp_chiplet_init2,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },        {
+                ISTEPNAME(10,03,"cen_sbe_tp_chiplet_init3"),
+                SBE_CENTAUR_INIT::call_cen_sbe_tp_chiplet_init3,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },        {
+                ISTEPNAME(10,04,"cen_sbe_chiplet_init"),
+                SBE_CENTAUR_INIT::call_cen_sbe_chiplet_init,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },        {
+                ISTEPNAME(10,05,"cen_sbe_arrayinit"),
+                SBE_CENTAUR_INIT::call_cen_sbe_arrayinit,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },        {
+                ISTEPNAME(10,06,"cen_sbe_pll_initf"),
+                SBE_CENTAUR_INIT::call_cen_sbe_pll_initf,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },        {
+                ISTEPNAME(10,07,"cen_sbe_dts_init"),
+                SBE_CENTAUR_INIT::call_cen_sbe_dts_init,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },        {
+                ISTEPNAME(10,08,"cen_sbe_initf"),
+                SBE_CENTAUR_INIT::call_cen_sbe_initf,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },        {
+                ISTEPNAME(10,09,"cen_sbe_do_manual_inits"),
+                SBE_CENTAUR_INIT::call_cen_sbe_do_manual_inits,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },        {
+                ISTEPNAME(10,10,"cen_sbe_startclocks"),
+                SBE_CENTAUR_INIT::call_cen_sbe_startclocks,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },        {
+                ISTEPNAME(10,11,"cen_sbe_scominits"),
+                SBE_CENTAUR_INIT::call_cen_sbe_scominits,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },
+
+
+        //  END OF LIST!
+};
+
+// make a struct from the above with the number of items included
+const   ExtTaskInfo g_istep10TaskList    =   {
+        &(g_istep10[0]),
+        ( sizeof(g_istep10)/sizeof(TaskInfo) ),
+        NULL
+};
+
+};  // end namespace
+
+#endif
diff --git a/src/include/usr/isteps/istep11list.H b/src/include/usr/isteps/istep11list.H
index 558eec37e..efb07202a 100644
--- a/src/include/usr/isteps/istep11list.H
+++ b/src/include/usr/isteps/istep11list.H
@@ -24,17 +24,25 @@
 #define __ISTEPS_ISTEP11LIST_H
 
 /**
- * *  list of functions called for DMI Training - ISTEP 11 according to Dean's
- * *  HostBoot IPL Flow v982
- * *
- * *  11.1. dmi_scominit              : Scom setup on centaur
- * *  11.2. dmi_erepair               : Restore EDI Bus eRepair data
- * *  11.3. dmi_io_dccal              : Calibrate DMI interfaces
- * *  11.4. dmi_io_run_training       : Run training on MC buses
- * *  11.5. host_startPRD_dmi         : Load PRD for DMI domain
- * *  11.6. host_attnlisten_cen       : Start listening for attentions
- * *  11.7. proc_cen_framelock        : Initialize EDI Frame
- * *  11.8. cen_set_inband_addr       : Set the Inband base addresses
+ * list of functions called for DMI Training - ISTEP 11 according to Dean's
+ * HostBoot IPL Flow v982
+ *
+ * 11.1. dmi_scominit
+ *       :  Scom setup on centaur
+ * 11.2. dmi_erepair
+ *          : Restore EDI Bus eRepair data
+ * 11.3. dmi_io_dccal
+ *       : Calibrate DMI interfaces
+ * 11.4. dmi_io_run_training
+ *       : Run training on MC buses
+ * 11.5. host_startPRD_dmi
+ *       : Load PRD for DMI domain
+ * 11.6. host_attnlisten_cen
+ *       : Start listening for attentions
+ * 11.7. proc_cen_framelock
+ *       : Initialize EDI Frame
+ * 11.8. cen_set_inband_addr
+ *       : Set the Inband base addresses
  */
 
 /**
@@ -59,77 +67,77 @@ namespace   INITSERVICE
 const   TaskInfo    g_istep11[]  =   {
 
         {
-                ISTEPNAME(11,0,"dmi_scominit"),             // substep name
+                ISTEPNAME(11,00,"dmi_scominit"),             // substep name
                 DMI_TRAINING::call_dmi_scominit,            // pointer to fn
                 {
                         START_FN,                           // task type
                         EXT_IMAGE,                          // Extended Module
-                        DMI_TRAINING_ERRL_ID,               // module id
+                        ISTEP_ERRL_ID,               // module id
                 }
         },
         {
-                ISTEPNAME(11,1,"dmi_erepair"),              // substep name
+                ISTEPNAME(11,01,"dmi_erepair"),              // substep name
                 DMI_TRAINING::call_dmi_erepair,             // pointer to fn
                 {
                         START_FN,                           // task type
                         EXT_IMAGE,                          // Extended Module
-                        DMI_TRAINING_ERRL_ID,               // module id
+                        ISTEP_ERRL_ID,               // module id
                 }
         },
         {
-                ISTEPNAME(11,2,"dmi_io_dccal"),             // substep name
+                ISTEPNAME(11,02,"dmi_io_dccal"),             // substep name
                 DMI_TRAINING::call_dmi_io_dccal,            // pointer to fn
                 {
                         START_FN,                           // task type
                         EXT_IMAGE,                          // Extended Module
-                        DMI_TRAINING_ERRL_ID,               // module id
+                        ISTEP_ERRL_ID,               // module id
                 }
         },
         {
-                ISTEPNAME(11,3,"dmi_io_run_training"),      // substep name
+                ISTEPNAME(11,03,"dmi_io_run_training"),      // substep name
                 DMI_TRAINING::call_dmi_io_run_training,     // pointer to fn
                 {
                         START_FN,                           // task type
                         EXT_IMAGE,                          // Extended Module
-                        DMI_TRAINING_ERRL_ID,               // module id
+                        ISTEP_ERRL_ID,               // module id
                 }
         },
         {
-                ISTEPNAME(11,4,"host_startPRD_dmi"),        // substep name
+                ISTEPNAME(11,04,"host_startPRD_dmi"),        // substep name
                 DMI_TRAINING::call_host_startPRD_dmi,       // pointer to fn
                 {
                         START_FN,                           // task type
                         EXT_IMAGE,                          // Extended Module
-                        DMI_TRAINING_ERRL_ID,               // module id
+                        ISTEP_ERRL_ID,               // module id
                 }
         },
         {
-                ISTEPNAME(11,5,"host_attnlisten_cen"),      // substep name
+                ISTEPNAME(11,05,"host_attnlisten_cen"),      // substep name
                 DMI_TRAINING::call_host_attnlisten_cen,     // pointer to fn
                 {
                         START_FN,                           // task type
                         EXT_IMAGE,                          // Extended Module
-                        DMI_TRAINING_ERRL_ID,               // module id
+                        ISTEP_ERRL_ID,               // module id
                 }
         },
 
 
         {
-                ISTEPNAME(11,6,"proc_cen_framelock"),       // substep name
+                ISTEPNAME(11,06,"proc_cen_framelock"),       // substep name
                 DMI_TRAINING::call_proc_cen_framelock,      // pointer to fn
                 {
                         START_FN,                           // task type
                         EXT_IMAGE,                          // Extended Module
-                        DMI_TRAINING_ERRL_ID,               // module id
+                        ISTEP_ERRL_ID,               // module id
                 }
         },
         {
-                ISTEPNAME(11,7,"cen_set_inband_addr"),      // substep name
+                ISTEPNAME(11,07,"cen_set_inband_addr"),      // substep name
                 DMI_TRAINING::call_cen_set_inband_addr,          // pointer to fn
                 {
                         START_FN,                           // task type
                         EXT_IMAGE,                          // Extended Module
-                        DMI_TRAINING_ERRL_ID,               // module id
+                        ISTEP_ERRL_ID,               // module id
                 }
         },
 
diff --git a/src/include/usr/isteps/istep12list.H b/src/include/usr/isteps/istep12list.H
new file mode 100644
index 000000000..9f2fa6235
--- /dev/null
+++ b/src/include/usr/isteps/istep12list.H
@@ -0,0 +1,112 @@
+//  IBM_PROLOG_BEGIN_TAG
+//  This is an automatically generated prolog.
+//
+//  $Source: src/include/usr/isteps/istep12list.H $
+//
+//  IBM CONFIDENTIAL
+//
+//  COPYRIGHT International Business Machines Corp. 2012
+//
+//  p1
+//
+//  Object Code Only (OCO) source materials
+//  Licensed Internal Code Source Materials
+//  IBM HostBoot Licensed Internal Code
+//
+//  The source code for this program is not published or other-
+//  wise divested of its trade secrets, irrespective of what has
+//  been deposited with the U.S. Copyright Office.
+//
+//  Origin: 30
+//
+//  IBM_PROLOG_END
+
+#ifndef __ISTEPS_ISTEP12LIST_H
+#define __ISTEPS_ISTEP12LIST_H
+
+
+/**
+ *  @file istep12list.H
+ *
+ *  IStep 12        Step 12 MC Init
+ *  IPL FLow Doc    v0.99 (02/10/12)
+ *
+ *  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
+ *
+ *  Please see the note in initsvcstructs.H for description of
+ *      the ISTEPNAME macro.
+ *
+ */
+
+
+
+#include    <initservice/initsvcstructs.H>
+#include    <initservice/initsvcreasoncodes.H>
+
+//  include prototypes file
+#include    "../../../usr/hwpf/hwp/mc_init/mc_init.H"
+
+
+
+namespace   INITSERVICE
+{
+
+const   TaskInfo    g_istep12[]  =   {
+
+        {
+                ISTEPNAME( 12,00,"host_collect_dimm_spd"),
+                MC_INIT::call_host_collect_dimm_spd,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },
+        {
+                ISTEPNAME( 12,01,"mss_volt"),
+                MC_INIT::call_mss_volt,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },
+        {
+                ISTEPNAME( 12, 02,"mss_freq"),
+                MC_INIT::call_mss_freq,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },
+        {
+                ISTEPNAME( 12, 03, "mss_eff_config"),
+                MC_INIT::call_mss_eff_config,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },
+
+        //  END OF LIST!
+};
+
+// make a struct from the above with the number of items included
+const   ExtTaskInfo g_istep12TaskList    =   {
+        &(g_istep12[0]),
+        ( sizeof(g_istep12)/sizeof(TaskInfo) ),
+        NULL    //  later, depModules struct
+};
+
+};  // end namespace
+
+#endif
diff --git a/src/include/usr/isteps/istep13list.H b/src/include/usr/isteps/istep13list.H
new file mode 100644
index 000000000..b501c6dde
--- /dev/null
+++ b/src/include/usr/isteps/istep13list.H
@@ -0,0 +1,209 @@
+//  IBM_PROLOG_BEGIN_TAG
+//  This is an automatically generated prolog.
+//
+//  $Source: src/include/usr/isteps/istep13list.H $
+//
+//  IBM CONFIDENTIAL
+//
+//  COPYRIGHT International Business Machines Corp. 2012
+//
+//  p1
+//
+//  Object Code Only (OCO) source materials
+//  Licensed Internal Code Source Materials
+//  IBM HostBoot Licensed Internal Code
+//
+//  The source code for this program is not published or other-
+//  wise divested of its trade secrets, irrespective of what has
+//  been deposited with the U.S. Copyright Office.
+//
+//  Origin: 30
+//
+//  IBM_PROLOG_END
+
+#ifndef __ISTEPS_ISTEP13LIST_H
+#define __ISTEPS_ISTEP13LIST_H
+
+/**
+ * @file    istep13list.H
+ *
+ *  IStep 13    Step 13 DRAM Training
+ *  IPL FLow Doc        v0.99 (02/10/12)
+ *
+ *  13.1	  host_disable_vddr
+ *  	: Disable VDDR on CanContinue loops
+ *  13.2	  mc_pll_setup
+ *  	: Setup PLL for MBAs
+ *  13.3	  mba_startclocks
+ *  	: Start clocks on MBAs
+ *  13.4	  host_enable_vddr
+ *  	: Enable the VDDR3 Voltage Rail
+ *  13.5	  mss_initf
+ *  	: Perform scom inits to MC and PHY
+ *  13.6	  mss_ddr_phy_reset
+ *  	: Soft reset of DDR PHY macros
+ *  13.7	  mss_draminit
+ *  	: Dram initialize
+ *  13.8	  mss_restore_dram_repair
+ *  	: Restore Dram repairs
+ *  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
+ *
+ *  *****************************************************************
+ *  THIS FILE WAS GENERATED ON 2012-02-27:2142
+ *  *****************************************************************
+ *
+ *  Please see the note in initsvcstructs.H for description of
+ *      the ISTEPNAME macro.
+ *
+ */
+
+#include    <initservice/initsvcstructs.H>
+#include    <initservice/initsvcreasoncodes.H>
+
+//  include prototypes file
+#include    "../../../usr/hwpf/hwp/dram_training/dram_training.H"
+
+namespace   INITSERVICE
+{
+    const   TaskInfo    g_istep13[]  =   {
+        // NOTE:  IStep indexes start with 0
+
+        {
+                ISTEPNAME(13,0,"host_disable_vddr"),
+                DRAM_TRAINING::call_host_disable_vddr,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },      
+
+
+        {
+                ISTEPNAME(13,1,"mc_pll_setup"),
+                DRAM_TRAINING::call_mc_pll_setup,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },      
+
+
+        {
+                ISTEPNAME(13,2,"mba_startclocks"),
+                DRAM_TRAINING::call_mba_startclocks,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },      
+
+
+        {
+                ISTEPNAME(13,3,"host_enable_vddr"),
+                DRAM_TRAINING::call_host_enable_vddr,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },      
+
+
+        {
+                ISTEPNAME(13,4,"mss_initf"),
+                DRAM_TRAINING::call_mss_initf,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },      
+
+
+        {
+                ISTEPNAME(13,5,"mss_ddr_phy_reset"),
+                DRAM_TRAINING::call_mss_ddr_phy_reset,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },      
+
+
+        {
+                ISTEPNAME(13,6,"mss_draminit"),
+                DRAM_TRAINING::call_mss_draminit,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },      
+
+
+        {
+                ISTEPNAME(13,7,"mss_restore_dram_repair"),
+                DRAM_TRAINING::call_mss_restore_dram_repair,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },      
+
+
+        {
+                ISTEPNAME(13,8,"mss_draminit_training"),
+                DRAM_TRAINING::call_mss_draminit_training,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },      
+
+
+        {
+                ISTEPNAME(13,9,"mss_draminit_trainadv"),
+                DRAM_TRAINING::call_mss_draminit_trainadv,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },      
+
+
+        {
+                ISTEPNAME(13,10,"mss_draminit_mc"),
+                DRAM_TRAINING::call_mss_draminit_mc,
+                {
+                        START_FN,
+                        EXT_IMAGE,
+                        ISTEP_ERRL_ID,
+                }
+        },      
+
+  
+        //  END OF LIST!
+};
+
+// make a struct from the above with the number of items included
+const   ExtTaskInfo g_istep13TaskList    =   {
+        &(g_istep13[0]),
+        ( sizeof(g_istep13)/sizeof(TaskInfo) ),
+        NULL    //  later, depModules struct
+};
+
+};  // end namespace
+
+#endif
diff --git a/src/include/usr/isteps/istep_template_list.H b/src/include/usr/isteps/istep_template_list.H
deleted file mode 100644
index d64510236..000000000
--- a/src/include/usr/isteps/istep_template_list.H
+++ /dev/null
@@ -1,77 +0,0 @@
-//  IBM_PROLOG_BEGIN_TAG
-//  This is an automatically generated prolog.
-//
-//  $Source: src/include/usr/isteps/istep_template_list.H $
-//
-//  IBM CONFIDENTIAL
-//
-//  COPYRIGHT International Business Machines Corp. 2012
-//
-//  p1
-//
-//  Object Code Only (OCO) source materials
-//  Licensed Internal Code Source Materials
-//  IBM HostBoot Licensed Internal Code
-//
-//  The source code for this program is not published or other-
-//  wise divested of its trade secrets, irrespective of what has
-//  been deposited with the U.S. Copyright Office.
-//
-//  Origin: 30
-//
-//  IBM_PROLOG_END
-//
-#ifndef __ISTEPS_ISTEP<@istepnum>LIST_H
-#define __ISTEPS_ISTEP<@istepnum>LIST_H
-
-
-/**
- * @file    istep18list.H
- *
- *  <@istepdesc>
- *  <@docversion>
- *
- *  <@istepnum>.<@substepnum>   <@substepname>  :
- *      <@substepdesc>
- *      ...
- *
- *  Please see the note in initsvcstructs.H for description of
- *      the ISTEPNAME macro.
- *
- */
-
-
-
-#include    <initservice/initsvcstructs.H>
-#include    <initservice/initsvcreasoncodes.H>
-
-//  include prototypes file
-#include    "../../../usr/HWPs/<@istepname>/<@istepname>.H"
-
-namespace   INITSERVICE
-{
-
-const   TaskInfo    g_istep<@istepnum>[]  =   {
-
-        {
-                ISTEPNAME(<@istepnum>,<@substepnum>,"<@substepname>"),
-                <@istepname>::call_<@substepname>,
-                {
-                        START_FN,
-                        EXT_IMAGE,
-                        <@istepname>_ERRL_ID,
-                }
-        },
-
-        //  END OF LIST!
-};
-
-// make a struct from the above with the number of items included
-const   ExtTaskInfo g_istep<@istepnum>TaskList    =   {
-        g_istep<@istepnum>,
-        ( sizeof(g_istep<@istepnum>)/sizeof(TaskInfo) )
-};
-
-};  // end namespace
-
-#endif
diff --git a/src/include/usr/isteps/istepmasterlist.H b/src/include/usr/isteps/istepmasterlist.H
index 0bb4384ea..685c77209 100644
--- a/src/include/usr/isteps/istepmasterlist.H
+++ b/src/include/usr/isteps/istepmasterlist.H
@@ -56,8 +56,12 @@
 #include    <initservice/initsvcstructs.H>
 
 //  -----   istep include files   -----
-#include    "istep4list.H"
+#include    "istep04list.H"
+
+#include    "istep10list.H"
 #include    "istep11list.H"
+#include    "istep12list.H"
+#include    "istep13list.H"
 
 
 namespace   INITSERVICE
@@ -65,23 +69,23 @@ namespace   INITSERVICE
 
 // initialize an array of ExtTaskInfo
 const  ExtTaskInfo  g_isteps[]    =   {
-        { NULL, 0, NULL },                                //  dummy IStep 0
-        { NULL, 0, NULL },                                //  dummy IStep 1
-        { NULL, 0, NULL },                                //  dummy IStep 2
-        { NULL, 0, NULL },                                //  dummy IStep 3
-        INITSERVICE::g_istep4TaskList,                    //  HWAS  IStep 4
-        { NULL, 0, NULL },                                //  dummy IStep 5
-        { NULL, 0, NULL },                                //  dummy IStep 6
-        { NULL, 0, NULL },                                //  dummy IStep 7
-        { NULL, 0, NULL },                                //  dummy IStep 8
-        { NULL, 0, NULL },                                //  dummy IStep 9
-        { NULL, 0, NULL },                                //  dummy IStep 10
-        INITSERVICE::g_istep11TaskList,                   //  DMI_TRAINING
-        { NULL, 0, NULL },                                //  dummy IStep 12
-        { NULL, 0, NULL },                                //  dummy IStep 13
-        { NULL, 0, NULL },                                //  dummy IStep 14
-        { NULL, 0, NULL },                                //  dummy IStep 15
-        { NULL, 0, NULL },                                //  dummy IStep 16
+        { NULL, 0, NULL },                              //  dummy IStep 0
+        { NULL, 0, NULL },                              //  dummy IStep 1
+        { NULL, 0, NULL },                              //  dummy IStep 2
+        { NULL, 0, NULL },                              //  dummy IStep 3
+        INITSERVICE::g_istep04TaskList,                  //  HWAS  IStep 4
+        { NULL, 0, NULL },                              //  dummy IStep 5
+        { NULL, 0, NULL },                              //  dummy IStep 6
+        { NULL, 0, NULL },                              //  dummy IStep 7
+        { NULL, 0, NULL },                              //  dummy IStep 8
+        { NULL, 0, NULL },                              //  dummy IStep 9
+        INITSERVICE::g_istep10TaskList,                 //  SBE_CENTAUR_INIT
+        INITSERVICE::g_istep11TaskList,                 //  DMI_TRAINING
+        INITSERVICE::g_istep12TaskList,                 //  MC_INIT
+        INITSERVICE::g_istep13TaskList,                 //  DRAM_TRAINING
+        { NULL, 0, NULL },                              //  dummy IStep 14
+        { NULL, 0, NULL },                              //  dummy IStep 15
+        { NULL, 0, NULL },                              //  dummy IStep 16
 
         //
         // add further istep lists at the end.