PRD: add full maint cmd support for all DSD procedures

Change-Id: Ia99afea6ebcb79a1554d9b23b66cb9fdd6bf9352
RTC: 190428
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57153
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@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/57476
CI-Ready: Zane C. Shelley <zshelle@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>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>

8 files changed, 451 insertions, 198 deletions

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 5ff565ebc..b1b6aa194 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_rt.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_rt.C
@@ -1229,47 +1229,14 @@ int32_t CenMbaTdCtlr::startVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc )
 
 int32_t CenMbaTdCtlr::startDsdPhase1( STEP_CODE_DATA_STRUCT & io_sc )
 {
-    #define PRDF_FUNC "[CenMbaTdCtlr::startDsdPhase1] "
-
-    int32_t o_rc = SUCCESS;
-
-    io_sc.service_data->AddSignatureList( iv_mbaTrgt, PRDFSIG_StartDsdPhase1 );
-    iv_tdState = DSD_PHASE_1;
-
-    do
-    {
-        // Starting a new DSD procedure. Reset the scrub resume counter.
-        iv_scrubResumeCounter.reset();
-
-        o_rc = prepareNextCmd( io_sc );
-        if ( SUCCESS != o_rc )
-        {
-            PRDF_ERR( PRDF_FUNC "prepareNextCmd() failed" );
-            break;
-        }
-
-        // Set the steer mux
-        o_rc = mssSetSteerMux( iv_mbaTrgt, iv_rank, iv_mark.getCM(),
-                               iv_isEccSteer );
-        if ( SUCCESS != o_rc )
-        {
-            PRDF_ERR( PRDF_FUNC "mssSetSteerMux() failed" );
-            break;
-        }
-
-        // Start phase 1.
-        o_rc = doTdScrubCmd( COND_RT_VCM_DSD );
-        if ( SUCCESS != o_rc )
-        {
-            PRDF_ERR( PRDF_FUNC "doTdScrubCmd() failed" );
-            break;
-        }
-
-    } while(0);
+    // Starting a new DSD procedure. Reset the scrub resume counter.
+    iv_scrubResumeCounter.reset();
 
-    return o_rc;
+    //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    // moved to VcmEvent class
+    //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-    #undef PRDF_FUNC
+    return SUCCESS;
 }
 
 //------------------------------------------------------------------------------
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemDsd.H b/src/usr/diag/prdf/plat/mem/prdfMemDsd.H
new file mode 100644
index 000000000..de1816927
--- /dev/null
+++ b/src/usr/diag/prdf/plat/mem/prdfMemDsd.H
@@ -0,0 +1,175 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/diag/prdf/plat/mem/prdfMemDsd.H $                     */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2018                             */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+/** @file prdfMemDsd.H */
+
+#ifndef __prdfMemDsd_H
+#define __prdfMemDsd_H
+
+// Platform includes
+#include <prdfMemEccAnalysis.H>
+#include <prdfMemMark.H>
+#include <prdfMemScrubUtils.H>
+#include <prdfMemTdQueue.H>
+#include <prdfP9McaExtraSig.H>
+#include <prdfPlatServices.H>
+
+namespace PRDF
+{
+
+/** @brief DRAM Spare Deploy procedure. */
+template<TARGETING::TYPE T>
+class DsdEvent : public TdEntry
+{
+  public: // functions
+
+    /**
+     * @brief Constructor
+     * @param i_chip MCA or MBA.
+     * @param i_rank Rank reporting chip mark.
+     */
+    DsdEvent<T>( ExtensibleChip * i_chip, const MemRank & i_rank,
+                 const MemMark & i_mark ) :
+        TdEntry(DSD_EVENT, i_chip, i_rank), iv_mark(i_mark)
+    {
+        PRDF_ASSERT( nullptr != i_chip );
+        PRDF_ASSERT( T == i_chip->getType() );
+        PRDF_ASSERT( i_mark.isValid() );
+    }
+
+  public: // overloaded functions from parent class
+
+    uint32_t nextStep( STEP_CODE_DATA_STRUCT & io_sc, bool & o_done )
+    {
+        #define PRDF_FUNC "[DsdEvent::nextStep] "
+
+        // TODO: RTC 189221 should assert if DRAM Sparing is NOT supported.
+
+        uint32_t o_rc = SUCCESS;
+
+        do
+        {
+            // First, do analysis.
+            o_rc = analyzePhase( io_sc, o_done );
+            if ( SUCCESS != o_rc )
+            {
+                PRDF_ERR( PRDF_FUNC "analyzePhase() failed on 0x%08x,0x%2x",
+                          iv_chip->getHuid(), getKey() );
+                break;
+            }
+
+            if ( o_done ) break; // Nothing more to do.
+
+            // Then, start the next phase of the procedure.
+            o_rc = startNextPhase( io_sc );
+            if ( SUCCESS != o_rc )
+            {
+                PRDF_ERR( PRDF_FUNC "analyzePhase() failed on 0x%08x,0x%2x",
+                          iv_chip->getHuid(), getKey() );
+                break;
+            }
+
+        } while (0);
+
+        // Add the chip mark to the callout list if no callouts in the list.
+        if ( 0 == io_sc.service_data->getMruListSize() )
+        {
+            MemoryMru mm { iv_chip->getTrgt(), iv_rank, iv_mark.getSymbol() };
+            io_sc.service_data->SetCallout( mm );
+        }
+
+        return o_rc;
+
+        #undef PRDF_FUNC
+    }
+
+    uint32_t getKey() const
+    { return MemRank(iv_rank.getMaster()).getKey(); } // Master rank only
+
+  private: // functions
+
+    /**
+     * @brief  Do analysis based on the current phase.
+     * @param  io_sc  The step code data struct.
+     * @param  o_done True if the procedure is complete or has aborted, false
+     *                otherwise.
+     * @return Non-SUCCESS if an internal function fails, SUCCESS otherwise.
+     */
+    uint32_t analyzePhase( STEP_CODE_DATA_STRUCT & io_sc, bool & o_done );
+
+    /**
+     * @brief  Starts the appropriate maintenance command for each phase of the
+     *         procedure.
+     * @pre    iv_phase must be set appropriately before calling this function.
+     * @return Non-SUCCESS if an internal function fails, SUCCESS otherwise.
+     */
+    uint32_t startCmd();
+
+    /**
+     * @brief  Starts the next phase of the procedure.
+     * @param  io_sc  The step code data struct.
+     * @post   iv_phase will be updated appropriately per design.
+     * @return Non-SUCCESS if an internal function fails, SUCCESS otherwise.
+     */
+    uint32_t startNextPhase( STEP_CODE_DATA_STRUCT & io_sc )
+    {
+        uint32_t signature = 0;
+
+        switch ( iv_phase )
+        {
+            case TD_PHASE_0:
+                iv_phase  = TD_PHASE_1;
+                signature = PRDFSIG_StartDsdPhase1;
+                break;
+
+            #ifndef __HOSTBOOT_RUNTIME // IPL only
+
+            case TD_PHASE_1:
+                iv_phase  = TD_PHASE_2;
+                signature = PRDFSIG_StartDsdPhase2;
+                break;
+
+            #endif
+
+            default: PRDF_ASSERT( false ); // invalid phase
+        }
+
+        PRDF_TRAC( "[DsdEvent] Starting DSD Phase %d: 0x%08x,0x%02x",
+                   iv_phase, iv_chip->getHuid(), getKey() );
+
+        io_sc.service_data->AddSignatureList( iv_chip->getTrgt(), signature );
+
+        return startCmd();
+    }
+
+  private: // instance variables
+
+    const MemMark iv_mark; ///< The chip mark from hardware.
+};
+
+} // end namespace PRDF
+
+#endif // __prdfMemDsd_H
+
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemDsd_ipl.C b/src/usr/diag/prdf/plat/mem/prdfMemDsd_ipl.C
new file mode 100644
index 000000000..63fea6ea8
--- /dev/null
+++ b/src/usr/diag/prdf/plat/mem/prdfMemDsd_ipl.C
@@ -0,0 +1,134 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/diag/prdf/plat/mem/prdfMemDsd_ipl.C $                 */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2018                             */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+/** @file prdfMemDsd_ipl.C */
+
+// Platform includes
+#include <prdfMemDqBitmap.H>
+#include <prdfMemDsd.H>
+
+using namespace TARGETING;
+
+namespace PRDF
+{
+
+using namespace PlatServices;
+
+//##############################################################################
+//
+//                          Generic template functions
+//
+//##############################################################################
+
+template<TARGETING::TYPE T>
+uint32_t DsdEvent<T>::analyzePhase( STEP_CODE_DATA_STRUCT & io_sc,
+                                    bool & o_done )
+{
+    #define PRDF_FUNC "[DsdEvent::analyzePhase] "
+
+    uint32_t o_rc = SUCCESS;
+
+    do
+    {
+        if ( TD_PHASE_0 == iv_phase )
+        {
+            // Before starting the next command, set iv_mark in the steer mux.
+            /* TODO: RTC 189221
+            o_rc = setSteerMux<T>( iv_chip, iv_rank, iv_mark );
+            if ( SUCCESS != o_rc )
+            {
+                PRDF_ERR( PRDF_FUNC "setSteerMux(0x%08x,0x%2x) failed",
+                          iv_chip->getHuid(), getKey() );
+                break;
+            }
+            */
+
+            break; // Nothing to analyze yet.
+        }
+
+        // TODO: RTC 189221 finish supporting this function.
+
+    } while (0);
+
+    // TODO: RTC 189221 remove once function is supported
+    PRDF_ERR( PRDF_FUNC "not supported yet" );
+    o_done = true; // to ensure nothing else gets executed
+
+    return o_rc;
+
+    #undef PRDF_FUNC
+}
+
+//##############################################################################
+//
+//                          Specializations for MBA
+//
+//##############################################################################
+
+template<>
+uint32_t DsdEvent<TYPE_MBA>::startCmd()
+{
+    #define PRDF_FUNC "[DsdEvent::startCmd] "
+
+    uint32_t o_rc = SUCCESS;
+
+    uint32_t stopCond = mss_MaintCmd::NO_STOP_CONDITIONS;
+
+    switch ( iv_phase )
+    {
+        case TD_PHASE_1:
+            // Start the steer cleanup procedure on this master rank.
+            o_rc = startTdSteerCleanup<TYPE_MBA>( iv_chip, iv_rank, MASTER_RANK,
+                                                  stopCond );
+            if ( SUCCESS != o_rc )
+            {
+                PRDF_ERR( PRDF_FUNC "startTdSteerCleanup(0x%08x,0x%2x) failed",
+                          iv_chip->getHuid(), getKey() );
+            }
+            break;
+
+        case TD_PHASE_2:
+            // Start the superfast read procedure on this master rank.
+            o_rc = startTdSfRead<TYPE_MBA>( iv_chip, iv_rank, MASTER_RANK,
+                                            stopCond );
+            if ( SUCCESS != o_rc )
+            {
+                PRDF_ERR( PRDF_FUNC "startTdSfRead(0x%08x,0x%2x) failed",
+                          iv_chip->getHuid(), getKey() );
+            }
+            break;
+
+        default: PRDF_ASSERT( false ); // invalid phase
+    }
+
+    return o_rc;
+
+    #undef PRDF_FUNC
+}
+
+//------------------------------------------------------------------------------
+
+} // end namespace PRDF
+
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemDsd_rt.C b/src/usr/diag/prdf/plat/mem/prdfMemDsd_rt.C
new file mode 100644
index 000000000..668496476
--- /dev/null
+++ b/src/usr/diag/prdf/plat/mem/prdfMemDsd_rt.C
@@ -0,0 +1,124 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/diag/prdf/plat/mem/prdfMemDsd_rt.C $                  */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2018                             */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+/** @file prdfMemDsd_rt.C */
+
+// Platform includes
+#include <prdfMemDsd.H>
+
+using namespace TARGETING;
+
+namespace PRDF
+{
+
+using namespace PlatServices;
+
+//##############################################################################
+//
+//                          Generic template functions
+//
+//##############################################################################
+
+template<TARGETING::TYPE T>
+uint32_t DsdEvent<T>::analyzePhase( STEP_CODE_DATA_STRUCT & io_sc,
+                                    bool & o_done )
+{
+    #define PRDF_FUNC "[DsdEvent::analyzePhase] "
+
+    uint32_t o_rc = SUCCESS;
+
+    do
+    {
+        if ( TD_PHASE_0 == iv_phase )
+        {
+            // Before starting the next command, set iv_mark in the steer mux.
+            /* TODO: RTC 189221
+            o_rc = setSteerMux<T>( iv_chip, iv_rank, iv_mark );
+            if ( SUCCESS != o_rc )
+            {
+                PRDF_ERR( PRDF_FUNC "setSteerMux(0x%08x,0x%2x) failed",
+                          iv_chip->getHuid(), getKey() );
+                break;
+            }
+            */
+
+            break; // Nothing to analyze yet.
+        }
+
+        // TODO: RTC 189221 finish supporting this function.
+
+    } while (0);
+
+    // TODO: RTC 189221 remove once function is supported
+    PRDF_ERR( PRDF_FUNC "not supported yet" );
+    o_done = true; // to ensure nothing else gets executed
+
+    return o_rc;
+
+    #undef PRDF_FUNC
+}
+
+//##############################################################################
+//
+//                          Specializations for MBA
+//
+//##############################################################################
+
+template<>
+uint32_t DsdEvent<TYPE_MBA>::startCmd()
+{
+    #define PRDF_FUNC "[DsdEvent::startCmd] "
+
+    uint32_t o_rc = SUCCESS;
+
+    uint32_t stopCond = mss_MaintCmd::NO_STOP_CONDITIONS;
+
+    // Due to a hardware bug in the Centaur, we must execute runtime maintenance
+    // commands at a very slow rate. Because of this, we decided that we should
+    // stop the command immediately on error if there is a UE so that we can
+    // respond quicker and send a DMD message to the hypervisor as soon as
+    // possible.
+
+    stopCond |= mss_MaintCmd::STOP_ON_UE;
+    stopCond |= mss_MaintCmd::STOP_IMMEDIATE;
+
+    // Start the time based scrub procedure on this master rank.
+    o_rc = startTdScrub<TYPE_MBA>( iv_chip, iv_rank, MASTER_RANK, stopCond );
+    if ( SUCCESS != o_rc )
+    {
+        PRDF_ERR( PRDF_FUNC "startTdScrub(0x%08x,0x%2x) failed",
+                  iv_chip->getHuid(), getKey() );
+    }
+
+    return o_rc;
+
+    #undef PRDF_FUNC
+}
+
+
+//------------------------------------------------------------------------------
+
+} // end namespace PRDF
+
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemTdQueue.H b/src/usr/diag/prdf/plat/mem/prdfMemTdQueue.H
index 35fe21277..01fa7aaa0 100755
--- a/src/usr/diag/prdf/plat/mem/prdfMemTdQueue.H
+++ b/src/usr/diag/prdf/plat/mem/prdfMemTdQueue.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2016,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -61,6 +61,7 @@ class TdEntry
     enum TdType
     {
         VCM_EVENT = 0,       ///< A Verify Chip Mark event.
+        DSD_EVENT,           ///< A DRAM Spare Deploy event.
         TPS_EVENT,           ///< A Two-Phase Scrub event.
         INVALID_EVENT = 0xf, ///< Used to denote that no event is in progress
     };
diff --git a/src/usr/diag/prdf/plat/mem/prdf_plat_mem_hb_only.mk b/src/usr/diag/prdf/plat/mem/prdf_plat_mem_hb_only.mk
index fd0f8dd4a..2ff127bc1 100644
--- a/src/usr/diag/prdf/plat/mem/prdf_plat_mem_hb_only.mk
+++ b/src/usr/diag/prdf/plat/mem/prdf_plat_mem_hb_only.mk
@@ -55,6 +55,7 @@ ifneq (${HOSTBOOT_RUNTIME},1)
 
 # plat/mem/ (non-rule plugin related)
 prd_obj += prdfMemTdCtlr_ipl.o
+prd_obj += prdfMemDsd_ipl.o
 prd_obj += prdfMemTps_ipl.o
 prd_obj += prdfMemVcm_ipl.o
 prd_obj += prdfMemIplCeStats.o
@@ -70,6 +71,7 @@ ifeq (${HOSTBOOT_RUNTIME},1)
 
 # plat/mem/ (non-rule plugin related)
 prd_obj += prdfMemTdCtlr_rt.o
+prd_obj += prdfMemDsd_rt.o
 prd_obj += prdfMemTps_rt.o
 prd_obj += prdfMemVcm_rt.o
 prd_obj += prdfMemDynDealloc.o
diff --git a/src/usr/diag/prdf/plat/pegasus/prdfCenMbaTdCtlr_ipl.C b/src/usr/diag/prdf/plat/pegasus/prdfCenMbaTdCtlr_ipl.C
index c72acd460..7555c875d 100644
--- a/src/usr/diag/prdf/plat/pegasus/prdfCenMbaTdCtlr_ipl.C
+++ b/src/usr/diag/prdf/plat/pegasus/prdfCenMbaTdCtlr_ipl.C
@@ -708,95 +708,22 @@ int32_t CenMbaTdCtlr::startVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc )
 
 int32_t CenMbaTdCtlr::startDsdPhase1( STEP_CODE_DATA_STRUCT & io_sc )
 {
-    #define PRDF_FUNC "[CenMbaTdCtlr::startDsdPhase1] "
-
-    int32_t o_rc = SUCCESS;
-
-    io_sc.service_data->AddSignatureList( iv_mbaTrgt, PRDFSIG_StartDsdPhase1 );
-    iv_tdState = DSD_PHASE_1;
-
-    do
-    {
-        o_rc = prepareNextCmd();
-        if ( SUCCESS != o_rc )
-        {
-            PRDF_ERR( PRDF_FUNC "prepareNextCmd() failed" );
-            break;
-        }
-
-        // Set the steer mux
-        o_rc = mssSetSteerMux( iv_mbaTrgt, iv_rank, iv_mark.getCM(),
-                               iv_isEccSteer );
-        if ( SUCCESS != o_rc )
-        {
-            PRDF_ERR( PRDF_FUNC "mssSetSteerMux() failed" );
-            break;
-        }
-
-        // Start phase 1.
-        iv_mssCmd = createMssCmd( mss_MaintCmdWrapper::TIMEBASE_STEER_CLEANUP,
-                                  iv_mbaTrgt, iv_rank, COND_TARGETED_CMD );
-        if ( NULL == iv_mssCmd )
-        {
-            PRDF_ERR( PRDF_FUNC "createMssCmd() failed");
-            o_rc = FAIL; break;
-        }
-
-        o_rc = iv_mssCmd->setupAndExecuteCmd();
-        if ( SUCCESS != o_rc )
-        {
-            PRDF_ERR( PRDF_FUNC "setupAndExecuteCmd() failed" );
-            break;
-        }
-
-    } while(0);
-
-    return o_rc;
+    //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    // Moved to DsdEvent class
+    //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-    #undef PRDF_FUNC
+    return SUCCESS;
 }
 
 //------------------------------------------------------------------------------
 
 int32_t CenMbaTdCtlr::startDsdPhase2( STEP_CODE_DATA_STRUCT & io_sc )
 {
-    #define PRDF_FUNC "[CenMbaTdCtlr::startDsdPhase2] "
-
-    int32_t o_rc = SUCCESS;
-
-    io_sc.service_data->AddSignatureList( iv_mbaTrgt, PRDFSIG_StartDsdPhase2 );
-    iv_tdState = DSD_PHASE_2;
-
-    do
-    {
-        o_rc = prepareNextCmd();
-        if ( SUCCESS != o_rc )
-        {
-            PRDF_ERR( PRDF_FUNC "prepareNextCmd() failed" );
-            break;
-        }
-
-        // Start phase 2.
-        iv_mssCmd = createMssCmd( mss_MaintCmdWrapper::SUPERFAST_READ,
-                                  iv_mbaTrgt, iv_rank, COND_TARGETED_CMD );
-        if ( NULL == iv_mssCmd )
-        {
-            PRDF_ERR( PRDF_FUNC "createMssCmd() failed");
-            o_rc = FAIL; break;
-        }
-
-        o_rc = iv_mssCmd->setupAndExecuteCmd();
-        if ( SUCCESS != o_rc )
-        {
-            PRDF_ERR( PRDF_FUNC "setupAndExecuteCmd() failed" );
-            break;
-        }
-
-    } while(0);
-
-    return o_rc;
+    //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    // Moved to DsdEvent class
+    //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-    #undef PRDF_FUNC
+    return SUCCESS;
 }
 
 //------------------------------------------------------------------------------
diff --git a/src/usr/diag/prdf/plat/prdfPlatServices.C b/src/usr/diag/prdf/plat/prdfPlatServices.C
index b9024dc89..b3a62f9dc 100644
--- a/src/usr/diag/prdf/plat/prdfPlatServices.C
+++ b/src/usr/diag/prdf/plat/prdfPlatServices.C
@@ -669,83 +669,6 @@ uint32_t startTdScrub<TYPE_MCA>( ExtensibleChip * i_chip,
 
 //------------------------------------------------------------------------------
 
-uint32_t __startTdScrub_mca( ExtensibleChip * i_mcaChip,
-                             mss::mcbist::address i_saddr,
-                             mss::mcbist::address i_eaddr,
-                             mss::mcbist::stop_conditions & i_stopCond )
-{
-    #define PRDF_FUNC "[PlatServices::__startTdScrub_mca] "
-
-    PRDF_ASSERT( nullptr != i_mcaChip );
-    PRDF_ASSERT( TYPE_MCA == i_mcaChip->getType() );
-
-    uint32_t o_rc = SUCCESS;
-
-    // Get the MCBIST fapi target
-    ExtensibleChip * mcbChip = getConnectedParent( i_mcaChip, TYPE_MCBIST );
-    fapi2::Target<fapi2::TARGET_TYPE_MCBIST> fapiTrgt ( mcbChip->getTrgt() );
-
-    do
-    {
-        // Clear all of the counters and maintenance ECC attentions.
-        o_rc = prepareNextCmd<TYPE_MCBIST>( mcbChip );
-        if ( SUCCESS != o_rc )
-        {
-            PRDF_ERR( PRDF_FUNC "prepareNextCmd(0x%08x) failed",
-                      mcbChip->getHuid() );
-            break;
-        }
-
-        // Set stop-on-AUE for all target scrubs. See explanation in
-        // startBgScrub() for the reasons why.
-        i_stopCond.set_pause_on_aue(mss::ON);
-
-        // Start targeted scrub command.
-        errlHndl_t errl;
-        FAPI_INVOKE_HWP( errl, mss::memdiags::targeted_scrub, fapiTrgt, i_stopCond,
-                         i_saddr, i_eaddr, mss::mcbist::NONE );
-
-        if ( nullptr != errl )
-        {
-            PRDF_ERR( PRDF_FUNC "mss::memdiags::targeted_scrub(0x%08x) failed",
-                      mcbChip->getHuid() );
-            PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT );
-            o_rc = FAIL; break;
-        }
-
-    } while (0);
-
-    return o_rc;
-
-    #undef PRDF_FUNC
-}
-
-//------------------------------------------------------------------------------
-
-uint32_t __startTdScrub_mca( ExtensibleChip * i_mcaChip, const MemRank & i_rank,
-                             mss::mcbist::stop_conditions & i_stopCond,
-                             AddrRangeType i_rangeType )
-{
-    #define PRDF_FUNC "[PlatServices::__startTdScrub_mca] "
-
-    mss::mcbist::address saddr, eaddr;
-    uint32_t o_rc = getMemAddrRange<TYPE_MCA>( i_mcaChip, i_rank, saddr, eaddr,
-                                               i_rangeType );
-    if ( SUCCESS != o_rc )
-    {
-        PRDF_ERR( PRDF_FUNC "getMemAddrRange(0x%08x,0x%2x) failed",
-                  i_mcaChip->getHuid(), i_rank.getKey() );
-    }
-    else
-    {
-        o_rc = __startTdScrub_mca( i_mcaChip, saddr, eaddr, i_stopCond );
-    }
-
-    return o_rc;
-
-    #undef PRDF_FUNC
-}
-
 //##############################################################################
 //##                   Centaur Maintenance Command wrappers
 //##############################################################################