PRD: scrub resume counter for MBA runtime scrub commands

Change-Id: I27153ed86a3db5ab2477d8bdd9fa9b560e8d31f6
RTC: 191647
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/58810
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/59011
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>

7 files changed, 180 insertions, 146 deletions

diff --git a/src/usr/diag/prdf/common/plat/mem/prdfCenMbaDataBundle.H b/src/usr/diag/prdf/common/plat/mem/prdfCenMbaDataBundle.H
index 896ba1704..88d502620 100644
--- a/src/usr/diag/prdf/common/plat/mem/prdfCenMbaDataBundle.H
+++ b/src/usr/diag/prdf/common/plat/mem/prdfCenMbaDataBundle.H
@@ -40,9 +40,12 @@
   #include <prdfMemTdCtlr.H>
   #include <prdfMemTdFalseAlarm.H>
 
-  #ifndef __HOSTBOOT_RUNTIME
+  #ifdef __HOSTBOOT_RUNTIME
+    #include <prdfMemScrubUtils.H>
+  #else
     #include <prdfMemIplCeStats.H>
   #endif
+
 #endif
 
 namespace PRDF
@@ -169,6 +172,14 @@ class MbaDataBundle : public DataBundle
     mss_SuperFastRead * iv_sfCmd = nullptr;
 
     #endif
+
+    #if defined(__HOSTBOOT_MODULE) && defined(__HOSTBOOT_RUNTIME)
+
+    /** To prevent flooding during runtime scrub commands, this is used to limit
+     *  the number of times a scrub command is resumed on a rank. */
+    ScrubResumeCounter iv_scrubResumeCounter;
+
+    #endif
 };
 
 /**
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_rt.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_rt.C
index 94dfd1bb0..4f8df05fa 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_rt.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_rt.C
@@ -1124,9 +1124,6 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc,
 
 int32_t CenMbaTdCtlr::startVcmPhase1( STEP_CODE_DATA_STRUCT & io_sc )
 {
-    // Starting a new phase of VCM procedure. Reset the scrub resume counter
-    iv_scrubResumeCounter.reset();
-
     //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     // moved to VcmEvent class
     //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -1138,9 +1135,6 @@ int32_t CenMbaTdCtlr::startVcmPhase1( STEP_CODE_DATA_STRUCT & io_sc )
 
 int32_t CenMbaTdCtlr::startVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc )
 {
-    // Starting a new phase of VCM procedure. Reset the scrub resume counter
-    iv_scrubResumeCounter.reset();
-
     //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     // moved to VcmEvent class
     //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -1152,9 +1146,6 @@ int32_t CenMbaTdCtlr::startVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc )
 
 int32_t CenMbaTdCtlr::startDsdPhase1( STEP_CODE_DATA_STRUCT & io_sc )
 {
-    // Starting a new DSD procedure. Reset the scrub resume counter.
-    iv_scrubResumeCounter.reset();
-
     //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     // moved to VcmEvent class
     //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -1169,9 +1160,6 @@ int32_t CenMbaTdCtlr::startTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc )
     // Initially true, until hardware error is found.
     iv_tpsFalseAlarm = true;
 
-    // Starting a new TPS procedure. Reset the scrub resume counter.
-    iv_scrubResumeCounter.reset();
-
     //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     // moved to TpsEvent class
     //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -1191,9 +1179,6 @@ int32_t CenMbaTdCtlr::startBgScrub( STEP_CODE_DATA_STRUCT & io_sc )
 
     do
     {
-        // Starting a scrub on a new rank. Reset the scrub resume counter.
-        iv_scrubResumeCounter.reset();
-
         // Cleanup hardware before starting the maintenance command. This will
         // clear the ECC counters, which must be done before setting the ETE
         // thresholds.
@@ -1420,19 +1405,6 @@ int32_t CenMbaTdCtlr::resumeScrub( STEP_CODE_DATA_STRUCT & io_sc,
             stopCond = COND_RT_VCM_DSD | mss_MaintCmd::STOP_ON_MCE;
         }
 
-        // If the command had been resumed 16 times on this rank, clear the stop
-        // on error flags (everything except MPE) and continue on to the end of
-        // the rank. This is needed so that the scrub can complete without
-        // getting flooded with attentions.
-        if ( iv_scrubResumeCounter.isTh() )
-        {
-            stopCond &= ~mss_MaintCmd::STOP_ON_HARD_NCE_ETE;
-            stopCond &= ~mss_MaintCmd::STOP_ON_INT_NCE_ETE;
-            stopCond &= ~mss_MaintCmd::STOP_ON_SOFT_NCE_ETE;
-            stopCond &= ~mss_MaintCmd::STOP_ON_RETRY_CE_ETE;
-            stopCond &= ~mss_MaintCmd::STOP_ON_UE;
-        }
-
         if ( NO_OP == iv_tdState )
         {
             // Resume background scrub.
@@ -1454,9 +1426,6 @@ int32_t CenMbaTdCtlr::resumeScrub( STEP_CODE_DATA_STRUCT & io_sc,
             }
         }
 
-        // The resume was successful. Increment the resume counter.
-        iv_scrubResumeCounter.incCount();
-
     } while(0);
 
     return o_rc;
@@ -1707,12 +1676,8 @@ int32_t CenMbaTdCtlr::handleUe_Td( STEP_CODE_DATA_STRUCT & io_sc,
 
     do
     {
-        // Add entry to UE table. Note that it is possible that there was a
-        // resume threshold during TPS, which means that the stop-on-UE
-        // condition was cleared and the scrub was forced to go to the end of
-        // the rank. In this case, we cannot be certain which address the UE had
-        // occurred on, so do not add the address to the UE table.
-        if ( (TPS_PHASE_1 != iv_tdState) || !iv_scrubResumeCounter.isTh() )
+        // Add entry to UE table.
+        if ( (TPS_PHASE_1 != iv_tdState) )
         {
             CenMbaDataBundle * mbadb = getMbaDataBundle( iv_mbaChip );
             mbadb->iv_ueTable.addEntry( UE_TABLE::SCRUB_UE, i_stopAddr );
@@ -2849,7 +2814,6 @@ void CenMbaTdCtlr::collectStateCaptureData( STEP_CODE_DATA_STRUCT & io_sc,
     uint8_t srnk        = iv_rank.getSlave();               // 3-bit
     uint8_t fetchMsk    = iv_fetchAttnsMasked ? 1 : 0;      // 1-bit
     uint8_t state       = iv_tdState & 0x0f;                // 4-bit
-    uint8_t rescount    = iv_scrubResumeCounter.getCount(); // 8-bit
     uint8_t badRankMask = 0x00;                             // 8-bit
 
     TdRankList::List list = iv_masterRanks.getList();
@@ -2865,7 +2829,6 @@ void CenMbaTdCtlr::collectStateCaptureData( STEP_CODE_DATA_STRUCT & io_sc,
     // not be added to the capture data.
     uint8_t hack = 1; // 1-bit
 
-    data[0] = rescount;
     data[1] = badRankMask;
     data[2] = state << 4 | mrnk << 1 | fetchMsk;
     data[3] = srnk  << 5 | hack << 4;                           // 4 extra bits
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_rt.H b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_rt.H
index 41344b346..40f67247d 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_rt.H
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_rt.H
@@ -91,7 +91,7 @@ class CenMbaTdCtlr : public CenMbaTdCtlrCommon
     explicit CenMbaTdCtlr( ExtensibleChip * i_mbaChip ) :
         CenMbaTdCtlrCommon(i_mbaChip), iv_queue(), iv_masterRanks(),
         iv_vcmRankData(), iv_tpsRankData(), iv_tpsFalseAlarm(false),
-        iv_scrubResumeCounter(), iv_fetchAttnsMasked(false)
+        iv_fetchAttnsMasked(false)
     {}
 
   public: // Overloaded functions
@@ -433,22 +433,6 @@ class CenMbaTdCtlr : public CenMbaTdCtlrCommon
     void collectStateCaptureData( STEP_CODE_DATA_STRUCT & io_sc,
                                   const char * i_descTag );
 
-  private: // classes
-
-    /** @brief Simple class to abstract the common actions done on
-     *         iv_scrubResumeCounter. */
-    class ScrubResumCounter
-    {
-      public:
-        ScrubResumCounter() : iv_counter(0) {}
-        void reset()             { iv_counter = 0;          }
-        void incCount()          { iv_counter++;            }
-        bool isTh() const        { return 16 <= iv_counter; }
-        uint8_t getCount() const { return iv_counter;       }
-      private:
-        uint8_t iv_counter;
-    };
-
   private: // instance variables
 
     /** Array of functions pointers for TD controller states. This is used to
@@ -463,10 +447,6 @@ class CenMbaTdCtlr : public CenMbaTdCtlrCommon
     TpsRankData iv_tpsRankData;   ///< TPS specific data for each rank.
     bool        iv_tpsFalseAlarm; ///< TPS false alarm
 
-    /** This is used to limit the number of times a scrub is resumed on a rank
-     *  in order to prevent flooding of attentions */
-    ScrubResumCounter iv_scrubResumeCounter;
-
     /** Keeps track if the fetch attentions have been masked during a TD
      *  procedure. */
     bool iv_fetchAttnsMasked;
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.H b/src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.H
index 3fbc4a895..0dc884f46 100644
--- a/src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.H
+++ b/src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.H
@@ -37,6 +37,18 @@
 namespace PRDF
 {
 
+/** Simple container to keep track of the number of time a scrub command has
+ *  been resumed. */
+class ScrubResumeCounter
+{
+  public:
+    void reset()      { iv_count = 0;                      }
+    void inc()        { if ( 255 != iv_count ) iv_count++; }
+    bool atTh() const { return 16 <= iv_count;             }
+  private:
+    uint8_t iv_count = 0;
+};
+
 /**
  * @brief  Clears the command complete and WAT workaround attentions.
  * @param  i_chip MBA, MCA, or MCBIST.
diff --git a/src/usr/diag/prdf/plat/prdfPlatServices.C b/src/usr/diag/prdf/plat/prdfPlatServices.C
index fc6ca377b..c1a09b62e 100644
--- a/src/usr/diag/prdf/plat/prdfPlatServices.C
+++ b/src/usr/diag/prdf/plat/prdfPlatServices.C
@@ -38,6 +38,7 @@
 #include <prdfTrace.H>
 #include <prdfAssert.h>
 
+#include <prdfCenMbaDataBundle.H>
 #include <prdfMemScrubUtils.H>
 
 #include <iipServiceDataCollector.h>
@@ -664,12 +665,80 @@ uint32_t startTdScrub<TYPE_MCA>( ExtensibleChip * i_chip,
     #undef PRDF_FUNC
 }
 
-//------------------------------------------------------------------------------
-
 //##############################################################################
 //##                   Centaur Maintenance Command wrappers
 //##############################################################################
 
+template<TARGETING::TYPE T>
+uint32_t __startScrub( ExtensibleChip * i_chip, const MemRank & i_rank,
+                       AddrRangeType i_rangeType, uint32_t i_stopCond,
+                       mss_MaintCmd::TimeBaseSpeed i_cmdSpeed );
+
+template<>
+uint32_t __startScrub<TYPE_MBA>( ExtensibleChip * i_chip,
+                                 const MemRank & i_rank,
+                                 AddrRangeType i_rangeType,
+                                 uint32_t i_stopCond,
+                                 mss_MaintCmd::TimeBaseSpeed i_cmdSpeed )
+{
+    #define PRDF_FUNC "[PlatServices::__startScrub<TYPE_MBA>] "
+
+    PRDF_ASSERT( nullptr != i_chip );
+    PRDF_ASSERT( TYPE_MBA == i_chip->getType() );
+
+    uint32_t o_rc = SUCCESS;
+
+    fapi2::Target<fapi2::TARGET_TYPE_MBA> fapiTrgt ( i_chip->getTrgt() );
+    errlHndl_t errl = nullptr;
+
+    do
+    {
+        #ifdef __HOSTBOOT_RUNTIME
+        // Starting a new command. So clear the resume counter.
+        getMbaDataBundle(i_chip)->iv_scrubResumeCounter.reset();
+        #endif
+
+        // Get the address range of the given rank.
+        fapi2::buffer<uint64_t> saddr, eaddr;
+        o_rc = getMemAddrRange<TYPE_MBA>( i_chip, i_rank, saddr, eaddr,
+                                          i_rangeType );
+        if ( SUCCESS != o_rc )
+        {
+            PRDF_ERR( PRDF_FUNC "getMemAddrRange(0x%08x,0x%2x) failed",
+                      i_chip->getHuid(), i_rank.getKey() );
+            break;
+        }
+
+        // Clear all of the counters and maintenance ECC attentions.
+        o_rc = prepareNextCmd<TYPE_MBA>( i_chip );
+        if ( SUCCESS != o_rc )
+        {
+            PRDF_ERR( PRDF_FUNC "prepareNextCmd(0x%08x) failed",
+                      i_chip->getHuid() );
+            break;
+        }
+
+        // Start the scrub command.
+        mss_TimeBaseScrub cmd { fapiTrgt, saddr, eaddr, i_cmdSpeed,
+                                i_stopCond, false };
+        FAPI_INVOKE_HWP( errl, cmd.setupAndExecuteCmd );
+        if ( nullptr != errl )
+        {
+            PRDF_ERR( PRDF_FUNC "setupAndExecuteCmd() on 0x%08x,0x%02x failed",
+                      i_chip->getHuid(), i_rank.getKey() );
+            PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT );
+            o_rc = FAIL; break;
+        }
+
+    } while (0);
+
+    return o_rc;
+
+    #undef PRDF_FUNC
+}
+
+//------------------------------------------------------------------------------
+
 template<>
 uint32_t startBgScrub<TYPE_MBA>( ExtensibleChip * i_chip,
                                  const MemRank & i_rank )
@@ -708,17 +777,6 @@ uint32_t startBgScrub<TYPE_MBA>( ExtensibleChip * i_chip,
                                             : mss_MaintCmd::BG_SCRUB;
     do
     {
-        // Get the first address of the given rank.
-        fapi2::buffer<uint64_t> saddr, eaddr;
-        o_rc = getMemAddrRange<TYPE_MBA>( i_chip, i_rank, saddr, eaddr,
-                                          SLAVE_RANK );
-        if ( SUCCESS != o_rc )
-        {
-            PRDF_ERR( PRDF_FUNC "getMemAddrRange(0x%08x,0x%2x) failed",
-                      i_chip->getHuid(), i_rank.getKey() );
-            break;
-        }
-
         // Set the required thresholds for background scrubbing.
         o_rc = setBgScrubThresholds<TYPE_MBA>( i_chip, i_rank );
         if ( SUCCESS != o_rc )
@@ -728,27 +786,8 @@ uint32_t startBgScrub<TYPE_MBA>( ExtensibleChip * i_chip,
             break;
         }
 
-        // Clear all of the counters and maintenance ECC attentions.
-        o_rc = prepareNextCmd<TYPE_MBA>( i_chip );
-        if ( SUCCESS != o_rc )
-        {
-            PRDF_ERR( PRDF_FUNC "prepareNextCmd(0x%08x) failed",
-                      i_chip->getHuid() );
-            break;
-        }
-
-        // Start the background scrub command.
-        mss_TimeBaseScrub cmd { fapiTrgt, saddr, eaddr, cmdSpeed,
-                                stopCond, false };
-        errlHndl_t errl = nullptr;
-        FAPI_INVOKE_HWP( errl, cmd.setupAndExecuteCmd );
-        if ( nullptr != errl )
-        {
-            PRDF_ERR( PRDF_FUNC "setupAndExecuteCmd() on 0x%08x,0x%02x failed",
-                      i_chip->getHuid(), i_rank.getKey() );
-            PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT );
-            o_rc = FAIL; break;
-        }
+        o_rc = __startScrub<TYPE_MBA>( i_chip, i_rank, SLAVE_RANK, stopCond,
+                                       cmdSpeed );
 
     } while (0);
 
@@ -774,8 +813,6 @@ uint32_t startTdScrub<TYPE_MBA>( ExtensibleChip * i_chip,
     PRDF_ASSERT( nullptr != i_chip );
     PRDF_ASSERT( TYPE_MBA == i_chip->getType() );
 
-    uint32_t o_rc = SUCCESS;
-
     // Make sure there is a command complete attention when the command stops.
     i_stopCond |= mss_MaintCmd::ENABLE_CMD_COMPLETE_ATTENTION;
 
@@ -811,47 +848,8 @@ uint32_t startTdScrub<TYPE_MBA>( ExtensibleChip * i_chip,
 
     #endif
 
-    do
-    {
-        // Get the address range of the given rank.
-        fapi2::buffer<uint64_t> saddr, eaddr;
-        o_rc = getMemAddrRange<TYPE_MBA>( i_chip, i_rank, saddr, eaddr,
-                                          i_rangeType );
-        if ( SUCCESS != o_rc )
-        {
-            PRDF_ERR( PRDF_FUNC "getMemAddrRange(0x%08x,0x%2x) failed",
-                      i_chip->getHuid(), i_rank.getKey() );
-            break;
-        }
-
-        // Clear all of the counters and maintenance ECC attentions.
-        o_rc = prepareNextCmd<TYPE_MBA>( i_chip );
-        if ( SUCCESS != o_rc )
-        {
-            PRDF_ERR( PRDF_FUNC "prepareNextCmd(0x%08x) failed",
-                      i_chip->getHuid() );
-            break;
-        }
-
-        // Get the MBA fapi target.
-        fapi2::Target<fapi2::TARGET_TYPE_MBA> fapiTrgt ( i_chip->getTrgt() );
-
-        // Start the background scrub command.
-        mss_TimeBaseScrub cmd { fapiTrgt, saddr, eaddr, cmdSpeed,
-                                i_stopCond, false };
-        errlHndl_t errl = nullptr;
-        FAPI_INVOKE_HWP( errl, cmd.setupAndExecuteCmd );
-        if ( nullptr != errl )
-        {
-            PRDF_ERR( PRDF_FUNC "setupAndExecuteCmd() on 0x%08x,0x%02x failed",
-                      i_chip->getHuid(), i_rank.getKey() );
-            PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT );
-            o_rc = FAIL; break;
-        }
-
-    } while (0);
-
-    return o_rc;
+    return __startScrub<TYPE_MBA>( i_chip, i_rank, i_rangeType, i_stopCond,
+                                   cmdSpeed );
 
     #undef PRDF_FUNC
 }
diff --git a/src/usr/diag/prdf/plat/prdfPlatServices_rt.C b/src/usr/diag/prdf/plat/prdfPlatServices_rt.C
index 0a504c5ea..52ca3ef46 100644
--- a/src/usr/diag/prdf/plat/prdfPlatServices_rt.C
+++ b/src/usr/diag/prdf/plat/prdfPlatServices_rt.C
@@ -36,6 +36,7 @@
 #include <prdfTrace.H>
 
 // Platform includes
+#include <prdfCenMbaDataBundle.H>
 #include <prdfMemScrubUtils.H>
 #include <prdfPlatServices.H>
 
@@ -243,27 +244,85 @@ uint32_t stopBgScrub<TYPE_MBA>( ExtensibleChip * i_chip )
 
 //------------------------------------------------------------------------------
 
+template<TARGETING::TYPE T>
+uint32_t __resumeScrub( ExtensibleChip * i_chip,
+                        AddrRangeType i_rangeType, uint32_t i_stopCond,
+                        mss_MaintCmd::TimeBaseSpeed i_cmdSpeed );
+
 template<>
-uint32_t resumeBgScrub<TYPE_MBA>( ExtensibleChip * i_chip )
+uint32_t __resumeScrub<TYPE_MBA>( ExtensibleChip * i_chip,
+                                  AddrRangeType i_rangeType,
+                                  uint32_t i_stopCond,
+                                  mss_MaintCmd::TimeBaseSpeed i_cmdSpeed )
 {
-    #define PRDF_FUNC "[PlatServices::resumeBgScrub<TYPE_MBA>] "
+    #define PRDF_FUNC "[PlatServices::__resumeScrub<TYPE_MBA>] "
 
     PRDF_ASSERT( nullptr != i_chip );
     PRDF_ASSERT( TYPE_MBA == i_chip->getType() );
 
-    uint32_t rc = SUCCESS;
+    uint32_t o_rc = SUCCESS;
 
-    PRDF_ERR( PRDF_FUNC "function not implemented yet" );
+    if ( getMbaDataBundle(i_chip)->iv_scrubResumeCounter.atTh() )
+    {
+        // We have resumed scrubbing on this rank too many times. We still want
+        // the scrub to continue to the end of the rank, if possible, but we
+        // need to prevent flooding. So mask off all the CE/UE stop-on-error
+        // conditions. Note that there is only one chip mark per rank so we
+        // don't need to worry about getting flooded with those attentions.
+
+        i_stopCond &= ~mss_MaintCmd::STOP_ON_HARD_NCE_ETE;
+        i_stopCond &= ~mss_MaintCmd::STOP_ON_INT_NCE_ETE;
+        i_stopCond &= ~mss_MaintCmd::STOP_ON_SOFT_NCE_ETE;
+        i_stopCond &= ~mss_MaintCmd::STOP_ON_RETRY_CE_ETE;
+        i_stopCond &= ~mss_MaintCmd::STOP_ON_UE;
+    }
+
+    do
+    {
+        // TODO: Clear ECC counters/FIRs. Increment the current address. Clear
+        //       FIRs again. Start the command from the current address to the
+        //       end of the rank.
 
-    /* TODO: RTC 157888 - Not entirely sure how to do this. Will require a inc
-     *       command followed by a start command. May need the stop conditions
-     *       for the start command. */
+        // Resume successful. So increment the resume counter.
+        getMbaDataBundle(i_chip)->iv_scrubResumeCounter.inc();
 
-    return rc;
+    } while (0);
+
+    return o_rc;
 
     #undef PRDF_FUNC
 }
 
+//------------------------------------------------------------------------------
+
+template<>
+uint32_t resumeBgScrub<TYPE_MBA>( ExtensibleChip * i_chip )
+{
+    PRDF_ASSERT( nullptr != i_chip );
+    PRDF_ASSERT( TYPE_MBA == i_chip->getType() );
+
+    /* TODO:
+    return __resumeScrub<TYPE_MBA>( i_chip, SLAVE_RANK, stopCond, cmdSpeed );
+    */
+    return SUCCESS;
+}
+
+//------------------------------------------------------------------------------
+
+template<>
+uint32_t resumeTdScrub<TYPE_MBA>( ExtensibleChip * i_chip,
+                                  AddrRangeType i_rangeType,
+                                  uint32_t i_stopCond )
+{
+    PRDF_ASSERT( nullptr != i_chip );
+    PRDF_ASSERT( TYPE_MBA == i_chip->getType() );
+
+    /* TODO:
+    return __resumeScrub<TYPE_MBA>( i_chip, i_rangeType, i_stopCond, cmdSpeed );
+    */
+    return SUCCESS;
+}
+
 //##############################################################################
 //##                       Line Delete Functions
 //##############################################################################
diff --git a/src/usr/diag/prdf/plat/prdfPlatServices_rt.H b/src/usr/diag/prdf/plat/prdfPlatServices_rt.H
index 90b24b2c2..df7cf3156 100644
--- a/src/usr/diag/prdf/plat/prdfPlatServices_rt.H
+++ b/src/usr/diag/prdf/plat/prdfPlatServices_rt.H
@@ -95,6 +95,17 @@ uint32_t stopBgScrub( ExtensibleChip * i_chip );
 template<TARGETING::TYPE T>
 uint32_t resumeBgScrub( ExtensibleChip * i_chip );
 
+/**
+ * @brief  Resumes TD scrubbing after it has paused on error.
+ * @param  i_chip      MBA chip.
+ * @param  i_rangeType See enum AddrRangeType.
+ * @param  i_stopCond  The stop conditions for the targeted scrub.
+ * @return Non-SUCCESS if an internal function fails, SUCCESS otherwise.
+ */
+template<TARGETING::TYPE T, typename SCT>
+uint32_t resumeTdScrub( ExtensibleChip * i_chip, AddrRangeType i_rangeType,
+                        SCT i_stopCond );
+
 //##############################################################################
 //##                       Line delete functions
 //##############################################################################