Remove no longer needed mss_restore_dram_repair

Change-Id: I435c968727dbe7f7cb7d7360616e8bb284bd9353
RTC: 46855
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1518
Tested-by: Jenkins Server
Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>
Reviewed-by: Mark W. Wenning <wenning@us.ibm.com>
Reviewed-by: CAMVAN T. NGUYEN <ctnguyen@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 14 insertions, 106 deletions

diff --git a/src/include/usr/isteps/istep13list.H b/src/include/usr/isteps/istep13list.H
index 5a6c9aa68..870427d8d 100644
--- a/src/include/usr/isteps/istep13list.H
+++ b/src/include/usr/isteps/istep13list.H
@@ -44,13 +44,11 @@
  *  	: 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
+ *  13.8	  mss_draminit_training
  *  	: Dram training
- *  13.10	  mss_draminit_trainadv
+ *  13.9	  mss_draminit_trainadv
  *  	: Advanced dram training
- *  13.11	  mss_draminit_mc
+ *  13.10	  mss_draminit_mc
  *  	: Hand off control to MC
  *
  *  *****************************************************************
@@ -138,15 +136,7 @@ const   TaskInfo    g_istep13[]  =   {
                 }
         },
         {
-                ISTEPNAME(13,08,"mss_restore_dram_repair"),
-                DRAM_TRAINING::call_mss_restore_dram_repair,
-                {
-                        START_FN,
-                        EXT_IMAGE,
-                }
-        },
-        {
-                ISTEPNAME(13,09,"mss_draminit_training"),
+                ISTEPNAME(13,08,"mss_draminit_training"),
                 DRAM_TRAINING::call_mss_draminit_training,
                 {
                         START_FN,
@@ -154,7 +144,7 @@ const   TaskInfo    g_istep13[]  =   {
                 }
         },
         {
-                ISTEPNAME(13,10,"mss_draminit_trainadv"),
+                ISTEPNAME(13,09,"mss_draminit_trainadv"),
                 DRAM_TRAINING::call_mss_draminit_trainadv,
                 {
                         START_FN,
@@ -162,7 +152,7 @@ const   TaskInfo    g_istep13[]  =   {
                 }
         },
         {
-                ISTEPNAME(13,11,"mss_draminit_mc"),
+                ISTEPNAME(13,10,"mss_draminit_mc"),
                 DRAM_TRAINING::call_mss_draminit_mc,
                 {
                         START_FN,
diff --git a/src/usr/hwpf/hwp/dram_training/dram_training.C b/src/usr/hwpf/hwp/dram_training/dram_training.C
index a9928999b..ec560300f 100644
--- a/src/usr/hwpf/hwp/dram_training/dram_training.C
+++ b/src/usr/hwpf/hwp/dram_training/dram_training.C
@@ -74,7 +74,6 @@ const uint8_t VPO_NUM_OF_MEMBUF_TO_RUN = UNLIMITED_RUN;
 #include    "mss_scominit/mss_scominit.H"
 #include    "mss_ddr_phy_reset/mss_ddr_phy_reset.H"
 #include    "mss_draminit/mss_draminit.H"
-// #include    "mss_restore_dram_repair/mss_restore_dram_repair.H"
 #include    "mss_draminit_training/mss_draminit_training.H"
 // #include    "mss_draminit_trainadv/mss_draminit_trainadv.H"
 #include    "mss_draminit_mc/mss_draminit_mc.H"
@@ -514,69 +513,9 @@ void    call_mss_draminit( void *io_pArgs )
     task_end2( l_err );
 }
 
-//
-//  Wrapper function to call 13.8 : mss_restore_dram_repair
-//
-void    call_mss_restore_dram_repair( void *io_pArgs )
-{
-    errlHndl_t l_err = NULL;
-
-    TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_restore_dram_repair entry" );
-
-#if 0
-    // @@@@@    CUSTOM BLOCK:   @@@@@
-    //  figure out what targets we need
-    //  customize any other inputs
-    //  set up loops to go through all targets (if parallel, spin off a task)
-
-    //  print call to hwp and dump physical path of the target(s)
-    TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                    "=====  mss_restore_dram_repair HWP(? ? ? )",
-                    ?
-                    ?
-                    ? );
-    //  dump physical path to targets
-    EntityPath l_path;
-    l_path  =   l_@targetN_target->getAttr<ATTR_PHYS_PATH>();
-    l_path.dump();
-    TRACFCOMP( g_trac_mc_init, "===== " );
-
-    // cast OUR type of target to a FAPI type of target.
-    const fapi::Target l_fapi_@targetN_target(
-                    TARGET_TYPE_MEMBUF_CHIP,
-                    reinterpret_cast<void *>
-                        (const_cast<TARGETING::Target*>(l_@targetN_target)) );
-
-    //  call the HWP with each fapi::Target
-    l_fapirc  =   mss_restore_dram_repair( ? , ?, ? );
-
-    //  process return code.
-    if ( l_fapirc== fapi::FAPI_RC_SUCCESS )
-    {
-        TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                "SUCCESS :  mss_restore_dram_repair HWP(? ? ? )" );
-    }
-    else
-    {
-        /**
-         * @todo fapi error - just print out for now...
-         */
-        TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                "ERROR 0x%.8X:  mss_restore_dram_repair HWP(? ? ?) ",
-                static_cast<uint32_t>(l_fapirc) );
-    }
-    // @@@@@    END CUSTOM BLOCK:   @@@@@
-#endif
-
-    TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_restore_dram_repair exit" );
-
-    task_end2( l_err );
-}
-
-
 
 //
-//  Wrapper function to call 13.9 : mss_draminit_training
+//  Wrapper function to call 13.8 : mss_draminit_training
 //
 void    call_mss_draminit_training( void *io_pArgs )
 {
@@ -637,7 +576,7 @@ void    call_mss_draminit_training( void *io_pArgs )
 }
 
 //
-//  Wrapper function to call 13.10 : mss_draminit_trainadv
+//  Wrapper function to call 13.9 : mss_draminit_trainadv
 //
 void    call_mss_draminit_trainadv( void *io_pArgs )
 {
@@ -696,7 +635,7 @@ void    call_mss_draminit_trainadv( void *io_pArgs )
 }
 
 //
-//  Wrapper function to call 13.11 : mss_draminit_mc
+//  Wrapper function to call 13.10 : mss_draminit_mc
 //
 void    call_mss_draminit_mc( void *io_pArgs )
 {
diff --git a/src/usr/hwpf/hwp/dram_training/dram_training.H b/src/usr/hwpf/hwp/dram_training/dram_training.H
index e423ddfef..f89605d52 100644
--- a/src/usr/hwpf/hwp/dram_training/dram_training.H
+++ b/src/usr/hwpf/hwp/dram_training/dram_training.H
@@ -88,24 +88,18 @@
  *  @}
  *  @{
  *      @substepnum     8
- *      @substepname    mss_restore_dram_repair
- *      @substepdesc    : Restore Dram repairs
- *      @target_sched   serial
- *  @}
- *  @{
- *      @substepnum     9
  *      @substepname    mss_draminit_training
  *      @substepdesc    : Dram training
  *      @target_sched   serial
  *  @}
  *  @{
- *      @substepnum     10
+ *      @substepnum     9
  *      @substepname     mss_draminit_trainadv
  *      @substepdesc     : Advanced dram training
  *      @target_sched   serial
  *  @}
  *  @{
- *      @substepnum     11
+ *      @substepnum     10
  *      @substepname     mss_draminit_mc
  *      @substepdesc     : Hand off control to MC
  *      @target_sched   serial
@@ -218,25 +212,10 @@ void    call_mss_ddr_phy_reset( void * io_pArgs );
 void    call_mss_draminit( void * io_pArgs );
 
 
-
-/**
- *  @brief   mss_restore_dram_repair
- *
- *  13.8 : : Restore Dram repairs
- *
- *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
- *                              or NULL.
- *  return  none
- *
- */
-void    call_mss_restore_dram_repair( void * io_pArgs );
-
-
-
 /**
  *  @brief   mss_draminit_training
  *
- *  13.9 : : Dram training
+ *  13.8 : : Dram training
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                              or NULL.
@@ -250,7 +229,7 @@ void    call_mss_draminit_training( void * io_pArgs );
 /**
  *  @brief   mss_draminit_trainadv
  *
- *  13.10 : : Advanced dram training
+ *  13.9 : : Advanced dram training
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                              or NULL.
@@ -264,7 +243,7 @@ void    call_mss_draminit_trainadv( void * io_pArgs );
 /**
  *  @brief   mss_draminit_mc
  *
- *  13.11 : : Hand off control to MC
+ *  13.10 : : Hand off control to MC
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                              or NULL.