SW256005: INITPROC: HWP: RAS code pick up

Change-Id: I948f0cc94a3cdba8507bdc41c54ae1bc69cfee7d
CQ:SW256005
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/10544
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Tested-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/10545
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

11 files changed, 2700 insertions, 3926 deletions

diff --git a/src/usr/hwpf/hwp/centaur_ec_attributes.xml b/src/usr/hwpf/hwp/centaur_ec_attributes.xml
index 493518877..474f8b6c4 100644
--- a/src/usr/hwpf/hwp/centaur_ec_attributes.xml
+++ b/src/usr/hwpf/hwp/centaur_ec_attributes.xml
@@ -22,7 +22,7 @@
 <!-- IBM_PROLOG_END_TAG                                                     -->
 <attributes>
 <!-- ********************************************************************* -->
-  <!-- $Id: centaur_ec_attributes.xml,v 1.22 2014/02/17 16:13:57 yctschan Exp $ -->
+  <!-- $Id: centaur_ec_attributes.xml,v 1.23 2014/04/02 20:40:44 gollub Exp $ -->
   <attribute>
     <id>ATTR_CENTAUR_EC_ENABLE_SAFE_MODE_THROTTLE</id>
     <targetType>TARGET_TYPE_MEMBUF_CHIP</targetType>
@@ -391,6 +391,24 @@ The getMBvpdSlopeInterceptData Attribute Accessor, if it does not find a matchin
        </chipEcFeature>
    </attribute>
 
+    <attribute>
+    <id>ATTR_CENTAUR_EC_DD2_ENABLE_EXIT_POINT_1</id>
+    <targetType>TARGET_TYPE_MEMBUF_CHIP</targetType>
+    <description>
+        Set by the platform depending on DD2.x or newer (TRUE), otherwise FALSE.  If true, exit point 1 will be enabled if any mark in markstore.
+    </description>
+    <chipEcFeature>
+      <chip>
+        <name>ENUM_ATTR_NAME_CENTAUR</name>
+        <ec>
+          <value>0x20</value>
+          <test>GREATER_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+    </chipEcFeature>
+  </attribute>
+
+
 
 
 </attributes>
diff --git a/src/usr/hwpf/hwp/dmi_training/proc_cen_framelock/proc_cen_framelock.C b/src/usr/hwpf/hwp/dmi_training/proc_cen_framelock/proc_cen_framelock.C
index 1756b8003..cbc38cabc 100644
--- a/src/usr/hwpf/hwp/dmi_training/proc_cen_framelock/proc_cen_framelock.C
+++ b/src/usr/hwpf/hwp/dmi_training/proc_cen_framelock/proc_cen_framelock.C
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-/// $Id: proc_cen_framelock.C,v 1.22 2014/03/05 22:26:38 baysah Exp $
+/// $Id: proc_cen_framelock.C,v 1.23 2014/04/07 17:56:22 gollub Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_cen_framelock.C,v $
 //------------------------------------------------------------------------------
 // *|
@@ -37,8 +37,8 @@
 
 // Change Log
 // Version | who      |Date     | Comment
-//   1.22  | baysah   |05-MAR-14| Fix for Defect SW248451 is to change replay buffer
-//                                overrun to checkstop in MCI
+//   1.23  | gollub   |07-APR-14| Added call to mss_unmask_inband_errors (used to be called in mss_draminit_mc)
+//   1.22  | baysah   |05-MAR-14| Fix for Defect SW248451 is to change replay buffer overrun to checkstop in MCI
 //   1.20  | bellows  |25-NOV-13| Changed include to use <> instead of "" for hostboot
 //   1.19  | bellows  |08-NOV-13| Added ATTR_MSS_INIT_STATE to track IPL states
 
@@ -47,12 +47,17 @@
 // Includes
 //------------------------------------------------------------------------------
 #include <proc_cen_framelock.H>
-
+#include <mss_unmask_errors.H>
 
 extern "C"
 {
 using namespace fapi;
 
+fapi::ReturnCode proc_cen_framelock_cloned(const fapi::Target& i_pu_target,
+                                    const fapi::Target& i_mem_target,
+                                    const proc_cen_framelock_args& i_args);
+
+
 //------------------------------------------------------------------------------
 // function: utility subroutine to clear the Centaur MBI Status Register
 // parameters: i_mem_target  => Centaur target
@@ -1706,10 +1711,31 @@ fapi::ReturnCode proc_cen_framelock_run_manual_frtl(
 // P8 and Centaur chips.
 //
 //
+
+
 //------------------------------------------------------------------------------
 fapi::ReturnCode proc_cen_framelock(const fapi::Target& i_pu_target,
                                     const fapi::Target& i_mem_target,
                                     const proc_cen_framelock_args& i_args)
+{    
+    fapi::ReturnCode l_rc;
+    
+    l_rc = proc_cen_framelock_cloned(i_pu_target, i_mem_target, i_args);
+    
+	// If mss_unmask_inband_errors gets it's own bad rc,
+	// it will commit the passed in rc (if non-zero), and return it's own bad rc.
+	// Else if mss_unmask_inband_errors runs clean, 
+	// it will just return the passed in rc.
+	l_rc = mss_unmask_inband_errors(i_mem_target, l_rc);
+
+	return l_rc;
+}
+
+
+//------------------------------------------------------------------------------
+fapi::ReturnCode proc_cen_framelock_cloned(const fapi::Target& i_pu_target,
+                                    const fapi::Target& i_mem_target,
+                                    const proc_cen_framelock_args& i_args)
 {
 
  // data buffers for putscom/getscom calls
diff --git a/src/usr/hwpf/hwp/dram_training/mem_startclocks/cen_mem_startclocks.C b/src/usr/hwpf/hwp/dram_training/mem_startclocks/cen_mem_startclocks.C
index 106543e9b..efe65c863 100644
--- a/src/usr/hwpf/hwp/dram_training/mem_startclocks/cen_mem_startclocks.C
+++ b/src/usr/hwpf/hwp/dram_training/mem_startclocks/cen_mem_startclocks.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2013              */
+/* COPYRIGHT International Business Machines Corp. 2012,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: cen_mem_startclocks.C,v 1.12 2013/11/15 16:30:02 mfred Exp $
+// $Id: cen_mem_startclocks.C,v 1.13 2014/04/07 19:01:06 gollub Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/centaur/working/procedures/ipl/fapi/cen_mem_startclocks.C,v $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2012
@@ -77,6 +77,7 @@
 #include <fapi.H>
 #include <cen_scom_addresses.H>
 #include <cen_mem_startclocks.H>
+#include <mss_unmask_errors.H>
 
 //  Constants
 // CFAM FSI GP4 register bit/field definitions
@@ -111,9 +112,32 @@ extern "C" {
 
 using namespace fapi;
 
+// Procedures in this file
+fapi::ReturnCode cen_mem_startclocks_cloned(const fapi::Target & i_target);
+
+//------------------------------------------------------------------------------
 fapi::ReturnCode cen_mem_startclocks(const fapi::Target & i_target)
 {
     // Target is centaur
+    
+    fapi::ReturnCode l_rc;
+    
+    l_rc = cen_mem_startclocks_cloned(i_target);
+    
+	// If mss_unmask_pervasive_errors gets it's own bad rc,
+	// it will commit the passed in rc (if non-zero), and return it's own bad rc.
+	// Else if mss_unmask_pervasive_errors runs clean, 
+	// it will just return the passed in rc.
+	l_rc = mss_unmask_pervasive_errors(i_target, l_rc);
+
+	return l_rc;
+}
+
+
+//------------------------------------------------------------------------------
+fapi::ReturnCode cen_mem_startclocks_cloned(const fapi::Target & i_target)
+{
+    // Target is centaur
 
     fapi::ReturnCode rc;
     uint32_t rc_ecmd = 0;
@@ -395,6 +419,10 @@ fapi::ReturnCode cen_mem_startclocks(const fapi::Target & i_target)
 This section is automatically updated by CVS when you check in this file.
 Be sure to create CVS comments when you commit so that they can be included here.
 $Log: cen_mem_startclocks.C,v $
+Revision 1.13  2014/04/07 19:01:06  gollub
+
+#|   1.55  | gollub   |07-APR-14| Added dependancy on mss_unmask_errors for cen_mem_startclocks.C
+
 Revision 1.12  2013/11/15 16:30:02  mfred
 Changes made by Mike Jones for gerrit review, mostly for improved error handling.
 
diff --git a/src/usr/hwpf/hwp/dram_training/mss_draminit_mc/mss_draminit_mc.C b/src/usr/hwpf/hwp/dram_training/mss_draminit_mc/mss_draminit_mc.C
index 7159a0736..d2b54bbd8 100644
--- a/src/usr/hwpf/hwp/dram_training/mss_draminit_mc/mss_draminit_mc.C
+++ b/src/usr/hwpf/hwp/dram_training/mss_draminit_mc/mss_draminit_mc.C
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: mss_draminit_mc.C,v 1.45 2014/02/17 15:16:14 lapietra Exp $
+// $Id: mss_draminit_mc.C,v 1.46 2014/04/07 19:02:27 gollub Exp $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2011
 // *! All Rights Reserved -- Property of IBM
@@ -44,6 +44,7 @@
 //------------------------------------------------------------------------------
 // Version:|  Author: |  Date:  | Comment:
 //---------|----------|---------|-----------------------------------------------
+//  1.46   | gollub   |07-APR-14| Removed call to mss_unmask_inband_errors (moved it to proc_cen_framelock)
 //  1.45   | dcadiga  |14-FEB-14| Periodic Cal Fix for DD2
 //  1.44   | bellows  |12-FEB-14| Workaround for ENABLE_RCE_WITH_OTHER_ERRORS_HW246685
 //  1.43   | dcadiga  |28-OCT-13| Fixed code review comments for parent chip and typos
@@ -139,12 +140,6 @@ ReturnCode mss_draminit_mc(Target& i_target)
 	// it will just return the passed in rc.
 	l_rc = mss_unmask_maint_errors(i_target, l_rc);
 
-	// If mss_unmask_inband_errors gets it's own bad rc,
-	// it will commit the passed in rc (if non-zero), and return it's own bad rc.
-	// Else if mss_unmask_inband_errors runs clean,
-	// it will just return the passed in rc.
-	l_rc = mss_unmask_inband_errors(i_target, l_rc);
-
 	return l_rc;
 }
 
diff --git a/src/usr/hwpf/hwp/dram_training/mss_unmask_errors.H b/src/usr/hwpf/hwp/dram_training/mss_unmask_errors.H
deleted file mode 100644
index 994650b30..000000000
--- a/src/usr/hwpf/hwp/dram_training/mss_unmask_errors.H
+++ /dev/null
@@ -1,2840 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG                                                   */
-/* This is an automatically generated prolog.                             */
-/*                                                                        */
-/* $Source: src/usr/hwpf/hwp/utility_procedures/mss_unmask_errors.C $     */
-/*                                                                        */
-/* IBM CONFIDENTIAL                                                       */
-/*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2013              */
-/*                                                                        */
-/* 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 otherwise         */
-/* divested of its trade secrets, irrespective of what has been           */
-/* deposited with the U.S. Copyright Office.                              */
-/*                                                                        */
-/* Origin: 30                                                             */
-/*                                                                        */
-/* IBM_PROLOG_END_TAG                                                     */
-// $Id: mss_unmask_errors.C,v 1.3 2013/03/08 22:03:00 gollub Exp $
-//------------------------------------------------------------------------------
-// Don't forget to create CVS comments when you check in your changes!
-//------------------------------------------------------------------------------
-// CHANGE HISTORY:
-//------------------------------------------------------------------------------
-// Version:|   Date:  | Author: | Comment:
-//---------|----------|---------|-----------------------------------------------
-//   1.1   | 09/05/12 | gollub  | Created
-//   1.2   | 01/31/13 | gollub  | Keeping maint UE/MPE, and MBSPA threshold
-//         |          |         | errors masked until mss_unmask_fetch_errors,
-//         |          |         | so they will be masked during memdiags, and
-//         |          |         | unmasked before scrub is started.
-//   1.3   | 03/08/13 | gollub  | Masking MBSPA[0] for DD1, and using MBSPA[8] instead.
-
-//------------------------------------------------------------------------------
-//  Includes
-//------------------------------------------------------------------------------
-
-#include <mss_unmask_errors.H>
-#include <cen_scom_addresses.H>
-using namespace fapi;
-
-
-//------------------------------------------------------------------------------
-// Constants and enums
-//------------------------------------------------------------------------------
-        
-
-//------------------------------------------------------------------------------
-// mss_unmask_inband_errors
-//------------------------------------------------------------------------------
-                                           
-fapi::ReturnCode mss_unmask_inband_errors( const fapi::Target & i_target,
-                                           fapi::ReturnCode i_bad_rc )
-                                           
-{
-
-    FAPI_INF("ENTER mss_unmask_inband_errors()"); 
-    
-    fapi::ReturnCode l_rc;
-    uint32_t l_ecmd_rc = 0;            
-
-    //*************************
-    //*************************
-    // MBS_FIR_REG
-    //*************************
-    //*************************
-
-    ecmdDataBufferBase l_mbs_fir_mask(64);
-    ecmdDataBufferBase l_mbs_fir_mask_or(64);    
-    ecmdDataBufferBase l_mbs_fir_mask_and(64);
-    ecmdDataBufferBase l_mbs_fir_action0(64);
-    ecmdDataBufferBase l_mbs_fir_action1(64);
-    
-    // Read mask 
-    l_rc = fapiGetScom_w_retry(i_target, MBS_FIR_MASK_REG_0x02011403, l_mbs_fir_mask); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }    
-    
-    // TODO: Here is where I could clear bits that were bogus, before I unmask 
-    //       them. But typically we are expecting the bit set at this point
-    //       to be valid errors for PRD to log.
-
-
-    //(Action0, Action1, Mask)
-    //
-    // (0,0,0) = checkstop
-    // (0,1,0) = recoverable error
-    // (1,0,0) = report unused
-    // (1,1,0) = machine check
-    // (x,x,1) = error is masked
-
-    l_ecmd_rc |= l_mbs_fir_action0.flushTo0();
-    l_ecmd_rc |= l_mbs_fir_action1.flushTo0();
-    l_ecmd_rc |= l_mbs_fir_mask_or.flushTo0();
-    l_ecmd_rc |= l_mbs_fir_mask_and.flushTo1();
-
-    // 0    host_protocol_error     channel checkstop   unmask
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(0);            
-    l_ecmd_rc |= l_mbs_fir_action1.clearBit(0);
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(0);
-    
-    // 1    int_protocol_error      channel checkstop   unmask
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(1);            
-    l_ecmd_rc |= l_mbs_fir_action1.clearBit(1);
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(1);
-    
-    // 2    invalid_address_error   channel checkstop   mask (until unmask_fetch_errors)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(2);            
-    l_ecmd_rc |= l_mbs_fir_action1.clearBit(2);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(2);
-
-    // 3    external_timeout        channel checkstop   mask (until unmask_fetch_errors)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(3);            
-    l_ecmd_rc |= l_mbs_fir_action1.clearBit(3);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(3);
-    
-    // 4    internal_timeout        channel checkstop   mask (until unmask_fetch_errors)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(4);            
-    l_ecmd_rc |= l_mbs_fir_action1.clearBit(4);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(4);
-
-    // 5    int_buffer_ce           recoverable         unmask
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(5);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(5);
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(5);
-
-    // 6    int_buffer_ue           recoverable         unmask
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(6);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(6);
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(6);
-
-    // 7    int_buffer_sue          recoverable         mask (forever)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(7);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(7);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(7);
-
-    // 8    int_parity_error        channel checkstop   unmask
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(8); 
-    l_ecmd_rc |= l_mbs_fir_action1.clearBit(8); 
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(8);
-
-    // 9    cache_srw_ce            recoverable         mask (until unmask_fetch_errors)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(9);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(9);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(9);
-
-    // 10    cache_srw_ue           recoverable         mask (until unmask_fetch_errors)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(10);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(10);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(10);
-
-    // 11    cache_srw_sue          recoverable         mask (forever)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(11);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(11);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(11);
-
-    // 12    cache_co_ce            recoverable         mask (until unmask_fetch_errors)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(12);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(12);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(12);
-
-    // 13    cache_co_ue            recoverable         mask (until unmask_fetch_errors)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(13);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(13);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(13);
-
-    // 14    cache_co_sue           recoverable         mask (forever)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(14);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(14);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(14);
-
-    // 15    dir_ce                 recoverable         mask (until unmask_fetch_errors)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(15);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(15);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(15);
-
-    // 16    dir_ue                 channel checkstop   mask (until unmask_fetch_errors)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(16);            
-    l_ecmd_rc |= l_mbs_fir_action1.clearBit(16);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(16);
-
-    // 17    dir_member_deleted     recoverable         mask (forever)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(17);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(17);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(17);
-
-    // 18    dir_all_members_deleted channel checkstop  mask (until unmask_fetch_errors)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(18);            
-    l_ecmd_rc |= l_mbs_fir_action1.clearBit(18);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(18);
-
-    // 19    lru_error               recoverable        mask (until unmask_fetch_errors)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(19);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(19);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(19);
-
-    // 20    eDRAM error             channel checkstop  mask (until unmask_fetch_errors)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(20);            
-    l_ecmd_rc |= l_mbs_fir_action1.clearBit(20);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(20);
-
-    // 21    emergency_throttle_set  recoverable        mask (forever)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(21);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(21);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(21);
-
-    // 22    Host Inband Read Error  recoverable        mask (forever)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(22);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(22);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(22);
-
-    // 23    Host Inband Write Error recoverable        mask (forever)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(23);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(23);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(23);
-
-    // 24    OCC Inband Read Error   recoverable        mask (forever)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(24);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(24);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(24);
-
-    // 25    OCC Inband Write Error  recoverable        mask (forever)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(25);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(25);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(25);
-
-    // 26    srb_buffer_ce           recoverable        mask (until unmask_fetch_errors)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(26);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(26);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(26);
-
-    // 27    srb_buffer_ue           recoverable         mask (until unmask_fetch_errors)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(27);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(27);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(27);
-
-    // 28    srb_buffer_sue          recoverable         mask (forever)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(28);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(28);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(28);
-
-    // 29    internal_scom_error     recoverable         mask (tbd)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(29);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(29);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(29);
-
-    // 30    internal_scom_error_copy recoverable        mask (tbd)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(30);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(30);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(30);
-
-    // 31:63    Reserved                not implemented, so won't touch these
-    
-    if(l_ecmd_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-
-        l_rc.setEcmdError(l_ecmd_rc);
-        return l_rc;
-    }                                                                              
-
-    // Write action0
-    l_rc = fapiPutScom_w_retry(i_target, MBS_FIR_ACTION0_REG_0x02011406, l_mbs_fir_action0);
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    // Write action1
-    l_rc = fapiPutScom_w_retry(i_target, MBS_FIR_ACTION1_REG_0x02011407, l_mbs_fir_action1);
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    
-    // Write mask OR
-    l_rc = fapiPutScom_w_retry(i_target, MBS_FIR_MASK_REG_OR_0x02011405, l_mbs_fir_mask_or); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    // Write mask AND
-    l_rc = fapiPutScom_w_retry(i_target, MBS_FIR_MASK_REG_AND_0x02011404, l_mbs_fir_mask_and); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-
-    //************************************************    
-    // DEBUG: read them all back to verify
-    l_rc = fapiGetScom_w_retry(i_target, MBS_FIR_ACTION0_REG_0x02011406, l_mbs_fir_action0); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-    l_rc = fapiGetScom_w_retry(i_target, MBS_FIR_ACTION1_REG_0x02011407, l_mbs_fir_action1); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-    l_rc = fapiGetScom_w_retry(i_target, MBS_FIR_MASK_REG_0x02011403, l_mbs_fir_mask); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    //************************************************    
-    
-    
-    FAPI_INF("EXIT mss_unmask_inband_errors()"); 
-
-    return i_bad_rc;
-}
-
-
-
-//------------------------------------------------------------------------------
-// mss_unmask_ddrphy_errors
-//------------------------------------------------------------------------------
-                                           
-fapi::ReturnCode mss_unmask_ddrphy_errors( const fapi::Target & i_target,
-                                           fapi::ReturnCode i_bad_rc )
-                                           
-{
-
-    FAPI_INF("ENTER mss_unmask ddrphy_errors()"); 
-    
-    fapi::ReturnCode l_rc;
-    uint32_t l_ecmd_rc = 0;            
-
-    //*************************
-    //*************************
-    // DDRPHY_FIR_REG
-    //*************************
-    //*************************
-
-    ecmdDataBufferBase l_ddrphy_fir_mask(64);
-    ecmdDataBufferBase l_ddrphy_fir_mask_or(64);
-    ecmdDataBufferBase l_ddrphy_fir_mask_and(64);        
-    ecmdDataBufferBase l_ddrphy_fir_action0(64);
-    ecmdDataBufferBase l_ddrphy_fir_action1(64);
-
-    
-    // TODO: Here is where I could clear bits that were bogus, before I unmask 
-    //       them. But typically we are expecting the bit set at this point
-    //       to be valid errors for PRD to log.
-
-
-    //(Action0, Action1, Mask)
-    //
-    // (0,0,0) = checkstop
-    // (0,1,0) = recoverable error
-    // (1,0,0) = report unused
-    // (1,1,0) = machine check
-    // (x,x,1) = error is masked
-        
-    l_ecmd_rc |= l_ddrphy_fir_action0.flushTo0();
-    l_ecmd_rc |= l_ddrphy_fir_action1.flushTo0();
-    l_ecmd_rc |= l_ddrphy_fir_mask_or.flushTo0();
-    l_ecmd_rc |= l_ddrphy_fir_mask_and.flushTo0();
-    l_ecmd_rc |= l_ddrphy_fir_mask_and.setBit(48,16);
-        
-    // 0:47 Reserved                not implemented, so won't touch these
-    
-    // 48   ddr0_fsm_ckstp          channel checkstop   unmask
-    l_ecmd_rc |= l_ddrphy_fir_action0.clearBit(48);            
-    l_ecmd_rc |= l_ddrphy_fir_action1.clearBit(48);
-    l_ecmd_rc |= l_ddrphy_fir_mask_and.clearBit(48);
-    
-    // 49   ddr0_parity_ckstp       channel checkstop   unmask
-    l_ecmd_rc |= l_ddrphy_fir_action0.clearBit(49);            
-    l_ecmd_rc |= l_ddrphy_fir_action1.clearBit(49);
-    l_ecmd_rc |= l_ddrphy_fir_mask_and.clearBit(49);
-
-    // 50   ddr0_calibration_error  recoverable         mask (forever)
-    l_ecmd_rc |= l_ddrphy_fir_action0.clearBit(50);            
-    l_ecmd_rc |= l_ddrphy_fir_action1.setBit(50);
-    l_ecmd_rc |= l_ddrphy_fir_mask_or.setBit(50);
-
-    // 51   ddr0_fsm_err            recoverable         unmask
-    l_ecmd_rc |= l_ddrphy_fir_action0.clearBit(51);            
-    l_ecmd_rc |= l_ddrphy_fir_action1.setBit(51);
-    l_ecmd_rc |= l_ddrphy_fir_mask_and.clearBit(51);
-
-    // 52   ddr0_parity_err         recoverable         unmask
-    l_ecmd_rc |= l_ddrphy_fir_action0.clearBit(52);            
-    l_ecmd_rc |= l_ddrphy_fir_action1.setBit(52);
-    l_ecmd_rc |= l_ddrphy_fir_mask_and.clearBit(52);
-
-    // 53   ddr01_fir_parity_err    recoverable         mask (forever)
-    l_ecmd_rc |= l_ddrphy_fir_action0.clearBit(53);            
-    l_ecmd_rc |= l_ddrphy_fir_action1.setBit(53);
-    l_ecmd_rc |= l_ddrphy_fir_mask_or.setBit(53);
-    
-    // 54   Reserved                recoverable         mask (forever)
-    l_ecmd_rc |= l_ddrphy_fir_action0.clearBit(54);            
-    l_ecmd_rc |= l_ddrphy_fir_action1.setBit(54);
-    l_ecmd_rc |= l_ddrphy_fir_mask_or.setBit(54);
-
-    // 55   Reserved                recoverable         mask (forever)
-    l_ecmd_rc |= l_ddrphy_fir_action0.clearBit(55);            
-    l_ecmd_rc |= l_ddrphy_fir_action1.setBit(55);
-    l_ecmd_rc |= l_ddrphy_fir_mask_or.setBit(55);
-
-    // 56   ddr1_fsm_ckstp          channel checkstop   unmask
-    l_ecmd_rc |= l_ddrphy_fir_action0.clearBit(56);            
-    l_ecmd_rc |= l_ddrphy_fir_action1.clearBit(56);
-    l_ecmd_rc |= l_ddrphy_fir_mask_and.clearBit(56);
-    
-    // 57   ddr1_parity_ckstp       channel checkstop   unmask
-    l_ecmd_rc |= l_ddrphy_fir_action0.clearBit(57);            
-    l_ecmd_rc |= l_ddrphy_fir_action1.clearBit(57);
-    l_ecmd_rc |= l_ddrphy_fir_mask_and.clearBit(57);
-
-    // 58   ddr1_calibration_error  recoverable         mask (forever)
-    l_ecmd_rc |= l_ddrphy_fir_action0.clearBit(58);            
-    l_ecmd_rc |= l_ddrphy_fir_action1.setBit(58);
-    l_ecmd_rc |= l_ddrphy_fir_mask_or.setBit(58);
-
-    // 59   ddr1_fsm_err            recoverable         unmask
-    l_ecmd_rc |= l_ddrphy_fir_action0.clearBit(59);            
-    l_ecmd_rc |= l_ddrphy_fir_action1.setBit(59);
-    l_ecmd_rc |= l_ddrphy_fir_mask_and.clearBit(59);
-
-    // 60   ddr1_parity_err         recoverable         unmask
-    l_ecmd_rc |= l_ddrphy_fir_action0.clearBit(60);            
-    l_ecmd_rc |= l_ddrphy_fir_action1.setBit(60);
-    l_ecmd_rc |= l_ddrphy_fir_mask_and.clearBit(60);
-
-    // 61   Reserved                recoverable         mask (forever)
-    l_ecmd_rc |= l_ddrphy_fir_action0.clearBit(61);            
-    l_ecmd_rc |= l_ddrphy_fir_action1.setBit(61);
-    l_ecmd_rc |= l_ddrphy_fir_mask_or.setBit(61);
-
-    // 62   Reserved                recoverable         mask (forever)
-    l_ecmd_rc |= l_ddrphy_fir_action0.clearBit(62);            
-    l_ecmd_rc |= l_ddrphy_fir_action1.setBit(62);
-    l_ecmd_rc |= l_ddrphy_fir_mask_or.setBit(62);
-
-    // 63   Reserved                recoverable         mask (forever)
-    l_ecmd_rc |= l_ddrphy_fir_action0.clearBit(63);            
-    l_ecmd_rc |= l_ddrphy_fir_action1.setBit(63);
-    l_ecmd_rc |= l_ddrphy_fir_mask_or.setBit(63);
-
-
-
-    if(l_ecmd_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-
-        l_rc.setEcmdError(l_ecmd_rc);
-        return l_rc;
-    }                                                                              
-
-    // Write action0
-    l_rc = fapiPutScom_w_retry(i_target, PHY01_DDRPHY_FIR_ACTION0_REG_0x800200960301143f, l_ddrphy_fir_action0);
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    // Write action1
-    l_rc = fapiPutScom_w_retry(i_target, PHY01_DDRPHY_FIR_ACTION1_REG_0x800200970301143f, l_ddrphy_fir_action1);
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    
-    // Write mask OR
-    l_rc = fapiPutScom_w_retry(i_target, PHY01_DDRPHY_FIR_MASK_REG_OR_0x800200950301143f, l_ddrphy_fir_mask_or); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    // Write mask AND
-    l_rc = fapiPutScom_w_retry(i_target, PHY01_DDRPHY_FIR_MASK_REG_AND_0x800200940301143f, l_ddrphy_fir_mask_and); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-
-    //************************************************    
-    // DEBUG: read them all back to verify
-    l_rc = fapiGetScom_w_retry(i_target, PHY01_DDRPHY_FIR_ACTION0_REG_0x800200960301143f, l_ddrphy_fir_action0); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-    l_rc = fapiGetScom_w_retry(i_target, PHY01_DDRPHY_FIR_ACTION1_REG_0x800200970301143f, l_ddrphy_fir_action1); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-    l_rc = fapiGetScom_w_retry(i_target, PHY01_DDRPHY_FIR_MASK_REG_0x800200930301143f, l_ddrphy_fir_mask); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    //************************************************    
-    
-    
-    //*************************
-    //*************************
-    // MBAFIR
-    //*************************
-    //*************************
-    
-    ecmdDataBufferBase l_mbafir_mask(64);
-    ecmdDataBufferBase l_mbafir_mask_or(64);
-    ecmdDataBufferBase l_mbafir_mask_and(64);
-    ecmdDataBufferBase l_mbafir_action0(64);
-    ecmdDataBufferBase l_mbafir_action1(64);
-            
-    
-    // Read mask
-    l_rc = fapiGetScom_w_retry(i_target,
-                               MBA01_MBAFIRMASK_0x03010603,
-                               l_mbafir_mask); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-    
-    // TODO: Here is where I could clear bits that were bogus, before I unmask 
-    //       them. But typically we are expecting the bit set at this point
-    //       to be valid errors for PRD to log.
-
-
-    //(Action0, Action1, Mask)
-    //
-    // (0,0,0) = checkstop
-    // (0,1,0) = recoverable error
-    // (1,0,0) = report unused
-    // (1,1,0) = machine check
-    // (x,x,1) = error is masked
-                
-    l_ecmd_rc |= l_mbafir_action0.flushTo0();
-    l_ecmd_rc |= l_mbafir_action1.flushTo0();
-    l_ecmd_rc |= l_mbafir_mask_or.flushTo0();
-    l_ecmd_rc |= l_mbafir_mask_and.flushTo1();
-
-
-    // 0	Invalid_Maint_Cmd           recoverable         masked (forever)
-    l_ecmd_rc |= l_mbafir_action0.clearBit(0);            
-    l_ecmd_rc |= l_mbafir_action1.setBit(0);
-    l_ecmd_rc |= l_mbafir_mask_or.setBit(0);
-    
-    // 1	Invalid_Maint_Address       recoverable         masked (forever)
-    l_ecmd_rc |= l_mbafir_action0.clearBit(1);            
-    l_ecmd_rc |= l_mbafir_action1.setBit(1);
-    l_ecmd_rc |= l_mbafir_mask_or.setBit(1);
-
-    // 2	Multi_address_Maint_timeout recoverable         masked (until mss_unmask_maint_errors)
-    l_ecmd_rc |= l_mbafir_action0.clearBit(2);            
-    l_ecmd_rc |= l_mbafir_action1.setBit(2);
-    l_ecmd_rc |= l_mbafir_mask_or.setBit(2);
-
-    // 3	Internal_fsm_error          recoverable         unmask
-    l_ecmd_rc |= l_mbafir_action0.clearBit(3);            
-    l_ecmd_rc |= l_mbafir_action1.setBit(3);
-    l_ecmd_rc |= l_mbafir_mask_and.clearBit(3);
-
-    // 4	MCBIST_Error                recoverable         mask (forever)
-    l_ecmd_rc |= l_mbafir_action0.clearBit(4);            
-    l_ecmd_rc |= l_mbafir_action1.setBit(4);
-    l_ecmd_rc |= l_mbafir_mask_or.setBit(4);
-    
-    // 5	scom_cmd_reg_pe             recoverable         unmask
-    l_ecmd_rc |= l_mbafir_action0.clearBit(5);            
-    l_ecmd_rc |= l_mbafir_action1.setBit(5);
-    l_ecmd_rc |= l_mbafir_mask_and.clearBit(5);
-
-    // 6	channel_chkstp_err          channel checkstop   unmask
-    l_ecmd_rc |= l_mbafir_action0.clearBit(6);            
-    l_ecmd_rc |= l_mbafir_action1.clearBit(6);
-    l_ecmd_rc |= l_mbafir_mask_and.clearBit(6);
-
-    // 7	wrd_caw2_data_ce_ue_err     recoverable         masked (until mss_unmask_maint_errors)
-    l_ecmd_rc |= l_mbafir_action0.clearBit(7);            
-    l_ecmd_rc |= l_mbafir_action1.setBit(7);
-    l_ecmd_rc |= l_mbafir_mask_or.setBit(7);
-
-    // 8:14	RESERVED                    recoverable         mask (forever)
-    l_ecmd_rc |= l_mbafir_action0.clearBit(8,7);            
-    l_ecmd_rc |= l_mbafir_action1.setBit(8,7);
-    l_ecmd_rc |= l_mbafir_mask_or.setBit(8,7);
-
-    // 15	internal scom error         recoverable         mask (tbd)
-    l_ecmd_rc |= l_mbafir_action0.clearBit(15);            
-    l_ecmd_rc |= l_mbafir_action1.setBit(15);
-    l_ecmd_rc |= l_mbafir_mask_or.setBit(15);
-
-    // 16	internal scom error clone   recoverable         mask (tbd)
-    l_ecmd_rc |= l_mbafir_action0.clearBit(16);            
-    l_ecmd_rc |= l_mbafir_action1.setBit(16);
-    l_ecmd_rc |= l_mbafir_mask_or.setBit(16);
-
-
-    // 17:63 RESERVED           not implemented, so won't touch these
-
-    if(l_ecmd_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-
-        l_rc.setEcmdError(l_ecmd_rc);
-        return l_rc;
-    }                                                                              
-
-    // Write action0
-    l_rc = fapiPutScom_w_retry(i_target,
-                               MBA01_MBAFIRACT0_0x03010606,
-                               l_mbafir_action0);
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    // Write action1
-    l_rc = fapiPutScom_w_retry(i_target,
-                               MBA01_MBAFIRACT1_0x03010607,
-                               l_mbafir_action1);
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    
-    // Write mask OR
-    l_rc = fapiPutScom_w_retry(i_target,
-                               MBA01_MBAFIRMASK_OR_0x03010605,
-                               l_mbafir_mask_or); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-
-    // Write mask AND
-    l_rc = fapiPutScom_w_retry(i_target,
-                               MBA01_MBAFIRMASK_AND_0x03010604,
-                               l_mbafir_mask_and); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-
-    //************************************************    
-    // DEBUG: read them all back to verify
-    l_rc = fapiGetScom_w_retry(i_target,
-                               MBA01_MBAFIRACT0_0x03010606,
-                               l_mbafir_action0); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-    l_rc = fapiGetScom_w_retry(i_target,
-                               MBA01_MBAFIRACT1_0x03010607,
-                               l_mbafir_action1); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-    l_rc = fapiGetScom_w_retry(i_target,
-                               MBA01_MBAFIRMASK_0x03010603,
-                               l_mbafir_mask); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    //************************************************    
-    
-    
-    FAPI_INF("EXIT mss_unmask_ddrphy_errors()"); 
-
-    return i_bad_rc;
-}
-
-
-//------------------------------------------------------------------------------
-// mss_unmask_draminit_errors
-//------------------------------------------------------------------------------
-                                           
-fapi::ReturnCode mss_unmask_draminit_errors( const fapi::Target & i_target,
-                                             fapi::ReturnCode i_bad_rc )
-                                           
-{
-
-    FAPI_INF("ENTER mss_unmask_draminit_errors()"); 
-    
-    fapi::ReturnCode l_rc;
-    uint32_t l_ecmd_rc = 0;            
-
-    //*************************
-    //*************************
-    // MBACALFIR
-    //*************************
-    //*************************
-
-    ecmdDataBufferBase l_mbacalfir_mask(64);
-    ecmdDataBufferBase l_mbacalfir_mask_or(64);
-    ecmdDataBufferBase l_mbacalfir_mask_and(64);        
-    ecmdDataBufferBase l_mbacalfir_action0(64);
-    ecmdDataBufferBase l_mbacalfir_action1(64);
-
-
-    // Read mask
-    l_rc = fapiGetScom_w_retry(i_target, MBA01_MBACALFIR_MASK_0x03010403, l_mbacalfir_mask); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-    
-    // TODO: Here is where I could clear bits that were bogus, before I unmask 
-    //       them. But typically we are expecting the bit set at this point
-    //       to be valid errors for PRD to log.
-
-
-    //(Action0, Action1, Mask)
-    //
-    // (0,0,0) = checkstop
-    // (0,1,0) = recoverable error
-    // (1,0,0) = report unused
-    // (1,1,0) = machine check
-    // (x,x,1) = error is masked
-        
-    l_ecmd_rc |= l_mbacalfir_action0.flushTo0();
-    l_ecmd_rc |= l_mbacalfir_action1.flushTo0();
-    l_ecmd_rc |= l_mbacalfir_mask_or.flushTo0();
-    l_ecmd_rc |= l_mbacalfir_mask_and.flushTo1();        
-    
-    // 0	MBA Recoverable Error       recoverable         mask
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(0);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(0);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(0);
-
-    // 1	MBA Nonrecoverable Error    channel checkstop   mask
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(1);            
-    l_ecmd_rc |= l_mbacalfir_action1.clearBit(1);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(1);
-
-    // 2	Refresh Overrun             recoverable         mask
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(2);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(2);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(2);
-
-    // 3	WAT error                   recoverable         mask (forever)
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(3);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(3);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(3);
-
-    // 4	RCD Parity Error 0          recoverable         unmask (only if set)
-    // TODO: Unmask, only if set, only if ISD DIMM
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(4);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(4);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(4);
-
-    // 5	ddr0_cal_timeout_err        recoverable         mask
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(5);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(5);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(5);
-
-    // 6	ddr1_cal_timeout_err        recoverable         mask
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(6);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(6);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(6);
-
-    // 7	RCD Parity Error 1          recoverable         unmask (only if set)
-    // TODO: Unmask, only if set, only if ISD DIMM
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(7);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(7);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(7);
-
-
-    // 8	mbx to mba par error        channel checkstop   mask
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(8);            
-    l_ecmd_rc |= l_mbacalfir_action1.clearBit(8);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(8);
-
-    // 9	mba_wrd ue                  recoverable         mask
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(9);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(9);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(9);
-
-    // 10	mba_wrd ce                  recoverable         mask
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(10);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(10);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(10);
-
-    // 11	mba_maint ue                recoverable         mask
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(11);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(11);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(11);
-
-    // 12	mba_maint ce                recoverable         mask
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(12);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(12);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(12);
-
-    // 13	ddr_cal_reset_timeout       channel checkstop   mask
-    // TODO: Leaving masked until I find proper spot to unmask this
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(13);            
-    l_ecmd_rc |= l_mbacalfir_action1.clearBit(13);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(13);
-
-    // 14	wrq_data_ce                 recoverable         mask
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(14);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(14);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(14);
-
-    // 15	wrq_data_ue                 recoverable         mask
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(15);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(15);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(15);
-
-    // 16	wrq_data_sue                recoverable         mask
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(16);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(16);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(16);
-
-    // 17	wrq_rrq_hang_err            recoverable         mask
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(17);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(17);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(17);
-
-    // 18	sm_1hot_err                 recoverable         unmask
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(18);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(18);
-    l_ecmd_rc |= l_mbacalfir_mask_and.clearBit(18);
-
-    // 19	wrd_scom_error              recoverable         mask (tbd)
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(19);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(19);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(19);
-
-    // 20	internal_scom_error         recoverable         mask (tbd)
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(20);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(20);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(20);
-
-    // 21	internal_scom_error_copy    recoverable         mask (tbd)
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(21);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(21);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(21);
-
-    // 22-63	Reserved            not implemented, so won't touch these          
-
-
-    if(l_ecmd_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-
-        l_rc.setEcmdError(l_ecmd_rc);
-        return l_rc;
-    }                                                                              
-
-    // Write action0
-    l_rc = fapiPutScom_w_retry(i_target, MBA01_MBACALFIR_ACTION0_0x03010406, l_mbacalfir_action0);
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    // Write action1
-    l_rc = fapiPutScom_w_retry(i_target, MBA01_MBACALFIR_ACTION1_0x03010407, l_mbacalfir_action1);
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    
-    // Write mask OR
-    l_rc = fapiPutScom_w_retry(i_target, MBA01_MBACALFIR_MASK_OR_0x03010405, l_mbacalfir_mask_or); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    // Write mask AND
-    l_rc = fapiPutScom_w_retry(i_target, MBA01_MBACALFIR_MASK_AND_0x03010404, l_mbacalfir_mask_and); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-
-    //************************************************    
-    // DEBUG: read them all back to verify
-    l_rc = fapiGetScom_w_retry(i_target, MBA01_MBACALFIR_ACTION0_0x03010406, l_mbacalfir_action0); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-    l_rc = fapiGetScom_w_retry(i_target, MBA01_MBACALFIR_ACTION1_0x03010407, l_mbacalfir_action1); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-    l_rc = fapiGetScom_w_retry(i_target, MBA01_MBACALFIR_MASK_0x03010403, l_mbacalfir_mask); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    //************************************************    
-    
-    
-    FAPI_INF("EXIT mss_unmask_draminit_errors()"); 
-
-    return i_bad_rc;
-}
-
-
-//------------------------------------------------------------------------------
-// mss_unmask_draminit_training_errors
-//------------------------------------------------------------------------------
-                                           
-fapi::ReturnCode mss_unmask_draminit_training_errors( 
-                                             const fapi::Target & i_target,
-                                             fapi::ReturnCode i_bad_rc )
-                                           
-{
-
-    FAPI_INF("ENTER mss_unmask_draminit_training_errors()"); 
-    
-    fapi::ReturnCode l_rc;
-    uint32_t l_ecmd_rc = 0;            
-
-    //*************************
-    //*************************
-    // MBACALFIR
-    //*************************
-    //*************************
-
-    ecmdDataBufferBase l_mbacalfir_mask(64);
-    ecmdDataBufferBase l_mbacalfir_mask_and(64);
-
-    // NOTE: In the IPL sequence, mss_unmask_draminit_errors has already been
-    // called, which has already set the MBACALFIR action regs to their runtime
-    // values, so no need to touch the action regs here.
-
-    // NOTE: In the IPL sequence, mss_unmask_draminit_errors has already been
-    // called, which has already unmasked the approproiate MBACALFIR errors
-    // following mss_draminit. So all we will do here is unmask a few more
-    // errors that would be considered valid after the mss_draminit_training
-    // procedure. 
-    
-
-    // Read mask
-    l_rc = fapiGetScom_w_retry(i_target, MBA01_MBACALFIR_MASK_0x03010403, l_mbacalfir_mask); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-    
-    // TODO: Here is where I could clear bits that were bogus, before I unmask 
-    //       them. But typically we are expecting the bit set at this point
-    //       to be valid errors for PRD to log.
-
-
-    //(Action0, Action1, Mask)
-    //
-    // (0,0,0) = checkstop
-    // (0,1,0) = recoverable error
-    // (1,0,0) = report unused
-    // (1,1,0) = machine check
-    // (x,x,1) = error is masked
-                
-    l_ecmd_rc |= l_mbacalfir_mask_and.flushTo1();        
-        
-    // 0	MBA Recoverable Error       recoverable         umask
-    l_ecmd_rc |= l_mbacalfir_mask_and.clearBit(0);
-
-    // 4	RCD Parity Error 0          recoverable         unmask (only if set)
-    // TODO: Unmask, only if set, only if ISD DIMM
-
-    // 7	RCD Parity Error 1          recoverable         unmask (only if set)
-    // TODO: Unmask, only if set, only if ISD DIMM
-
-    if(l_ecmd_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-
-        l_rc.setEcmdError(l_ecmd_rc);
-        return l_rc;
-    }                                                                              
-
-    
-    // Write mask AND
-    l_rc = fapiPutScom_w_retry(i_target, MBA01_MBACALFIR_MASK_AND_0x03010404, l_mbacalfir_mask_and); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    //************************************************    
-    // DEBUG: read them all back to verify
-    l_rc = fapiGetScom_w_retry(i_target, MBA01_MBACALFIR_MASK_0x03010403, l_mbacalfir_mask); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    //************************************************    
-    
-    
-    FAPI_INF("EXIT mss_unmask_draminit_training_errors()"); 
-
-    return i_bad_rc;
-}
-
-
-//------------------------------------------------------------------------------
-// mss_unmask_draminit_training_advanced_errors
-//------------------------------------------------------------------------------
-                                           
-fapi::ReturnCode mss_unmask_draminit_training_advanced_errors( 
-                                             const fapi::Target & i_target,
-                                             fapi::ReturnCode i_bad_rc )
-                                           
-{
-
-    FAPI_INF("ENTER mss_unmask_draminit_training_advanced_errors()"); 
-    
-    fapi::ReturnCode l_rc;
-    uint32_t l_ecmd_rc = 0;            
-
-    //*************************
-    //*************************
-    // MBACALFIR
-    //*************************
-    //*************************
-
-    ecmdDataBufferBase l_mbacalfir_mask(64);
-    ecmdDataBufferBase l_mbacalfir_mask_and(64);
-
-    // NOTE: In the IPL sequence, mss_unmask_draminit_errors has already been
-    // called, which has already set the MBACALFIR action regs to their runtime
-    // values, so no need to touch the action regs here.
-
-    // NOTE: In the IPL sequence, mss_unmask_draminit_errors and 
-    // mss_unmask_draminit_training has already been
-    // called, which has already unmasked the approproiate MBACALFIR errors
-    // following mss_draminit and mss_draminit_training. So all we will do here
-    // is unmask a few more errors that would be considered valid after the
-    // mss_draminit_training_advanced procedure. 
-    
-
-    // Read mask
-    l_rc = fapiGetScom_w_retry(i_target, MBA01_MBACALFIR_MASK_0x03010403, l_mbacalfir_mask); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-    
-    // TODO: Here is where I could clear bits that were bogus, before I unmask 
-    //       them. But typically we are expecting the bit set at this point
-    //       to be valid errors for PRD to log.
-
-
-    //(Action0, Action1, Mask)
-    //
-    // (0,0,0) = checkstop
-    // (0,1,0) = recoverable error
-    // (1,0,0) = report unused
-    // (1,1,0) = machine check
-    // (x,x,1) = error is masked
-                
-    l_ecmd_rc |= l_mbacalfir_mask_and.flushTo1();            
-    
-    // 4	RCD Parity Error 0          recoverable         unmask 
-    // TODO: Unmask, only if ISD DIMM
-
-    // 7	RCD Parity Error 1          recoverable         unmask 
-    // TODO: Unmask, only if ISD DIMM
-
-    // 8	mbx to mba par error        channel checkstop   unmask
-    l_ecmd_rc |= l_mbacalfir_mask_and.clearBit(8);
-
-    // 11	mba_maint ue                recoverable         unmask
-    l_ecmd_rc |= l_mbacalfir_mask_and.clearBit(11);
-
-    // 12	mba_maint ce                recoverable         unmask
-    l_ecmd_rc |= l_mbacalfir_mask_and.clearBit(12);
-
-    // 17	wrq_rrq_hang_err            recoverable         unmask
-    l_ecmd_rc |= l_mbacalfir_mask_and.clearBit(17);
-
-
-    if(l_ecmd_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-
-        l_rc.setEcmdError(l_ecmd_rc);
-        return l_rc;
-    }                                                                              
-
-    
-    // Write mask AND
-    l_rc = fapiPutScom_w_retry(i_target, MBA01_MBACALFIR_MASK_AND_0x03010404, l_mbacalfir_mask_and); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    //************************************************    
-    // DEBUG: read them all back to verify
-    l_rc = fapiGetScom_w_retry(i_target, MBA01_MBACALFIR_MASK_0x03010403, l_mbacalfir_mask); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    //************************************************ 
-    
-
-    //*************************
-    //*************************
-    // MBSFIR
-    //*************************
-    //*************************    
-    
-    fapi::Target l_targetCentaur;
-    uint8_t l_mbaPosition;             // 0 = mba01, 1 = mba23
-
-    uint32_t l_mbsfir_mask_address[2]={
-    // port0/1                       port2/3
-    MBS01_MBSFIRMASK_0x02011603,     MBS23_MBSFIRMASK_0x02011703};
-
-    uint32_t l_mbsfir_mask_or_address[2]={
-    // port0/1                       port2/3
-    MBS01_MBSFIRMASK_OR_0x02011605,  MBS23_MBSFIRMASK_OR_0x02011705};
-
-    uint32_t l_mbsfir_mask_and_address[2]={
-    // port0/1                       port2/3
-    MBS01_MBSFIRMASK_AND_0x02011604, MBS23_MBSFIRMASK_AND_0x02011704};
-
-    uint32_t l_mbsfir_action0_address[2]={
-    // port0/1                       port2/3
-    MBS01_MBSFIRACT0_0x02011606,     MBS23_MBSFIRACT0_0x02011706};
-
-    uint32_t l_mbsfir_action1_address[2]={
-    // port0/1                       port2/3
-    MBS01_MBSFIRACT1_0x02011607,     MBS23_MBSFIRACT1_0x02011707};
-
-    ecmdDataBufferBase l_mbsfir_mask(64);
-    ecmdDataBufferBase l_mbsfir_mask_or(64);
-    ecmdDataBufferBase l_mbsfir_mask_and(64);        
-    ecmdDataBufferBase l_mbsfir_action0(64);
-    ecmdDataBufferBase l_mbsfir_action1(64);
-
-    // Get Centaur target for the given MBA
-    l_rc = fapiGetParentChip(i_target, l_targetCentaur);
-    if(l_rc)
-    {
-        FAPI_ERR("Error getting Centaur parent target for the given MBA");
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-    
-    // Get MBA position: 0 = mba01, 1 = mba23
-    l_rc = FAPI_ATTR_GET(ATTR_CHIP_UNIT_POS, &i_target, l_mbaPosition);
-    if(l_rc)
-    {
-        FAPI_ERR("Error getting MBA position");
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);                
-        return l_rc;
-    }    
-    
-    // Read mask
-    l_rc = fapiGetScom_w_retry(l_targetCentaur, 
-                               l_mbsfir_mask_address[l_mbaPosition], 
-                               l_mbsfir_mask); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-    
-    // TODO: Here is where I could clear bits that were bogus, before I unmask 
-    //       them. But typically we are expecting the bit set at this point
-    //       to be valid errors for PRD to log.
-
-
-    //(Action0, Action1, Mask)
-    //
-    // (0,0,0) = checkstop
-    // (0,1,0) = recoverable error
-    // (1,0,0) = report unused
-    // (1,1,0) = machine check
-    // (x,x,1) = error is masked
-                
-    l_ecmd_rc |= l_mbsfir_action0.flushTo0();
-    l_ecmd_rc |= l_mbsfir_action1.flushTo0();
-    l_ecmd_rc |= l_mbsfir_mask_or.flushTo0();
-    l_ecmd_rc |= l_mbsfir_mask_and.flushTo1();
-
-    // 0	scom_par_errors             recoverable         unmask
-    l_ecmd_rc |= l_mbsfir_action0.clearBit(0);            
-    l_ecmd_rc |= l_mbsfir_action1.setBit(0);
-    l_ecmd_rc |= l_mbsfir_mask_and.clearBit(0);
-
-    // 1	mbx_par_errors              channel checkstop   unmask
-    l_ecmd_rc |= l_mbsfir_action0.clearBit(1);            
-    l_ecmd_rc |= l_mbsfir_action1.clearBit(1);
-    l_ecmd_rc |= l_mbsfir_mask_and.clearBit(1);
-
-    // 2:14	RESERVED                    recoverable         mask (forever)
-    l_ecmd_rc |= l_mbsfir_action0.clearBit(2,13);            
-    l_ecmd_rc |= l_mbsfir_action1.setBit(2,13);
-    l_ecmd_rc |= l_mbsfir_mask_or.setBit(2,13);
-
-    // 15	internal scom error         recoverable         mask (tbd)
-    l_ecmd_rc |= l_mbsfir_action0.clearBit(15);            
-    l_ecmd_rc |= l_mbsfir_action1.setBit(15);
-    l_ecmd_rc |= l_mbsfir_mask_or.setBit(15);
-
-    // 16	internal scom error clone   recoverable         mask (tbd)
-    l_ecmd_rc |= l_mbsfir_action0.clearBit(16);            
-    l_ecmd_rc |= l_mbsfir_action1.setBit(16);
-    l_ecmd_rc |= l_mbsfir_mask_or.setBit(16);
-
-    // 17:63 RESERVED           not implemented, so won't touch these
-    
-        
-    if(l_ecmd_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-
-        l_rc.setEcmdError(l_ecmd_rc);
-        return l_rc;
-    }                                                                              
-
-    // Write action0
-    l_rc = fapiPutScom_w_retry(l_targetCentaur, 
-                               l_mbsfir_action0_address[l_mbaPosition], 
-                               l_mbsfir_action0); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    // Write action1
-    l_rc = fapiPutScom_w_retry(l_targetCentaur, 
-                               l_mbsfir_action1_address[l_mbaPosition], 
-                               l_mbsfir_action1); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    
-    // Write mask OR
-    l_rc = fapiPutScom_w_retry(l_targetCentaur, 
-                               l_mbsfir_mask_or_address[l_mbaPosition], 
-                               l_mbsfir_mask_or); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-
-    // Write mask AND
-    l_rc = fapiPutScom_w_retry(l_targetCentaur, 
-                               l_mbsfir_mask_and_address[l_mbaPosition], 
-                               l_mbsfir_mask_and); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-
-    //************************************************    
-    // DEBUG: read them all back to verify
-    l_rc = fapiGetScom_w_retry(l_targetCentaur, 
-                               l_mbsfir_action0_address[l_mbaPosition], 
-                               l_mbsfir_action0); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    l_rc = fapiGetScom_w_retry(l_targetCentaur, 
-                               l_mbsfir_action1_address[l_mbaPosition], 
-                               l_mbsfir_action1); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    l_rc = fapiGetScom_w_retry(l_targetCentaur, 
-                               l_mbsfir_mask_address[l_mbaPosition], 
-                               l_mbsfir_mask); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    //************************************************    
-   
-    
-    FAPI_INF("EXIT mss_unmask_draminit_training_advanced_errors()"); 
-
-    return i_bad_rc;
-}
-
-
-
-//------------------------------------------------------------------------------
-// mss_unmask_maint_errors
-//------------------------------------------------------------------------------
-                                           
-fapi::ReturnCode mss_unmask_maint_errors(const fapi::Target & i_target,
-                                         fapi::ReturnCode i_bad_rc )
-                                           
-{
-
-    // Target: Centaur
-    
-    FAPI_INF("ENTER mss_unmask_maint_errors()"); 
-    
-    fapi::ReturnCode l_rc;
-    uint32_t l_ecmd_rc = 0; 
-    std::vector<fapi::Target> l_mbaChiplets;
-    uint8_t l_mbaPosition;             // 0 = mba01, 1 = mba23
-
-    ecmdDataBufferBase l_mbacalfir_mask(64);
-    ecmdDataBufferBase l_mbacalfir_mask_and(64);    
-
-    ecmdDataBufferBase l_mbafir_mask(64);
-    ecmdDataBufferBase l_mbafir_mask_and(64);
-           
-    ecmdDataBufferBase l_mbaspa_mask(64);
-
-    uint32_t l_mbeccfir_mask_address[2]={
-    // port0/1                            port2/3
-    MBS_ECC0_MBECCFIR_MASK_0x02011443,    MBS_ECC1_MBECCFIR_MASK_0x02011483};
-
-    uint32_t l_mbeccfir_mask_or_address[2]={
-    // port0/1                            port2/3
-    MBS_ECC0_MBECCFIR_MASK_OR_0x02011445, MBS_ECC1_MBECCFIR_MASK_OR_0x02011485};
-
-    uint32_t l_mbeccfir_mask_and_address[2]={
-    // port0/1                            port2/3
-    MBS_ECC0_MBECCFIR_MASK_AND_0x02011444,MBS_ECC1_MBECCFIR_MASK_AND_0x02011484};
-
-    uint32_t l_mbeccfir_action0_address[2]={
-    // port0/1                            port2/3
-    MBS_ECC0_MBECCFIR_ACTION0_0x02011446, MBS_ECC1_MBECCFIR_ACTION0_0x02011486};
-
-    uint32_t l_mbeccfir_action1_address[2]={
-    // port0/1                            port2/3
-    MBS_ECC0_MBECCFIR_ACTION1_0x02011447, MBS_ECC1_MBECCFIR_ACTION1_0x02011487};
-
-    ecmdDataBufferBase l_mbeccfir_mask(64);
-    ecmdDataBufferBase l_mbeccfir_mask_or(64);
-    ecmdDataBufferBase l_mbeccfir_mask_and(64);
-    ecmdDataBufferBase l_mbeccfir_action0(64);
-    ecmdDataBufferBase l_mbeccfir_action1(64);
-
-
-
-    // Get associated functional MBAs on this centaur
-    l_rc = fapiGetChildChiplets(i_target,
-                                fapi::TARGET_TYPE_MBA_CHIPLET,
-                                l_mbaChiplets);
-    if(l_rc)
-    {
-        FAPI_ERR("Error getting functional MBAs on this Centaur");
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);                
-        return l_rc;
-    }    
-
-    // Loop through functional MBAs on this Centaur
-    for (uint32_t i=0; i < l_mbaChiplets.size(); i++)
-    {
-
-        // Get MBA position: 0 = mba01, 1 = mba23
-        l_rc = FAPI_ATTR_GET(ATTR_CHIP_UNIT_POS, &l_mbaChiplets[i], l_mbaPosition);
-        if(l_rc)
-        {
-            FAPI_ERR("Error getting MBA position");
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);                
-            return l_rc;
-        }    
-
-
-
-
-        //*************************
-        //*************************
-        // MBACALFIR
-        //*************************
-        //*************************    
-
-
-        // NOTE: In the IPL sequence, mss_unmask_draminit_errors has already been
-        // called, which has already set the MBACALFIR action regs to their runtime
-        // values, so no need to touch the action regs here.
-
-        // NOTE: In the IPL sequence, mss_unmask_draminit_errors,
-        // mss_unmask_draminit_training and mss_unmask_draminit_training_advanced
-        // have already been called, which have already unmasked the approproiate
-        // MBACALFIR errors following mss_draminit, mss_draminit_training, and
-        // mss_unmask_draminit_training_advanced. So all we will do here
-        // is unmask a few more errors that would be considered valid after the
-        // mss_draminit_mc procedure. 
-    
-        // Read mask
-        l_rc = fapiGetScom_w_retry(l_mbaChiplets[i],
-                                   MBA01_MBACALFIR_MASK_0x03010403,
-                                   l_mbacalfir_mask);       
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-        
-        // TODO: Here is where I could clear bits that were bogus, before I unmask 
-        //       them. But typically we are expecting the bit set at this point
-        //       to be valid errors for PRD to log.
-
-
-        //(Action0, Action1, Mask)
-        //
-        // (0,0,0) = checkstop
-        // (0,1,0) = recoverable error
-        // (1,0,0) = report unused
-        // (1,1,0) = machine check
-        // (x,x,1) = error is masked
-        
-        l_ecmd_rc |= l_mbacalfir_mask_and.flushTo1();            
-                    
-        // 1	MBA Nonrecoverable Error    channel checkstop   unmask
-        l_ecmd_rc |= l_mbacalfir_mask_and.clearBit(1);
-
-        // 2	Refresh Overrun             recoverable         unmask
-        l_ecmd_rc |= l_mbacalfir_mask_and.clearBit(2);
-        
-        // 5	ddr0_cal_timeout_err        recoverable         unmask
-        l_ecmd_rc |= l_mbacalfir_mask_and.clearBit(5);
-
-        // 6	ddr1_cal_timeout_err        recoverable         unmask
-        l_ecmd_rc |= l_mbacalfir_mask_and.clearBit(6);
-        
-        if(l_ecmd_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-
-            l_rc.setEcmdError(l_ecmd_rc);
-            return l_rc;
-        }                                                                              
-
-        // Write mask AND
-        l_rc = fapiPutScom_w_retry(l_mbaChiplets[i],
-                                   MBA01_MBACALFIR_MASK_AND_0x03010404,
-                                   l_mbacalfir_mask_and); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-
-        //************************************************    
-        // DEBUG: read them all back to verify
-        l_rc = fapiGetScom_w_retry(l_mbaChiplets[i],
-                                   MBA01_MBACALFIR_MASK_0x03010403,
-                                   l_mbacalfir_mask);       
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-
-        //************************************************ 
-    
-
-        //*************************
-        //*************************
-        // MBAFIR
-        //*************************
-        //*************************    
-        
-        // NOTE: In the IPL sequence, mss_unmask_ddr_phy_errors has already been
-        // called, which has already set the MBAFIR action regs to their runtime
-        // values, so no need to touch the action regs here.
-
-        // NOTE: In the IPL sequence, mss_unmask_ddr_phy_errors,
-        // has already been called, which has already unmasked the approproiate
-        // MBAFIR errors following mss_ddr_phy_reset. So all we will do here
-        // is unmask a few more errors that would be considered valid after the
-        // mss_draminit_mc procedure. 
-        
-        // Read mask
-        l_rc = fapiGetScom_w_retry(l_mbaChiplets[i],
-                                   MBA01_MBAFIRMASK_0x03010603,
-                                   l_mbafir_mask); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-        
-        // TODO: Here is where I could clear bits that were bogus, before I unmask 
-        //       them. But typically we are expecting the bit set at this point
-        //       to be valid errors for PRD to log.
-
-
-        //(Action0, Action1, Mask)
-        //
-        // (0,0,0) = checkstop
-        // (0,1,0) = recoverable error
-        // (1,0,0) = report unused
-        // (1,1,0) = machine check
-        // (x,x,1) = error is masked
-                    
-        l_ecmd_rc |= l_mbafir_mask_and.flushTo1();
-
-        // 2	Multi_address_Maint_timeout recoverable         unmask
-        l_ecmd_rc |= l_mbafir_mask_and.clearBit(2);
-
-
-        // 7	wrd_caw2_data_ce_ue_err     recoverable         unmask
-        l_ecmd_rc |= l_mbafir_mask_and.clearBit(7);
-
-        if(l_ecmd_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-
-            l_rc.setEcmdError(l_ecmd_rc);
-            return l_rc;
-        }                                                                              
-
-        // Write mask AND
-        l_rc = fapiPutScom_w_retry(l_mbaChiplets[i],
-                                   MBA01_MBAFIRMASK_AND_0x03010604,
-                                   l_mbafir_mask_and); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-
-
-        //************************************************    
-        // DEBUG: read them all back to verify
-        l_rc = fapiGetScom_w_retry(l_mbaChiplets[i],
-                                   MBA01_MBAFIRMASK_0x03010603,
-                                   l_mbafir_mask); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-
-        //************************************************    
-
-
-        //*************************
-        //*************************
-        // MBASPA
-        //*************************
-        //*************************
-        
-                
-        // Read mask
-        l_rc = fapiGetScom_w_retry(l_mbaChiplets[i],
-                                   MBA01_MBSPAMSKQ_0x03010614,
-                                   l_mbaspa_mask); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-        
-        // TODO: Here is where I could clear bits that were bogus, before I unmask 
-        //       them. But typically we are expecting the bit set at this point
-        //       to be valid errors for PRD to log.
-
-
-        // 0	Command_Complete                             mask (broken on DD1)
-        // NOTE: This bit broken in DD1.
-        // It can be made to come on when cmd completes clean, or make to come
-        // on when cmd stops on error, but can't be set to do both. 
-        l_ecmd_rc |= l_mbaspa_mask.setBit(0);            
-
-        // 1	Hard_CE_ETE_Attn                             mask (until after memdiags)
-        // NOTE: FW memdiags needs this masked because they want to wait till
-        // cmd gets to end of rank before getting any attention.
-        // NOTE: Hards counted during super fast read, but can't be called 
-        // true hard CEs since super fast read doesn't write back and read again.
-        l_ecmd_rc |= l_mbaspa_mask.setBit(1);            
-
-        // 2	Soft_CE_ETE_Attn                             mask (until after memdiags)
-        // NOTE: FW memdiags needs this masked because they want to wait till
-        // cmd gets to end of rank before getting any attention.
-        // NOTE: Softs not counted during super fast read.
-        l_ecmd_rc |= l_mbaspa_mask.setBit(2);            
-
-        // 3	Intermittent_ETE_Attn                        mask (until after memdiags)
-        // NOTE: FW memdiags needs this masked because they want to wait till
-        // cmd gets to end of rank before getting any attention.
-        // NOTE: Intermittents not counted during super fast read.
-        l_ecmd_rc |= l_mbaspa_mask.setBit(3);            
-
-        // 4	RCE_ETE_Attn                                 mask (until after memdiags)
-        // NOTE: FW memdiags needs this masked because they want to wait till
-        // cmd gets to end of rank before getting any attention.
-        // NOTE: RCEs not counted during super fast read.
-        l_ecmd_rc |= l_mbaspa_mask.setBit(4);            
-
-        // 5	Emergency_Throttle_Attn                      masked (forever)
-        l_ecmd_rc |= l_mbaspa_mask.setBit(5);            
-
-        // 6	Firmware_Attn0                               masked (forever)
-        l_ecmd_rc |= l_mbaspa_mask.setBit(6);            
-
-        // 7	Firmware_Attn1                               masked (forever)
-        l_ecmd_rc |= l_mbaspa_mask.setBit(7);            
-
-        // 8	wat_debug_attn                               unmasked
-        // NOTE: DD1 workaround for broken bit 0. This bit will come on whenever 
-        // cmd stops, either stop clean or stop on error.
-        l_ecmd_rc |= l_mbaspa_mask.clearBit(8);            
-
-        // 9	Spare_Attn1                                  masked (forever)
-        l_ecmd_rc |= l_mbaspa_mask.setBit(9);            
-
-        // 10	MCBIST_Done                                  masked (forever)
-        l_ecmd_rc |= l_mbaspa_mask.setBit(10);            
-
-        // 11:63 RESERVED     not implemented, so won't touch these
-                    
-
-        if(l_ecmd_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-
-            l_rc.setEcmdError(l_ecmd_rc);
-            return l_rc;
-        }                                                                              
-        
-        // Write mask
-        l_rc = fapiPutScom_w_retry(l_mbaChiplets[i],
-                                   MBA01_MBSPAMSKQ_0x03010614,
-                                   l_mbaspa_mask); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-
-        //************************************************    
-        // DEBUG: read them all back to verify
-        l_rc = fapiGetScom_w_retry(l_mbaChiplets[i],
-                                   MBA01_MBSPAMSKQ_0x03010614,
-                                   l_mbaspa_mask);
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-        //************************************************    
-
-
-
-        //*************************
-        //*************************
-        // MBECCFIR
-        //*************************
-        //*************************    
-        
-        // Get MBA position: 0 = mba01, 1 = mba23
-        l_rc = FAPI_ATTR_GET(ATTR_CHIP_UNIT_POS, &l_mbaChiplets[i], l_mbaPosition);
-        if(l_rc)
-        {
-            FAPI_ERR("Error getting MBA position");
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);                
-            return l_rc;
-        }    
-        
-        // Read mask
-        l_rc = fapiGetScom_w_retry(i_target, 
-                                   l_mbeccfir_mask_address[l_mbaPosition], 
-                                   l_mbeccfir_mask); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-        
-        // TODO: Here is where I could clear bits that were bogus, before I unmask 
-        //       them. But typically we are expecting the bit set at this point
-        //       to be valid errors for PRD to log.
-
-
-        //(Action0, Action1, Mask)
-        //
-        // (0,0,0) = checkstop
-        // (0,1,0) = recoverable error
-        // (1,0,0) = report unused
-        // (1,1,0) = machine check
-        // (x,x,1) = error is masked
-                    
-        l_ecmd_rc |= l_mbeccfir_action0.flushTo0();
-        l_ecmd_rc |= l_mbeccfir_action1.flushTo0();
-        l_ecmd_rc |= l_mbeccfir_mask_or.flushTo0();
-        l_ecmd_rc |= l_mbeccfir_mask_and.flushTo1();
-
-        // 0:7	Memory MPE Rank 0:7         recoverable         mask (until mainline traffic)
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(0,8);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(0,8);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(0,8);
-
-        // 8:15	Reserved                    recoverable         mask (forever)
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(8,8);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(8,8);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(8,8);
-        
-        // 16	Memory NCE                  recoverable         mask (until mainline traffic)
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(16);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(16);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(16);
-
-        // 17	Memory RCE                  recoverable         mask (until mainline traffic)
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(17);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(17);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(17);
-
-        // 18	Memory SUE                  recoverable         mask (forever)
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(18);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(18);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(18);
-
-        // 19	Memory UE                   recoverable         mask (until mainline traffic)
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(19);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(19);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(19);
-
-        // 20:27	Maint MPE Rank 0:7      recoverable         mask (until after memdiags)
-        // NOTE: FW memdiags needs this masked because they want to wait till
-        // cmd gets to end of rank before getting any attention.
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(20,8);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(20,8);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(20,8);
-
-        // 28:35	Reserved                recoverable         mask (forever)
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(28,8);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(28,8);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(28,8);
-        
-        // 36	Maintenance NCE             recoverable         mask (forever)
-        // NOTE: PRD planning to use maint CE thresholds instead.
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(36);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(36);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(36);
-
-        // 37	Maintenance SCE             recoverable         mask (forever)
-        // NOTE: Don't care if symbol still bad after it's symbol marked.
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(37);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(37);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(37);
-
-        // 38	Maintenance MCE             recoverable         mask (forever)
-        // NOTE: PRD plans to check manually as part of verify chip mark procedure.
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(38);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(38);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(38);
-
-        // 39	Maintenance RCE             recoverable         mask (forever)
-        // NOTE: PRD planning to use maint RCE thresholds instead.
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(39);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(39);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(39);
-
-        // 40	Maintenance SUE             recoverable         mask (forever)
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(40);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(40);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(40);
-
-        // 41	Maintenance UE              recoverable         mask (until after memdiags)
-        // NOTE: FW memdiags needs this masked because they want to wait till
-        // cmd gets to end of rank before getting any attention.
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(41);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(41);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(41);
-
-        // 42	MPE during maintenance mark mode  recoverable   mask (forever)
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(42);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(42);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(42);
-
-        // 43	Prefetch Memory UE          recoverable         mask (until mainline traffic)
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(43);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(43);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(43);
-
-        // 44	Memory RCD parity error     recoverable         mask (forever)
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(44);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(44);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(44);
-
-        // 45	Maint RCD parity error.     recoverable         mask (forever)
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(45);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(45);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(45);
-
-        // 46	Recoverable reg parity      recoverable         unmask
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(46);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(46);
-        l_ecmd_rc |= l_mbeccfir_mask_and.clearBit(46);
-
-
-        // 47	Unrecoverable reg parity    channel checkstop   unmask
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(47);            
-        l_ecmd_rc |= l_mbeccfir_action1.clearBit(47);
-        l_ecmd_rc |= l_mbeccfir_mask_and.clearBit(47);
-
-        // 48	Maskable reg parity error   recoverable         mask (forever)
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(48);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(48);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(48);
-
-        // 49	ecc datapath parity error   channel checkstop   unmask
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(49);            
-        l_ecmd_rc |= l_mbeccfir_action1.clearBit(49);
-        l_ecmd_rc |= l_mbeccfir_mask_and.clearBit(49);
-
-        // 50	internal scom error         recovereble         mask (tbd)
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(50);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(50);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(50);
-
-        // 51	internal scom error clone   recovereble         mask (tbd)
-        l_ecmd_rc |= l_mbeccfir_action0.clearBit(51);            
-        l_ecmd_rc |= l_mbeccfir_action1.setBit(51);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(51);
-
-        // 52:63	Reserved    not implemented, so won't touch these
-
-
-        
-            
-        if(l_ecmd_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-
-            l_rc.setEcmdError(l_ecmd_rc);
-            return l_rc;
-        }                                                                              
-
-        // Write action0
-        l_rc = fapiPutScom_w_retry(i_target, 
-                                   l_mbeccfir_action0_address[l_mbaPosition], 
-                                   l_mbeccfir_action0); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-
-        // Write action1
-        l_rc = fapiPutScom_w_retry(i_target, 
-                                   l_mbeccfir_action1_address[l_mbaPosition], 
-                                   l_mbeccfir_action1); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-
-        
-        // Write mask OR
-        l_rc = fapiPutScom_w_retry(i_target, 
-                                   l_mbeccfir_mask_or_address[l_mbaPosition], 
-                                   l_mbeccfir_mask_or); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-
-        // Write mask AND
-        l_rc = fapiPutScom_w_retry(i_target, 
-                                   l_mbeccfir_mask_and_address[l_mbaPosition], 
-                                   l_mbeccfir_mask_and); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-
-
-        //************************************************    
-        // DEBUG: read them all back to verify
-        l_rc = fapiGetScom_w_retry(i_target, 
-                                   l_mbeccfir_action0_address[l_mbaPosition], 
-                                   l_mbeccfir_action0); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-
-        l_rc = fapiGetScom_w_retry(i_target, 
-                                   l_mbeccfir_action1_address[l_mbaPosition], 
-                                   l_mbeccfir_action1); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-
-        l_rc = fapiGetScom_w_retry(i_target, 
-                                   l_mbeccfir_mask_address[l_mbaPosition], 
-                                   l_mbeccfir_mask); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-
-        //************************************************    
-
-   } // End for loop through functional MBAs on this Centaur
-    
-    FAPI_INF("EXIT mss_unmask_maint_errors()"); 
-
-    return i_bad_rc;
-}
-
-
-
-
-//------------------------------------------------------------------------------
-// mss_unmask_fetch_errors
-//------------------------------------------------------------------------------
-                                           
-fapi::ReturnCode mss_unmask_fetch_errors(const fapi::Target & i_target,
-                                         fapi::ReturnCode i_bad_rc )
-                                           
-{
-
-    // Target: Centaur
-
-    FAPI_INF("ENTER mss_unmask_fetch_errors()"); 
-    
-    fapi::ReturnCode l_rc;
-    uint32_t l_ecmd_rc = 0;            
-
-
-    //*************************
-    //*************************
-    // SCAC_LFIR
-    //*************************
-    //*************************    
-    
-    ecmdDataBufferBase l_scac_lfir_mask(64);
-    ecmdDataBufferBase l_scac_lfir_mask_or(64);
-    ecmdDataBufferBase l_scac_lfir_mask_and(64);
-    ecmdDataBufferBase l_scac_lfir_action0(64);
-    ecmdDataBufferBase l_scac_lfir_action1(64);
-    
-    // Read mask
-    l_rc = fapiGetScom_w_retry(i_target, SCAC_FIRMASK_0x020115C3, l_scac_lfir_mask); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-    
-    // TODO: Here is where I could clear bits that were bogus, before I unmask 
-    //       them. But typically we are expecting the bit set at this point
-    //       to be valid errors for PRD to log.
-
-
-    //(Action0, Action1, Mask)
-    //
-    // (0,0,0) = checkstop
-    // (0,1,0) = recoverable error
-    // (1,0,0) = report unused
-    // (1,1,0) = machine check
-    // (x,x,1) = error is masked
-
-    l_ecmd_rc |= l_scac_lfir_action0.flushTo0();
-    l_ecmd_rc |= l_scac_lfir_action1.flushTo0();
-    l_ecmd_rc |= l_scac_lfir_mask_or.flushTo0();
-    l_ecmd_rc |= l_scac_lfir_mask_and.flushTo1();
-                
-    // 0	I2CMInvAddr                 recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(0);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(0);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(0);
-    
-    // 1	I2CMInvWrite                recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(1);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(1);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(1);
-
-    // 2	I2CMInvRead                 recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(2);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(2);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(2);
-
-    // 3	I2CMApar                    recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(3);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(3);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(3);
-
-    // 4	I2CMPar                     recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(4);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(4);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(4);
-
-    // 5	I2CMLBPar                   recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(5);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(5);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(5);
-
-    // 6:9	Expansion                   recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(6,4);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(6,4);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(6,4);    
-    
-    // 10	I2CMInvCmd                  recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(10);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(10);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(10);
-
-    // 11	I2CMPErr                    recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(11);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(11);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(11);
-
-    // 12	I2CMOverrun                 recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(12);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(12);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(12);
-
-    // 13	I2CMAccess                  recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(13);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(13);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(13);
-
-    // 14	I2CMArb                     recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(14);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(14);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(14);
-
-    // 15	I2CMNack                    recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(15);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(15);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(15);
-
-    // 16	I2CMStop                    recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(16);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(16);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(16);
-
-    // 17	LocalPib1                   recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(17);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(17);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(17);
-
-    // 18	LocalPib2                   recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(18);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(18);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(18);
-
-    // 19	LocalPib3                   recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(19);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(19);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(19);
-
-    // 20	LocalPib4                   recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(20);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(20);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(20);
-
-    // 21	LocalPib5                   recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(21);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(21);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(21);
-
-    // 22	LocalPib6                   recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(22);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(22);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(22);
-
-    // 23	LocalPib7                   recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(23);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(23);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(23);
-
-    // 24	StallError                  recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(24);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(24);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(24);
-
-    // 25	RegParErr                   channel checkstop   unmask
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(25);            
-    l_ecmd_rc |= l_scac_lfir_action1.clearBit(25);
-    l_ecmd_rc |= l_scac_lfir_mask_and.clearBit(25);
-
-    // 26	RegParErrX                  channel checkstop   unmask
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(26);            
-    l_ecmd_rc |= l_scac_lfir_action1.clearBit(26);
-    l_ecmd_rc |= l_scac_lfir_mask_and.clearBit(26);
-
-    // 27:31	Reserved                recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(27,5);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(27,5);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(27,5);
-    
-    // 32	SMErr                       recoverable         unmask
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(32);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(32);
-    l_ecmd_rc |= l_scac_lfir_mask_and.clearBit(32);
-    
-    // 33	RegAccErr                   recoverable         unmask
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(33);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(33);
-    l_ecmd_rc |= l_scac_lfir_mask_and.clearBit(33);
-
-    // 34	ResetErr                    recoverable         masked (forever)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(34);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(34);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(34);
-
-    // 35	internal_scom_error         recoverable         masked (tbd)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(35);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(35);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(35);
-
-    // 36	internal_scom_error_clone   recoverable         masked (tbd)
-    l_ecmd_rc |= l_scac_lfir_action0.clearBit(36);            
-    l_ecmd_rc |= l_scac_lfir_action1.setBit(36);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(36);
-
-    // 37:63	Reserved
-    // Can we write to these bits?
-
-
-    if(l_ecmd_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-
-        l_rc.setEcmdError(l_ecmd_rc);
-        return l_rc;
-    }                                                                              
-
-    // Write action0
-    l_rc = fapiPutScom_w_retry(i_target, SCAC_FIRACTION0_0x020115C6, l_scac_lfir_action0);
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    // Write action1
-    l_rc = fapiPutScom_w_retry(i_target, SCAC_FIRACTION1_0x020115C7, l_scac_lfir_action1);
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    
-    // Write mask OR
-    l_rc = fapiPutScom_w_retry(i_target, SCAC_FIRMASK_OR_0x020115C5, l_scac_lfir_mask_or); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    // Write mask AND
-    l_rc = fapiPutScom_w_retry(i_target, SCAC_FIRMASK_AND_0x020115C4, l_scac_lfir_mask_and); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-
-
-    //************************************************    
-    // DEBUG: read them all back to verify
-    l_rc = fapiGetScom_w_retry(i_target, SCAC_FIRACTION0_0x020115C6, l_scac_lfir_action0); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-    l_rc = fapiGetScom_w_retry(i_target, SCAC_FIRACTION1_0x020115C7, l_scac_lfir_action1); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-    l_rc = fapiGetScom_w_retry(i_target, SCAC_FIRMASK_0x020115C3, l_scac_lfir_mask); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    //************************************************    
-
-
-    //*************************
-    //*************************
-    // MBS_FIR_REG
-    //*************************
-    //*************************
-    
-    
-    // NOTE: In the IPL sequence, mss_unmask_inband_errors has already been
-    // called, which has already set the MBS_FIR_REG action regs to their 
-    // runtime values, so no need to touch the action regs here.
-
-    // NOTE: In the IPL sequence, mss_unmask_inband_errors,
-    // has already been called, which has already unmasked the approproiate
-    // MBS_FIR_REG errors following mss_unmask_inband_errors. So all we will do 
-    // here is unmask errors requiring mainline traffic which would be 
-    // considered valid after the mss_thermal_init procedure. 
-    
-
-    ecmdDataBufferBase l_mbs_fir_mask(64);
-    ecmdDataBufferBase l_mbs_fir_mask_and(64);
-    
-    // Read mask 
-    l_rc = fapiGetScom_w_retry(i_target, MBS_FIR_MASK_REG_0x02011403, l_mbs_fir_mask); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }    
-    
-    // TODO: Here is where I could clear bits that were bogus, before I unmask 
-    //       them. But typically we are expecting the bit set at this point
-    //       to be valid errors for PRD to log.
-
-    l_ecmd_rc |= l_mbs_fir_mask_and.flushTo1();
-    
-    // 2    invalid_address_error   channel checkstop   unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(2);
-
-    // 3    external_timeout        channel checkstop   unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(3);
-    
-    // 4    internal_timeout        channel checkstop   unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(4);
-
-    // 9    cache_srw_ce            recoverable         unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(9);
-
-    // 10    cache_srw_ue           recoverable         unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(10);
-
-    // 12    cache_co_ce            recoverable         unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(12);
-
-    // 13    cache_co_ue            recoverable         unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(13);
-
-    // 15    dir_ce                 recoverable         unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(15);
-
-    // 16    dir_ue                 channel checkstop   unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(16);
-
-    // 18    dir_all_members_deleted channel checkstop  unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(18);
-
-    // 19    lru_error               recoverable        unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(19);
-
-    // 20    eDRAM error             channel checkstop  unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(20);
-
-    // 26    srb_buffer_ce           recoverable        unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(26);
-
-    // 27    srb_buffer_ue           recoverable        unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(27);
-    
-    if(l_ecmd_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-
-        l_rc.setEcmdError(l_ecmd_rc);
-        return l_rc;
-    }                                                                              
-
-    // Write mask AND
-    l_rc = fapiPutScom_w_retry(i_target, MBS_FIR_MASK_REG_AND_0x02011404, l_mbs_fir_mask_and); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-
-    //************************************************    
-    // DEBUG: read them all back to verify
-    l_rc = fapiGetScom_w_retry(i_target, MBS_FIR_MASK_REG_0x02011403, l_mbs_fir_mask); 
-    if(l_rc)
-    {
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);        
-        return l_rc;
-    }
-
-    //************************************************    
-
-
-    
-    std::vector<fapi::Target> l_mbaChiplets;
-    uint8_t l_mbaPosition;             // 0 = mba01, 1 = mba23
-
-
-    uint32_t l_mbeccfir_mask_address[2]={
-    // port0/1                            port2/3
-    MBS_ECC0_MBECCFIR_MASK_0x02011443,MBS_ECC1_MBECCFIR_MASK_0x02011483};
-
-    uint32_t l_mbeccfir_mask_and_address[2]={
-    // port0/1                            port2/3
-    MBS_ECC0_MBECCFIR_MASK_AND_0x02011444,MBS_ECC1_MBECCFIR_MASK_AND_0x02011484};
-
-    ecmdDataBufferBase l_mbeccfir_mask(64);
-    ecmdDataBufferBase l_mbeccfir_mask_and(64);
-
-    ecmdDataBufferBase l_mbaspa_mask(64);
-
-    // Get associated functional MBAs on this centaur
-    l_rc = fapiGetChildChiplets(i_target,
-                                fapi::TARGET_TYPE_MBA_CHIPLET,
-                                l_mbaChiplets);
-    if(l_rc)
-    {
-        FAPI_ERR("Error getting functional MBAs on this Centaur");
-        // Log passed in error before returning with new error
-        if (i_bad_rc) fapiLogError(i_bad_rc);                
-        return l_rc;
-    }    
-
-    // Loop through functional MBAs on this Centaur
-    for (uint32_t i=0; i < l_mbaChiplets.size(); i++)
-    {
-
-        // Get MBA position: 0 = mba01, 1 = mba23
-        l_rc = FAPI_ATTR_GET(ATTR_CHIP_UNIT_POS, &l_mbaChiplets[i], l_mbaPosition);
-        if(l_rc)
-        {
-            FAPI_ERR("Error getting MBA position");
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);                
-            return l_rc;
-        }    
-    
-
-        //*************************
-        //*************************
-        // MBASPA
-        //*************************
-        //*************************        
-                
-        // Read mask
-        l_rc = fapiGetScom_w_retry(l_mbaChiplets[i],
-                                   MBA01_MBSPAMSKQ_0x03010614,
-                                   l_mbaspa_mask); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-        
-        // TODO: Here is where I could clear bits that were bogus, before I unmask 
-        //       them. But typically we are expecting the bit set at this point
-        //       to be valid errors for PRD to log.
-
-
-        // 1	Hard_CE_ETE_Attn                             unmask
-        // NOTE: Unmasking, but PRD responsible for setting and enabling the threshold.
-        l_ecmd_rc |= l_mbaspa_mask.clearBit(1);            
-
-        // 2	Soft_CE_ETE_Attn                             unmask
-        // NOTE: Unmasking, but PRD responsible for setting and enabling the threshold.
-        l_ecmd_rc |= l_mbaspa_mask.clearBit(2);            
-
-        // 3	Intermittent_ETE_Attn                        unmask
-        // NOTE: Unmasking, but PRD responsible for setting and enabling the threshold.
-        l_ecmd_rc |= l_mbaspa_mask.clearBit(3);            
-
-        // 4	RCE_ETE_Attn                                 unmask
-        // NOTE: Unmasking, but PRD responsible for setting and enabling the threshold.
-        l_ecmd_rc |= l_mbaspa_mask.clearBit(4);            
-                    
-
-        if(l_ecmd_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-
-            l_rc.setEcmdError(l_ecmd_rc);
-            return l_rc;
-        }                                                                              
-        
-        // Write mask
-        l_rc = fapiPutScom_w_retry(l_mbaChiplets[i],
-                                   MBA01_MBSPAMSKQ_0x03010614,
-                                   l_mbaspa_mask); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-
-        //************************************************    
-        // DEBUG: read them all back to verify
-        l_rc = fapiGetScom_w_retry(l_mbaChiplets[i],
-                                   MBA01_MBSPAMSKQ_0x03010614,
-                                   l_mbaspa_mask);
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-        //************************************************    
-
-
-
-        //*************************
-        //*************************
-        // MBECCFIR
-        //*************************
-        //*************************    
-
-        // Read mask
-        l_rc = fapiGetScom_w_retry(i_target, 
-                                   l_mbeccfir_mask_address[l_mbaPosition], 
-                                   l_mbeccfir_mask); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-    
-        // TODO: Here is where I could clear bits that were bogus, before I unmask 
-        //       them. But typically we are expecting the bit set at this point
-        //       to be valid errors for PRD to log.
-                    
-        // NOTE: In the IPL sequence, mss_unmask_maint_errors has already been
-        // called, which has already set the MBECCFIR action regs to their runtime
-        // values, so no need to touch the action regs here.
-
-        // NOTE: In the IPL sequence, mss_unmask_maint_errors,
-        // has already been called, which has already unmasked the approproiate
-        // MBECCFIR errors following mss_unmask_maint_errors. So all we will do 
-        // here is unmask errors requiring mainline traffic which would be 
-        // considered valid after the mss_thermal_init procedure. 
-
-        l_ecmd_rc |= l_mbeccfir_mask_and.flushTo1();
-
-        // 0:7	Memory MPE Rank 0:7         recoverable         unmask
-        l_ecmd_rc |= l_mbeccfir_mask_and.clearBit(0,8);
-
-        // 16	Memory NCE                  recoverable         unmask
-        l_ecmd_rc |= l_mbeccfir_mask_and.clearBit(16);
-
-        // 17	Memory RCE                  recoverable         unmask
-        l_ecmd_rc |= l_mbeccfir_mask_and.clearBit(17);
-
-        // 19	Memory UE                   recoverable         unmask
-        l_ecmd_rc |= l_mbeccfir_mask_and.clearBit(19);
-        
-        // 20:27	Maint MPE Rank 0:7      recoverable         unmask
-        l_ecmd_rc |= l_mbeccfir_mask_and.clearBit(20,8);
-        
-        // 41	Maintenance UE              recoverable         unmask
-        l_ecmd_rc |= l_mbeccfir_mask_and.clearBit(41);
-        
-        // 43	Prefetch Memory UE          recoverable         unmask
-        l_ecmd_rc |= l_mbeccfir_mask_and.clearBit(43);
-
-            
-        if(l_ecmd_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-
-            l_rc.setEcmdError(l_ecmd_rc);
-            return l_rc;
-        }                                                                              
-        
-        // Write mask AND
-        l_rc = fapiPutScom_w_retry(i_target,
-                                   l_mbeccfir_mask_and_address[l_mbaPosition], 
-                                   l_mbeccfir_mask_and); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-
-        //************************************************    
-        // DEBUG: read them all back to verify
-        l_rc = fapiGetScom_w_retry(i_target,
-                                   l_mbeccfir_mask_address[l_mbaPosition], 
-                                   l_mbeccfir_mask); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-
-        //************************************************    
-    }
-    
-    
-    //*************************
-    //*************************
-    // MBACALFIR
-    //*************************
-    //*************************
-
-    ecmdDataBufferBase l_mbacalfir_mask(64);
-    ecmdDataBufferBase l_mbacalfir_mask_and(64);        
-    
-    // NOTE: In the IPL sequence, mss_unmask_draminit_errors has already been
-    // called, which has already set the MBACALFIR action regs to their runtime
-    // values, so no need to touch the action regs here.
-
-    // NOTE: In the IPL sequence, various bits have already been unmasked
-    // after the approproiate procedures. So all we will do here is unmask
-    // errors requiring mainline traffic which would be considered valid after
-    // the mss_thermal_init procedure. 
-
-    // Loop through functional MBAs on this Centaur
-    for (uint32_t i=0; i < l_mbaChiplets.size(); i++)
-    {
-
-        // Read mask
-        l_rc = fapiGetScom_w_retry(l_mbaChiplets[i],
-                                   MBA01_MBACALFIR_MASK_0x03010403,
-                                   l_mbacalfir_mask); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-        
-        // TODO: Here is where I could clear bits that were bogus, before I unmask 
-        //       them. But typically we are expecting the bit set at this point
-        //       to be valid errors for PRD to log.
-            
-        l_ecmd_rc |= l_mbacalfir_mask_and.flushTo1();        
-        
-        // 9	mba_wrd ue                  recoverable         unmask
-        l_ecmd_rc |= l_mbacalfir_mask_and.clearBit(9);
-
-        // 10	mba_wrd ce                  recoverable         unmask
-        l_ecmd_rc |= l_mbacalfir_mask_and.clearBit(10);
-
-        // 14	wrq_data_ce                 recoverable         unmask
-        l_ecmd_rc |= l_mbacalfir_mask_and.clearBit(14);
-
-        // 15	wrq_data_ue                 recoverable         unmask
-        l_ecmd_rc |= l_mbacalfir_mask_and.clearBit(15);
-
-        if(l_ecmd_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-
-            l_rc.setEcmdError(l_ecmd_rc);
-            return l_rc;
-        }                                                                              
-
-        // Write mask AND
-        l_rc = fapiPutScom_w_retry(l_mbaChiplets[i],
-                                   MBA01_MBACALFIR_MASK_AND_0x03010404,
-                                   l_mbacalfir_mask_and); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-
-
-        //************************************************    
-        // DEBUG: read them all back to verify
-        l_rc = fapiGetScom_w_retry(l_mbaChiplets[i],
-                                   MBA01_MBACALFIR_MASK_0x03010403,
-                                   l_mbacalfir_mask); 
-        if(l_rc)
-        {
-            // Log passed in error before returning with new error
-            if (i_bad_rc) fapiLogError(i_bad_rc);        
-            return l_rc;
-        }
-
-        //************************************************    
-    }
-
-
-   
-    
-    FAPI_INF("EXIT mss_unmask_fetch_errors()"); 
-
-    return i_bad_rc;
-}
-
-//------------------------------------------------------------------------------
-// fapiGetScom_w_retry
-//------------------------------------------------------------------------------
-fapi::ReturnCode fapiGetScom_w_retry(const fapi::Target& i_target,
-                                     const uint64_t i_address,
-                                     ecmdDataBufferBase & o_data)
-{
-    fapi::ReturnCode l_rc;
-    
-    l_rc = fapiGetScom(i_target, i_address, o_data);
-    if(l_rc)
-    {
-        FAPI_ERR("1st Centaur fapiGetScom failed, so attempting retry.");
-
-        // Log centaur scom error
-        fapiLogError(l_rc);        
-
-        // Retry centaur scom with assumption that retry is done via FSI,
-        // which may still work.
-        // NOTE: If scom fail was due to channel fail a retry via FSI may
-        // work. But if scom fail was due to PIB error, retry via FSI may
-        // also fail.
-        l_rc = fapiGetScom(i_target, i_address, o_data); 
-        if(l_rc)
-        {
-            FAPI_ERR("fapiGetScom retry via FSI failed.");       
-            // Retry didn't work either so give up and pass 
-            // back centaur scom error
-        }
-    }    
-    
-    return l_rc;
-}
-
-
-//------------------------------------------------------------------------------
-// fapiPutScom_w_retry
-//------------------------------------------------------------------------------
-fapi::ReturnCode fapiPutScom_w_retry(const fapi::Target& i_target,
-                                     const uint64_t i_address,
-                                     ecmdDataBufferBase & i_data)
-{
-    fapi::ReturnCode l_rc;
-    
-    // NOTE: Inband scom device driver takes care of read to special reg after
-    // an inband scom write in order to detect SUE
-    l_rc = fapiPutScom(i_target, i_address, i_data);
-    if(l_rc)
-    {
-        FAPI_ERR("1st Centaur fapiPutScom failed, so attempting retry.");
-
-        // Log centaur scom error
-        fapiLogError(l_rc);        
-
-        // Retry centaur scom with assumption that retry is done via FSI,
-        // which may still work.
-        // NOTE: If scom fail was due to channel fail a retry via FSI may
-        // work. But if scom fail was due to PIB error, retry via FSI may
-        // also fail.
-        l_rc = fapiPutScom(i_target, i_address, i_data); 
-        if(l_rc)
-        {
-            FAPI_ERR("fapiPutScom retry via FSI failed.");       
-            // Retry didn't work either so give up and pass 
-            // back centaur scom error
-        }
-    }    
-    
-    return l_rc;
-}
diff --git a/src/usr/hwpf/hwp/include/cen_scom_addresses.H b/src/usr/hwpf/hwp/include/cen_scom_addresses.H
index c62bc5564..79584349d 100755
--- a/src/usr/hwpf/hwp/include/cen_scom_addresses.H
+++ b/src/usr/hwpf/hwp/include/cen_scom_addresses.H
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: cen_scom_addresses.H,v 1.68 2014/03/28 21:06:47 jdsloat Exp $
+// $Id: cen_scom_addresses.H,v 1.69 2014/04/07 17:59:13 gollub Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/centaur/working/procedures/cen_scom_addresses.H,v $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2011
@@ -44,6 +44,7 @@
 //------------------------------------------------------------------------------
 // Version:|  Author: |  Date:  | Comment:
 //---------|----------|---------|-----------------------------------------------
+//  1.69   | gollub   |07-APR-14| Added MBSCFGQ so we can enable/disable exit point 1
 //  1.64   | jdsloat  |28-MAR-14| ADDED MEM SCOM CCS MODEQ, STATQ, and CAL FIR addresses.
 //  1.63   | mwuu     |18-Jun-13| Fixed naming of IO_FET_SLICE_EN_MAP1_P0_ADR0:3
 //  1.62   | mwuu     |18-Jun-13| Fixed naming of IO_FET_SLICE_EN_MAP1_P0_ADR0_3
@@ -767,6 +768,11 @@ CONST_UINT64_T( MBAXCR01Q_0x0201140B           , ULL(0x0201140B) );
 CONST_UINT64_T( MBAXCR23Q_0x0201140C           , ULL(0x0201140C) );
 
 //------------------------------------------------------------------------------
+//      MBS Configuration Register
+//------------------------------------------------------------------------------
+CONST_UINT64_T( MBSCFGQ_0x02011411             , ULL(0x02011411) );
+
+//------------------------------------------------------------------------------
 //      MBS ECC Decoder FIR Registers
 //------------------------------------------------------------------------------
 CONST_UINT64_T( MBS_ECC0_MBECCFIR_0x02011440           , ULL(0x02011440) );
@@ -1807,6 +1813,10 @@ This section is automatically updated by CVS when you check in this file.
 Be sure to create CVS comments when you commit so that they can be included here.
 
 $Log: cen_scom_addresses.H,v $
+Revision 1.69  2014/04/07 17:59:13  gollub
+
+/!/  1.69   | gollub   |07-APR-14| Added MBSCFGQ so we can enable/disable exit point 1
+
 Revision 1.68  2014/03/28 21:06:47  jdsloat
 ADDED MEM SCOM CCS MODEQ, STATQ, and CAL FIR addresses.
 
diff --git a/src/usr/hwpf/hwp/include/mss_unmask_errors.H b/src/usr/hwpf/hwp/include/mss_unmask_errors.H
index 1060509a1..b3650d76a 100644
--- a/src/usr/hwpf/hwp/include/mss_unmask_errors.H
+++ b/src/usr/hwpf/hwp/include/mss_unmask_errors.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/hwpf/hwp/dram_initialization/mss_thermal_init/mss_unmask_errors.H $ */
+/* $Source: src/usr/hwpf/hwp/include/mss_unmask_errors.H $                */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012                   */
+/* COPYRIGHT International Business Machines Corp. 2012,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: mss_unmask_errors.H,v 1.1 2012/09/05 21:04:20 gollub Exp $
+// $Id: mss_unmask_errors.H,v 1.2 2014/04/09 19:49:26 gollub Exp $
 //------------------------------------------------------------------------------
 // Don't forget to create CVS comments when you check in your changes!
 //------------------------------------------------------------------------------
@@ -29,6 +29,9 @@
 // Version:|   Date:  | Author: | Comment:
 //---------|----------|---------|-----------------------------------------------
 //   1.1   | 09/05/12 | gollub  | Created
+//   1.2   |07-APR-14 | gollub  | Added mss_unmask_pervasive_errors
+//         |          |         | Version was set back from 1.2 to 1.1 when I moved from procedures/ipl/fapi to procedures/
+//   1.2   |09-APR-14 | gollub  | Checked in a second time just to get version to 1.2
 
 #ifndef _MSS_UNMASK_ERRORS_H
 #define _MSS_UNMASK_ERRORS_H
@@ -54,6 +57,28 @@
 
 
 
+//------------------------------------------------------------------------------
+// mss_unmask_pervasive_errors
+//------------------------------------------------------------------------------
+
+
+/**
+ * @brief  To be called at the end of cen_mem_startclocks.C
+ *         Sets action regs and mask settings for pervasive errors to their 
+ *         runtime settings.
+ *
+ * @param  i_target         Centaur target
+ * @param  i_bad_rc         If cen_mem_startclocks.C already has a bad rc
+ *                          before it calls this function, we pass it in as 
+ *                          i_bad_rc. If this function gets it's own bad local 
+ *                          l_rc, i_bad_rc will be commited, and l_rc will be 
+ *                          passed back as return value. Else if no l_rc, 
+ *                          i_bad_rc will be passed back as return value.
+ * @return Non-SUCCESS if i_bad_rc Non_SUCCESS, or if internal function fails, 
+ *         SUCCESS otherwise.
+ */
+fapi::ReturnCode mss_unmask_pervasive_errors( const fapi::Target & i_target,
+                                              fapi::ReturnCode i_bad_rc );
 
 
 
@@ -63,12 +88,12 @@
 
 
 /**
- * @brief  To be called at the end of proc_cen_set_inband_addr.C
+ * @brief  To be called at the end of proc_cen_framelock.C
  *         Sets action regs and mask settings for inband errors to their 
  *         runtime settings.
  *
  * @param  i_target         Centaur target
- * @param  i_bad_rc         If proc_cen_set_inband_addr.C already has a bad rc
+ * @param  i_bad_rc         If proc_cen_framelock.C already has a bad rc
  *                          before it calls this function, we pass it in as 
  *                          i_bad_rc. If this function gets it's own bad local 
  *                          l_rc, i_bad_rc will be commited, and l_rc will be 
diff --git a/src/usr/hwpf/hwp/proc_chip_ec_feature.xml b/src/usr/hwpf/hwp/proc_chip_ec_feature.xml
index 77db9944e..e1c263fbe 100644
--- a/src/usr/hwpf/hwp/proc_chip_ec_feature.xml
+++ b/src/usr/hwpf/hwp/proc_chip_ec_feature.xml
@@ -20,7 +20,7 @@
 <!-- Origin: 30                                                             -->
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
-<!-- $Id: proc_chip_ec_feature.xml,v 1.50 2014/02/28 21:12:45 stillgs Exp $ -->
+<!-- $Id: proc_chip_ec_feature.xml,v 1.51 2014/04/07 16:58:28 baysah Exp $ -->
 <!-- Defines the attributes that are based on EC level -->
 <attributes>
   <attribute>
@@ -305,7 +305,7 @@
       True if:
         Murano EC 0x20 or greater
         Venice EC 0x10 or greater
-        Centaur EC 0x20 or greater 
+        Centaur EC 0x20 or greater
     </description>
     <chipEcFeature>
       <chip>
@@ -449,6 +449,65 @@
     </chipEcFeature>
   </attribute>
   <attribute>
+    <id>ATTR_CHIP_EC_FEATURE_MCS_MURDD1_FIR_CONTROL</id>
+    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+      True if:
+        Murano EC less than 0x20
+    </description>
+    <chipEcFeature>
+      <chip>
+        <name>ENUM_ATTR_NAME_MURANO</name>
+        <ec>
+          <value>0x20</value>
+          <test>LESS_THAN</test>
+        </ec>
+      </chip>
+    </chipEcFeature>
+  </attribute>
+  <attribute>
+    <id>ATTR_CHIP_EC_FEATURE_MCS_VENDD1_FIR_CONTROL</id>
+    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+      True if:
+        Venice EC less than 0x20
+    </description>
+    <chipEcFeature>
+      <chip>
+        <name>ENUM_ATTR_NAME_VENICE</name>
+        <ec>
+          <value>0x20</value>
+          <test>LESS_THAN</test>
+        </ec>
+      </chip>
+    </chipEcFeature>
+  </attribute>
+  <attribute>
+    <id>ATTR_CHIP_EC_FEATURE_MCS_P8_DD2_FIR_CONTROL</id>
+    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+      True if:
+        Murano EC greater or equal to 0x20
+        Venice EC greater or equal to 0x20
+    </description>
+    <chipEcFeature>
+      <chip>
+        <name>ENUM_ATTR_NAME_MURANO</name>
+        <ec>
+          <value>0x20</value>
+          <test>GREATER_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+      <chip>
+        <name>ENUM_ATTR_NAME_VENICE</name>
+        <ec>
+          <value>0x20</value>
+          <test>GREATER_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+    </chipEcFeature>
+  </attribute>
+  <attribute>
     <id>ATTR_CHIP_EC_FEATURE_TRACE_CONTROL_ON_SCOM</id>
     <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     <description>
@@ -648,7 +707,7 @@
     <id>ATTR_CHIP_EC_FEATURE_PCBS_ERR_RESET</id>
     <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     <description>
-      True if:        
+      True if:
         Murano EC 0x20 or greater
         Venice EC 0x10 or greater
     </description>
@@ -673,7 +732,7 @@
     <id>ATTR_IO_TRAINING_SLS_WORKAROUND</id>
     <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     <description>
-      For X fabric links only 
+      For X fabric links only
     </description>
     <chipEcFeature>
       <chip>
@@ -689,7 +748,7 @@
     <id>ATTR_IO_TRAINING_DLL_WORKAROUND</id>
     <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     <description>
-      Only For X fabric link 
+      Only For X fabric link
     </description>
     <chipEcFeature>
       <chip>
@@ -720,7 +779,7 @@
     <id>ATTR_CHIP_EC_FEATURE_RESONANT_CLK_VALID</id>
     <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     <description>
-      True if:        
+      True if:
         Murano EC 0x20 or greater
         Venice EC 0x20 or greater
     </description>
@@ -746,7 +805,7 @@
     <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     <description>
       Removes work-around for HW255321
-      True if:        
+      True if:
         Murano EC 0x20 or greater
         Venice EC 0x20 or greater
     </description>
@@ -806,7 +865,7 @@
           <value>0x20</value>
           <test>LESS_THAN</test>
         </ec>
-      </chip>      
+      </chip>
     </chipEcFeature>
   </attribute>
   <attribute>
@@ -824,14 +883,14 @@
           <value>0x20</value>
           <test>GREATER_THAN_OR_EQUAL</test>
         </ec>
-      </chip>      
+      </chip>
       <chip>
         <name>ENUM_ATTR_NAME_VENICE</name>
         <ec>
           <value>0x10</value>
           <test>GREATER_THAN_OR_EQUAL</test>
         </ec>
-      </chip>      
+      </chip>
     </chipEcFeature>
   </attribute>
   <attribute>
@@ -849,14 +908,14 @@
           <value>0x20</value>
           <test>GREATER_THAN_OR_EQUAL</test>
         </ec>
-      </chip>      
+      </chip>
       <chip>
         <name>ENUM_ATTR_NAME_VENICE</name>
         <ec>
           <value>0x10</value>
           <test>GREATER_THAN_OR_EQUAL</test>
         </ec>
-      </chip>      
+      </chip>
     </chipEcFeature>
   </attribute>
   <attribute>
@@ -873,7 +932,7 @@
           <value>0x20</value>
           <test>LESS_THAN</test>
         </ec>
-      </chip>      
+      </chip>
     </chipEcFeature>
   </attribute>
   <attribute>
@@ -891,14 +950,14 @@
           <value>0x20</value>
           <test>GREATER_THAN</test>
         </ec>
-      </chip>      
+      </chip>
       <chip>
         <name>ENUM_ATTR_NAME_VENICE</name>
         <ec>
           <value>0x20</value>
           <test>GREATER_THAN_OR_EQUAL</test>
         </ec>
-      </chip>      
+      </chip>
     </chipEcFeature>
   </attribute>
   <attribute>
@@ -920,7 +979,7 @@
           <value>0x20</value>
           <test>GREATER_THAN_OR_EQUAL</test>
         </ec>
-      </chip>      
+      </chip>
     </chipEcFeature>
   </attribute>
   <attribute>
@@ -952,7 +1011,7 @@
           <value>0x20</value>
           <test>LESS_THAN</test>
         </ec>
-      </chip>      
+      </chip>
     </chipEcFeature>
   </attribute>
     <attribute>
@@ -970,14 +1029,14 @@
           <value>0x21</value>
           <test>GREATER_THAN_OR_EQUAL</test>
         </ec>
-      </chip> 
+      </chip>
       <chip>
         <name>ENUM_ATTR_NAME_VENICE</name>
         <ec>
           <value>0x20</value>
           <test>GREATER_THAN_OR_EQUAL</test>
         </ec>
-      </chip>    
+      </chip>
     </chipEcFeature>
   </attribute>
     <attribute>
@@ -985,9 +1044,9 @@
     <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     <description>
     True if chip can support the enablement of L3 purge aborts during Winkle as HW276505 is fixed
-        Not fixed on any Murano EC 
+        Not fixed on any Murano EC
         Venice EC 0x20 or greater
-    </description>    
+    </description>
     <chipEcFeature>
       <chip>
         <name>ENUM_ATTR_NAME_VENICE</name>
@@ -995,7 +1054,7 @@
           <value>0x20</value>
           <test>GREATER_THAN_OR_EQUAL</test>
         </ec>
-      </chip>    
+      </chip>
     </chipEcFeature>
   </attribute>
   <attribute>
@@ -1013,14 +1072,14 @@
           <value>0x20</value>
           <test>LESS_THAN</test>
         </ec>
-      </chip>  
+      </chip>
       <chip>
         <name>ENUM_ATTR_NAME_VENICE</name>
         <ec>
           <value>0x20</value>
           <test>LESS_THAN</test>
         </ec>
-      </chip>       
+      </chip>
     </chipEcFeature>
   </attribute>
   <attribute>
@@ -1041,7 +1100,7 @@
         </ec>
       </chip>
     </chipEcFeature>
-  </attribute> 
+  </attribute>
   <attribute>
     <id>ATTR_CHIP_EC_FEATURE_HW_BUG_PBASLVRESET</id>
     <targetType>TARGET_TYPE_PROC_CHIP</targetType>
diff --git a/src/usr/hwpf/hwp/utility_procedures/memory_mss_maint_cmds.xml b/src/usr/hwpf/hwp/utility_procedures/memory_mss_maint_cmds.xml
index f8b8eb95d..d4f52f2eb 100644
--- a/src/usr/hwpf/hwp/utility_procedures/memory_mss_maint_cmds.xml
+++ b/src/usr/hwpf/hwp/utility_procedures/memory_mss_maint_cmds.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- IBM CONFIDENTIAL                                                       -->
 <!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2013                   -->
+<!-- COPYRIGHT International Business Machines Corp. 2013,2014              -->
 <!--                                                                        -->
 <!-- p1                                                                     -->
 <!--                                                                        -->
@@ -21,7 +21,7 @@
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
 <hwpErrors>
-<!-- $Id: memory_mss_maint_cmds.xml,v 1.1 2013/06/19 18:28:17 bellows Exp $ -->
+<!-- $Id: memory_mss_maint_cmds.xml,v 1.2 2014/04/07 18:41:53 gollub Exp $ -->
 <!-- For file ../../ipl/fapi/mss_maint_cmds.C -->
 
 <!-- Original Source for RC_MSS_MAINT_UNSUCCESSFUL_FORCED_MAINT_CMD_STOP memory_errors.xml -->
@@ -88,7 +88,8 @@
     <ffdc>CMD_TYPE</ffdc>        
     <!-- FFDC: MBMCT[0:4] contains the cmd type previously run -->
     <ffdc>MBMCT</ffdc>                
-    <!-- TODO: Callout FW HIGH -->
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>
     <!-- Callout MBA LOW -->
     <callout><target>MBA</target><priority>LOW</priority></callout>
     <!-- Deconfigure MBA -->
@@ -105,7 +106,8 @@
     <ffdc>MBA</ffdc>
     <!-- FFDC: Capture register we are checking -->    
     <ffdc>MBAXCR</ffdc>
-    <!-- TODO: Callout FW HIGH -->
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_CCS_MUX_NOT_MAINLINE memory_errors.xml -->
@@ -118,7 +120,8 @@
     <ffdc>CCS_MODE</ffdc>
     <!-- FFDC: Capture command type we are trying to run -->        
     <ffdc>CMD_TYPE</ffdc>        
-    <!-- TODO: Callout FW HIGH -->
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_ECC_DISABLED memory_errors.xml -->
@@ -131,7 +134,8 @@
     <ffdc>MBSECC</ffdc>
     <!-- FFDC: Capture command type we are trying to run -->        
     <ffdc>CMD_TYPE</ffdc>        
-    <!-- TODO: Callout FW HIGH -->
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_INVALID_CMD memory_errors.xml -->
@@ -146,7 +150,8 @@
     <ffdc>CMD_TYPE</ffdc>        
     <!-- FFDC: MBMCT[0:4] contains the cmd type set in hw -->
     <ffdc>MBMCT</ffdc>                
-    <!-- TODO: Callout FW HIGH -->
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_INVALID_ADDR memory_errors.xml -->
@@ -166,7 +171,8 @@
       <id>REG_FFDC_INVALID_ADDR</id>
       <target>MBA</target>
     </collectRegisterFfdc>
-    <!-- TODO: Callout FW HIGH -->    
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_CMD_TIMEOUT memory_errors.xml -->
@@ -185,7 +191,8 @@
       <id>REG_FFDC_CMD_TIMEOUT_MBS_REGS</id>
       <target>CENTAUR</target>
     </collectRegisterFfdc>
-    <!-- TODO: Callout FW HIGH -->
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>
     <!-- Callout MBA LOW -->
     <callout><target>MBA</target><priority>LOW</priority></callout>
     <!-- Deconfigure MBA -->
@@ -202,7 +209,8 @@
     <ffdc>MBA</ffdc>
     <!-- FFDC: Capture command type we are trying to run -->        
     <ffdc>CMD_TYPE</ffdc>        
-    <!-- TODO: Callout FW HIGH -->
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_INVALID_DRAM_SIZE_WIDTH memory_errors.xml -->
@@ -217,7 +225,8 @@
     <ffdc>DRAM_WIDTH</ffdc>
     <!-- FFDC: DRAM gen: DDR3 or DDR4 -->    
     <ffdc>DRAM_GEN</ffdc>
-    <!-- TODO: Callout FW HIGH -->
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_INVALID_DIMM_CNFG memory_errors.xml -->
@@ -228,7 +237,8 @@
     <ffdc>MBA</ffdc>
     <!-- FFDC: Capture register we are checking -->    
     <ffdc>MBAXCR</ffdc>
-    <!-- TODO: Callout FW HIGH -->
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_GET_ADDRESS_RANGE_BAD_INPUT memory_errors.xml -->
@@ -239,7 +249,8 @@
     <ffdc>MBA</ffdc>
     <!-- FFDC: RANK we are trying to get address range for -->    
     <ffdc>RANK</ffdc>
-    <!-- TODO: Callout FW HIGH -->    
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_GET_MARK_STORE_BAD_INPUT memory_errors.xml -->
@@ -250,7 +261,8 @@
     <ffdc>MBA</ffdc>
     <!-- FFDC: RANK we are trying read markstore for -->    
     <ffdc>RANK</ffdc>
-    <!-- TODO: Callout FW HIGH -->    
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_X4_SYMBOL_ON_READ memory_errors.xml -->
@@ -265,7 +277,8 @@
     <ffdc>RANK</ffdc>
     <!-- FFDC: Markstore with non-zero symbol entry -->    
     <ffdc>MARKSTORE</ffdc>
-    <!-- TODO: Callout FW HIGH -->
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_INVALID_MARKSTORE memory_errors.xml -->
@@ -280,7 +293,8 @@
     <ffdc>RANK</ffdc>
     <!-- FFDC: Markstore with invalid galois field  -->    
     <ffdc>MARKSTORE</ffdc>
-    <!-- TODO: Callout FW HIGH -->
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_PUT_MARK_STORE_BAD_INPUT memory_errors.xml -->
@@ -291,7 +305,8 @@
     <ffdc>MBA</ffdc>
     <!-- FFDC: RANK we are trying write markstore for -->    
     <ffdc>RANK</ffdc>
-    <!-- TODO: Callout FW HIGH -->    
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_X4_SYMBOL_ON_WRITE memory_errors.xml -->
@@ -308,7 +323,8 @@
     <ffdc>SYMBOL_MARK</ffdc>
     <!-- FFDC: Chip mark we are trying to write to markstore -->    
     <ffdc>CHIP_MARK</ffdc>
-    <!-- TODO: Callout FW HIGH -->
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_INVALID_SYMBOL_INDEX memory_errors.xml -->
@@ -325,7 +341,8 @@
     <ffdc>SYMBOL_MARK</ffdc>
     <!-- FFDC: Chip mark we are trying to write to markstore -->    
     <ffdc>CHIP_MARK</ffdc>
-    <!-- TODO: Callout FW HIGH -->
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_INVALID_CHIP_INDEX memory_errors.xml -->
@@ -342,7 +359,8 @@
     <ffdc>SYMBOL_MARK</ffdc>
     <!-- FFDC: Chip mark we are trying to write to markstore -->    
     <ffdc>CHIP_MARK</ffdc>
-    <!-- TODO: Callout FW HIGH -->
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_MARKSTORE_WRITE_BLOCKED memory_errors.xml -->
@@ -373,7 +391,8 @@
     <ffdc>RANK</ffdc>
     <!-- FFDC: MUX_TYPE: read or write -->    
     <ffdc>MUX_TYPE</ffdc>
-    <!-- TODO: Callout FW HIGH -->    
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_INVALID_STEER_MUX memory_errors.xml -->
@@ -390,7 +409,8 @@
     <ffdc>MUX_TYPE</ffdc>
     <!-- FFDC: Capture steer mux -->    
     <ffdc>STEER_MUX</ffdc>
-    <!-- TODO: Callout FW HIGH -->    
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_PUT_STEER_MUX_BAD_INPUT memory_errors.xml -->
@@ -407,7 +427,8 @@
     <ffdc>STEER_TYPE</ffdc>
     <!-- FFDC: SYMBOL: 0-71 -->    
     <ffdc>SYMBOL</ffdc>
-    <!-- TODO: Callout FW HIGH -->    
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_INVALID_SYMBOL_TO_STEER memory_errors.xml -->
@@ -426,7 +447,8 @@
     <ffdc>STEER_TYPE</ffdc>
     <!-- FFDC: SYMBOL: Symbol we are trying to steer -->    
     <ffdc>SYMBOL</ffdc>
-    <!-- TODO: Callout FW HIGH -->    
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_NO_X8_ECC_SPARE memory_errors.xml -->
@@ -445,7 +467,8 @@
     <ffdc>STEER_TYPE</ffdc>
     <!-- FFDC: SYMBOL: Symbol we are trying to steer -->    
     <ffdc>SYMBOL</ffdc>
-    <!-- TODO: Callout FW HIGH -->    
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_DO_STEER_INPUT_OUT_OF_RANGE memory_errors.xml -->
@@ -460,7 +483,8 @@
     <ffdc>SYMBOL</ffdc>
     <!-- FFDC: X4ECCSPARE: true or false -->    
     <ffdc>X4ECCSPARE</ffdc>
-    <!-- TODO: Callout FW HIGH -->    
+    <!-- Callout FW HIGH -->
+    <callout><procedure>CODE</procedure><priority>HIGH</priority></callout>    
 </hwpError>
 
 <!-- Original Source for RC_MSS_MAINT_NO_UE_TRAP memory_errors.xml -->
diff --git a/src/usr/hwpf/hwp/utility_procedures/mss_maint_cmds.C b/src/usr/hwpf/hwp/utility_procedures/mss_maint_cmds.C
index 52eb11230..8353f1c41 100644
--- a/src/usr/hwpf/hwp/utility_procedures/mss_maint_cmds.C
+++ b/src/usr/hwpf/hwp/utility_procedures/mss_maint_cmds.C
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: mss_maint_cmds.C,v 1.34 2014/03/11 19:04:19 gollub Exp $
+// $Id: mss_maint_cmds.C,v 1.35 2014/04/07 18:58:03 gollub Exp $
 //------------------------------------------------------------------------------
 // Don't forget to create CVS comments when you check in your changes!
 //------------------------------------------------------------------------------
@@ -95,7 +95,12 @@
 //         |          |         |     mss_put_dummy_steer_mux
 //         |          |         | SW249600: Adding 1ms delay to allow cmd to stop properly in mss_stopCmd()
 //   1.34  |11-MAR-14 | gollub  | SW250519: More options for enum TimeBaseSpeed
-
+//   1.35  |07-APR-14 | gollub  | Added enable/disable exit point 1 to get/put markstore functions
+//         |          |         | Added official x4 and x8 patterns
+//         |          |         | Implemented correct scrub interval settings for: 
+//         |          |         |     FAST_MIN_BW_IMPACT
+//         |          |         |     FAST_MED_BW_IMPACT
+//         |          |         |     FAST_MAX_BW_IMPACT
 //------------------------------------------------------------------------------
 //    Includes
 //------------------------------------------------------------------------------
@@ -414,153 +419,281 @@ static const uint8_t mss_eccSpareIndex_to_symbol[MSS_X4_ECC_STEER_OPTIONS]={
 // NOTE: DRAM 0 (x4) (symbols 0,1) used for the ECC spare.
 // NOTE: Can't use ECC spare to fix bad spare DRAMs on Port0 or Port1
 
-// TODO: Update with actual patterns from Luis Lastras when they are ready
-static const uint32_t mss_maintBufferData[MSS_MAX_PATTERNS][16][2]={
 
+static const uint32_t mss_maintBufferData[2][MSS_MAX_PATTERNS][16][2]={
+
+/*
+---Pattern 00
+Pattern sent to encoder (x8 mode):
+    port0,2           port1,3
+t0  0000000000000000 0000000000000000
+t1  0000000000000000 0000000000000000
+t2  0000000000000000 0000000000000000
+t3  0000000000000000 0000000000000000 MDI= (0,0), tag(0,1,2,3) = (0,0,0,0)
+t4  0000000000000000 0000000000000000
+t5  0000000000000000 0000000000000000
+t6  0000000000000000 0000000000000000
+t7  0000000000000000 0000000000000000 MDI= (0,0), tag(0,1,2,3) = (0,0,0,0)
+*/
 
 // PATTERN_0
-  {{0x00000000, 0x00000000},
-   {0x00000000, 0x00000000},
-   {0x00000000, 0x00000000},
-   {0x00000000, 0x00000000},
-   {0x00000000, 0x00000000},
-   {0x00000000, 0x00000000},
-   {0x00000000, 0x00000000},
-   {0x00000000, 0x00000000},
-   {0x00000000, 0x00000000},
-   {0x00000000, 0x00000000},
-   {0x00000000, 0x00000000},
-   {0x00000000, 0x00000000},
-   {0x00000000, 0x00000000},
-   {0x00000000, 0x00000000},
-   {0x00000000, 0x00000000},
-   {0x00000000, 0x00000000}},
+  // port0,2
+ {{{0x00000000, 0x00000000}, // DW0
+   {0x00000000, 0x00000000}, // DW2
+   {0x00000000, 0x00000000}, // DW4
+   {0x00000000, 0x00000000}, // DW6
+   {0x00000000, 0x00000000}, // DW8
+   {0x00000000, 0x00000000}, // DW10
+   {0x00000000, 0x00000000}, // DW12
+   {0x00000000, 0x00000000}, // DW14
+  // port1,3
+   {0x00000000, 0x00000000}, // DW1
+   {0x00000000, 0x00000000}, // DW3
+   {0x00000000, 0x00000000}, // DW5
+   {0x00000000, 0x00000000}, // DW7
+   {0x00000000, 0x00000000}, // DW9
+   {0x00000000, 0x00000000}, // DW11
+   {0x00000000, 0x00000000}, // DW13
+   {0x00000000, 0x00000000}},// DW15
+
+
+/*
+---Pattern 1
+Pattern sent to encoder (x8 mode):
+    port0,2           port1,3
+t0  ffffffffffffffff ffffffffffffffff
+t1  ffffffffffffffff ffffffffffffffff
+t2  ffffffffffffffff ffffffffffffffff
+t3  ffffffffffffffff ffffffffffffffff MDI= (1,1), tag(0,1,2,3) = (1,1,1,1)
+t4  ffffffffffffffff ffffffffffffffff
+t5  ffffffffffffffff ffffffffffffffff
+t6  ffffffffffffffff ffffffffffffffff
+t7  ffffffffffffffff ffffffffffffffff MDI= (1,1), tag(0,1,2,3) = (1,1,1,1)
+*/
 
 // PATTERN_1
-  {{0xffffffff, 0xffffffff},
-   {0xffffffff, 0xffffffff},
-   {0xffffffff, 0xffffffff},
-   {0xffffffff, 0xffffffff},
-   {0xffffffff, 0xffffffff},
-   {0xffffffff, 0xffffffff},
-   {0xffffffff, 0xffffffff},
-   {0xffffffff, 0xffffffff},
-   {0xffffffff, 0xffffffff},
-   {0xffffffff, 0xffffffff},
-   {0xffffffff, 0xffffffff},
-   {0xffffffff, 0xffffffff},
-   {0xffffffff, 0xffffffff},
-   {0xffffffff, 0xffffffff},
-   {0xffffffff, 0xffffffff},
-   {0xffffffff, 0xffffffff}},
+  // port0,2
+  {{0xffffffff, 0xffffffff}, // DW0
+   {0xffffffff, 0xffffffff}, // DW2
+   {0xffffffff, 0xffffffff}, // DW4
+   {0xffffffff, 0xffffffff}, // DW6
+   {0xffffffff, 0xffffffff}, // DW8
+   {0xffffffff, 0xffffffff}, // DW10
+   {0xffffffff, 0xffffffff}, // DW12
+   {0xffffffff, 0xffffffff}, // DW14
+  // port1,3
+   {0xffffffff, 0xffffffff}, // DW1
+   {0xffffffff, 0xffffffff}, // DW3
+   {0xffffffff, 0xffffffff}, // DW5
+   {0xffffffff, 0xffffffff}, // DW7
+   {0xffffffff, 0xffffffff}, // DW9
+   {0xffffffff, 0xffffffff}, // DW11
+   {0xffffffff, 0xffffffff}, // DW13
+   {0xffffffff, 0xffffffff}},// DW15
+
+
+/*---Pattern 2
+Pattern sent to encoder (x8 mode):
+    port0,2           port1,3
+t0  6789555555555555 5555555555555555
+t1  6f2eaaaaaaaaaaaa aaaaaaaaaaaaaaaa
+t2  ae79555555555555 5555555555555555
+t3  84edaaaaaaaaaaaa aaaaaaaaaaaaaaaa MDI= (1,1), tag(0,1,2,3) = (1,1,1,1)
+t4  545eaaaaaaaaaaaa aaaaaaaaaaaaaaaa
+t5  a791555555555555 5555555555555555
+t6  6622aaaaaaaaaaaa aaaaaaaaaaaaaaaa
+t7  f7f8555555555555 5555555555555555 MDI= (1,1), tag(0,1,2,3) = (1,1,1,1)
+*/
 
 // PATTERN_2
-  {{0xf0f0f0f0, 0xf0f0f0f0},
-   {0xf0f0f0f0, 0xf0f0f0f0},
-   {0xf0f0f0f0, 0xf0f0f0f0},
-   {0xf0f0f0f0, 0xf0f0f0f0},
-   {0xf0f0f0f0, 0xf0f0f0f0},
-   {0xf0f0f0f0, 0xf0f0f0f0},
-   {0xf0f0f0f0, 0xf0f0f0f0},
-   {0xf0f0f0f0, 0xf0f0f0f0},
-   {0xf0f0f0f0, 0xf0f0f0f0},
-   {0xf0f0f0f0, 0xf0f0f0f0},
-   {0xf0f0f0f0, 0xf0f0f0f0},
-   {0xf0f0f0f0, 0xf0f0f0f0},
-   {0xf0f0f0f0, 0xf0f0f0f0},
-   {0xf0f0f0f0, 0xf0f0f0f0},
-   {0xf0f0f0f0, 0xf0f0f0f0},
-   {0xf0f0f0f0, 0xf0f0f0f0}},
+  // port0,2
+  {{0x67895555, 0x55555555}, // DW0
+   {0x6f2eaaaa, 0xaaaaaaaa}, // DW2
+   {0xae795555, 0x55555555}, // DW4
+   {0x84edaaaa, 0xaaaaaaaa}, // DW6
+   {0x545eaaaa, 0xaaaaaaaa}, // DW8
+   {0xa7915555, 0x55555555}, // DW10
+   {0x6622aaaa, 0xaaaaaaaa}, // DW12
+   {0xf7f85555, 0x55555555}, // DW14
+  // port1,3
+   {0x55555555, 0x55555555}, // DW1
+   {0xaaaaaaaa, 0xaaaaaaaa}, // DW3
+   {0x55555555, 0x55555555}, // DW5
+   {0xaaaaaaaa, 0xaaaaaaaa}, // DW7
+   {0xaaaaaaaa, 0xaaaaaaaa}, // DW9
+   {0x55555555, 0x55555555}, // DW11
+   {0xaaaaaaaa, 0xaaaaaaaa}, // DW13
+   {0x55555555, 0x55555555}},// DW15
+
+/*
+---Pattern 3
+Pattern sent to encoder (x8 mode):
+    port0,2           port1,3
+t0  aaaaaac47aaaaaaa aaaaaaaaaaaaaaaa
+t1  555555abf1555555 5555555555555555
+t2  aaaaaa01aeaaaaaa aaaaaaaaaaaaaaaa
+t3  5555550c81555555 5555555555555555 MDI= (0,0), tag(0,1,2,3) = (1,1,1,1)
+t4  5555557a7f555555 5555555555555555
+t5  aaaaaaccafaaaaaa aaaaaaaaaaaaaaaa
+t6  555555456d555555 5555555555555555
+t7  aaaaaa21deaaaaaa aaaaaaaaaaaaaaaa MDI= (1,1), tag(0,1,2,3) = (0,0,0,0)
+*/
 
 // PATTERN_3
-  {{0x0f0f0f0f, 0x0f0f0f0f},
-   {0x0f0f0f0f, 0x0f0f0f0f},
-   {0x0f0f0f0f, 0x0f0f0f0f},
-   {0x0f0f0f0f, 0x0f0f0f0f},
-   {0x0f0f0f0f, 0x0f0f0f0f},
-   {0x0f0f0f0f, 0x0f0f0f0f},
-   {0x0f0f0f0f, 0x0f0f0f0f},
-   {0x0f0f0f0f, 0x0f0f0f0f},
-   {0x0f0f0f0f, 0x0f0f0f0f},
-   {0x0f0f0f0f, 0x0f0f0f0f},
-   {0x0f0f0f0f, 0x0f0f0f0f},
-   {0x0f0f0f0f, 0x0f0f0f0f},
-   {0x0f0f0f0f, 0x0f0f0f0f},
-   {0x0f0f0f0f, 0x0f0f0f0f},
-   {0x0f0f0f0f, 0x0f0f0f0f},
-   {0x0f0f0f0f, 0x0f0f0f0f}},
+  // port0,2
+  {{0xaaaaaac4, 0x7aaaaaaa}, // DW0
+   {0x555555ab, 0xf1555555}, // DW2
+   {0xaaaaaa01, 0xaeaaaaaa}, // DW4
+   {0x5555550c, 0x81555555}, // DW6
+   {0x5555557a, 0x7f555555}, // DW8
+   {0xaaaaaacc, 0xafaaaaaa}, // DW10
+   {0x55555545, 0x6d555555}, // DW12
+   {0xaaaaaa21, 0xdeaaaaaa}, // DW14
+  // port1,3
+   {0xaaaaaaaa, 0xaaaaaaaa}, // DW1
+   {0x55555555, 0x55555555}, // DW3
+   {0xaaaaaaaa, 0xaaaaaaaa}, // DW5
+   {0x55555555, 0x55555555}, // DW7
+   {0x55555555, 0x55555555}, // DW9
+   {0xaaaaaaaa, 0xaaaaaaaa}, // DW11
+   {0x55555555, 0x55555555}, // DW13
+   {0xaaaaaaaa, 0xaaaaaaaa}},// DW15
+
+/*
+---Pattern 4
+Pattern sent to encoder (x8 mode):
+    port0,2           port1,3
+t0  ffffffffffff8403 ffffffffffffffff
+t1  ffffffffffff83d3 ffffffffffffffff
+t2  ffffffffffffbf89 ffffffffffffffff
+t3  ffffffffffff1133 ffffffffffffffff MDI= (0,0), tag(0,1,2,3) = (0,0,0,0)
+t4  000000000000006c 0000000000000000
+t5  000000000000468a 0000000000000000
+t6  000000000000cf7e 0000000000000000
+t7  ffffffffffff6d37 ffffffffffffffff MDI= (1,0), tag(0,1,2,3) = (1,1,1,0)
+*/
 
 // PATTERN_4
-  {{0xaaaaaaaa, 0xaaaaaaaa},
-   {0xaaaaaaaa, 0xaaaaaaaa},
-   {0xaaaaaaaa, 0xaaaaaaaa},
-   {0xaaaaaaaa, 0xaaaaaaaa},
-   {0xaaaaaaaa, 0xaaaaaaaa},
-   {0xaaaaaaaa, 0xaaaaaaaa},
-   {0xaaaaaaaa, 0xaaaaaaaa},
-   {0xaaaaaaaa, 0xaaaaaaaa},
-   {0xaaaaaaaa, 0xaaaaaaaa},
-   {0xaaaaaaaa, 0xaaaaaaaa},
-   {0xaaaaaaaa, 0xaaaaaaaa},
-   {0xaaaaaaaa, 0xaaaaaaaa},
-   {0xaaaaaaaa, 0xaaaaaaaa},
-   {0xaaaaaaaa, 0xaaaaaaaa},
-   {0xaaaaaaaa, 0xaaaaaaaa},
-   {0xaaaaaaaa, 0xaaaaaaaa}},
+  // port0,2
+  {{0xffffffff, 0xffff8403}, // DW0
+   {0xffffffff, 0xffff83d3}, // DW2
+   {0xffffffff, 0xffffbf89}, // DW4
+   {0xffffffff, 0xffff1133}, // DW6
+   {0x00000000, 0x0000006c}, // DW8
+   {0x00000000, 0x0000468a}, // DW10
+   {0x00000000, 0x0000cf7e}, // DW12
+   {0xffffffff, 0xffff6d37}, // DW14
+  // port1,3
+   {0xffffffff, 0xffffffff}, // DW1
+   {0xffffffff, 0xffffffff}, // DW3
+   {0xffffffff, 0xffffffff}, // DW5
+   {0xffffffff, 0xffffffff}, // DW7
+   {0x00000000, 0x00000000}, // DW9
+   {0x00000000, 0x00000000}, // DW11
+   {0x00000000, 0x00000000}, // DW13
+   {0xffffffff, 0xffffffff}},// DW15
+
+/*
+---Pattern 5
+Pattern sent to encoder (x8 mode):
+    port0,2           port1,3
+t0  0000000000000000 0000000006c00000
+t1  0000000000000000 0000000068f40000
+t2  0000000000000000 00000000701c0000
+t3  0000000000000000 00000000f7640000 MDI= (1,1), tag(0,1,2,3) = (1,1,1,1)
+t4  ffffffffffffffff ffffffffe523ffff
+t5  ffffffffffffffff ffffffff5603ffff
+t6  ffffffffffffffff fffffffffeb5ffff
+t7  0000000000000000 0000000098a40000 MDI= (0,1), tag(0,1,2,3) = (0,0,0,1)
+*/
 
 // PATTERN_5
-  {{0x55555555, 0x55555555},
-   {0x55555555, 0x55555555},
-   {0x55555555, 0x55555555},
-   {0x55555555, 0x55555555},
-   {0x55555555, 0x55555555},
-   {0x55555555, 0x55555555},
-   {0x55555555, 0x55555555},
-   {0x55555555, 0x55555555},
-   {0x55555555, 0x55555555},
-   {0x55555555, 0x55555555},
-   {0x55555555, 0x55555555},
-   {0x55555555, 0x55555555},
-   {0x55555555, 0x55555555},
-   {0x55555555, 0x55555555},
-   {0x55555555, 0x55555555},
-   {0x55555555, 0x55555555}},
+  // port0,2
+  {{0x00000000, 0x00000000}, // DW0
+   {0x00000000, 0x00000000}, // DW2
+   {0x00000000, 0x00000000}, // DW4
+   {0x00000000, 0x00000000}, // DW6
+   {0xffffffff, 0xffffffff}, // DW8
+   {0xffffffff, 0xffffffff}, // DW10
+   {0xffffffff, 0xffffffff}, // DW12
+   {0x00000000, 0x00000000}, // DW14
+  // port1,3
+   {0x00000000, 0x06c00000}, // DW1
+   {0x00000000, 0x68f40000}, // DW3
+   {0x00000000, 0x701c0000}, // DW5
+   {0x00000000, 0xf7640000}, // DW7
+   {0xffffffff, 0xe523ffff}, // DW9
+   {0xffffffff, 0x5603ffff}, // DW11
+   {0xffffffff, 0xfeb5ffff}, // DW13
+   {0x00000000, 0x98a40000}},// DW15
+
+/*
+---Pattern 6
+Pattern sent to encoder (x8 mode):
+    port0,2           port1,3
+t0  ffffffffffffffff ffffffffceb3ffff
+t1  0000000000000000 0000000034460000
+t2  ffffffffffffffff ffffffffb1afffff
+t3  0000000000000000 00000000fd080000 MDI= (1,1), tag(0,1,2,3) = (0,1,0,1)
+t4  0000000000000000 0000000037540000
+t5  ffffffffffffffff ffffffff3443ffff
+t6  0000000000000000 000000001a260000
+t7  ffffffffffffffff ffffffff3f3fffff MDI= (0,0), tag(0,1,2,3) = (1,0,1,0)
+*/
 
 // PATTERN_6
-  {{0xcccccccc, 0xcccccccc},
-   {0xcccccccc, 0xcccccccc},
-   {0xcccccccc, 0xcccccccc},
-   {0xcccccccc, 0xcccccccc},
-   {0xcccccccc, 0xcccccccc},
-   {0xcccccccc, 0xcccccccc},
-   {0xcccccccc, 0xcccccccc},
-   {0xcccccccc, 0xcccccccc},
-   {0xcccccccc, 0xcccccccc},
-   {0xcccccccc, 0xcccccccc},
-   {0xcccccccc, 0xcccccccc},
-   {0xcccccccc, 0xcccccccc},
-   {0xcccccccc, 0xcccccccc},
-   {0xcccccccc, 0xcccccccc},
-   {0xcccccccc, 0xcccccccc},
-   {0xcccccccc, 0xcccccccc}},
+  // port0,2
+  {{0xffffffff, 0xffffffff}, // DW0
+   {0x00000000, 0x00000000}, // DW2
+   {0xffffffff, 0xffffffff}, // DW4
+   {0x00000000, 0x00000000}, // DW6
+   {0x00000000, 0x00000000}, // DW8
+   {0xffffffff, 0xffffffff}, // DW10
+   {0x00000000, 0x00000000}, // DW12
+   {0xffffffff, 0xffffffff}, // DW14
+  // port1,3
+   {0xffffffff, 0xceb3ffff}, // DW1
+   {0x00000000, 0x34460000}, // DW3
+   {0xffffffff, 0xb1afffff}, // DW5
+   {0x00000000, 0xfd080000}, // DW7
+   {0x00000000, 0x37540000}, // DW9
+   {0xffffffff, 0x3443ffff}, // DW11
+   {0x00000000, 0x1a260000}, // DW13
+   {0xffffffff, 0x3f3fffff}},// DW15
+
+/*
+---Pattern 7
+Pattern sent to encoder (x8 mode):
+    port0,2           port1,3
+t0  83dc000000000000 0000000000000000
+t1  d4b7ffffffffffff ffffffffffffffff
+t2  8c2c000000000000 0000000000000000
+t3  5d8affffffffffff ffffffffffffffff MDI= (0,0), tag(0,1,2,3) = (1,0,1,0)
+t4  ec57ffffffffffff ffffffffffffffff
+t5  a9d4000000000000 0000000000000000
+t6  8447ffffffffffff ffffffffffffffff
+t7  eafe000000000000 0000000000000000 MDI= (1,1), tag(0,1,2,3) = (0,1,0,1)
+*/
 
 // PATTERN_7
-  {{0x33333333, 0x33333333},
-   {0x33333333, 0x33333333},
-   {0x33333333, 0x33333333},
-   {0x33333333, 0x33333333},
-   {0x33333333, 0x33333333},
-   {0x33333333, 0x33333333},
-   {0x33333333, 0x33333333},
-   {0x33333333, 0x33333333},
-   {0x33333333, 0x33333333},
-   {0x33333333, 0x33333333},
-   {0x33333333, 0x33333333},
-   {0x33333333, 0x33333333},
-   {0x33333333, 0x33333333},
-   {0x33333333, 0x33333333},
-   {0x33333333, 0x33333333},
-   {0x33333333, 0x33333333}},
+  // port0,2
+  {{0x83dc0000, 0x00000000}, // DW0
+   {0xd4b7ffff, 0xffffffff}, // DW2
+   {0x8c2c0000, 0x00000000}, // DW4
+   {0x5d8affff, 0xffffffff}, // DW6
+   {0xec57ffff, 0xffffffff}, // DW8
+   {0xa9d40000, 0x00000000}, // DW10
+   {0x8447ffff, 0xffffffff}, // DW12
+   {0xeafe0000, 0x00000000}, // DW14
+  // port1,3
+   {0x00000000, 0x00000000}, // DW1
+   {0xffffffff, 0xffffffff}, // DW3
+   {0x00000000, 0x00000000}, // DW5
+   {0xffffffff, 0xffffffff}, // DW7
+   {0xffffffff, 0xffffffff}, // DW9
+   {0x00000000, 0x00000000}, // DW11
+   {0xffffffff, 0xffffffff}, // DW13
+   {0x00000000, 0x00000000}},// DW15
 
 // PATTERN_8: random seed
   {{0x12345678, 0x87654321},
@@ -578,130 +711,582 @@ static const uint32_t mss_maintBufferData[MSS_MAX_PATTERNS][16][2]={
    {0x12345678, 0x87654321},
    {0x87654321, 0x12345678},
    {0x12345678, 0x87654321},
-   {0x87654321, 0x12345678}}};
+   {0x87654321, 0x12345678}}},
+
+
+/*
+---Pattern 00
+Pattern sent to encoder (x4 mode):
+    port0,2           port1,3
+t0  0000000000000000 0000000000000000
+t1  0000000000000000 0000000000000000
+t2  0000000000000000 0000000000000000
+t3  0000000000000000 0000000000000000 MDI= (0,0), tag(0,1,2,3) = (0,0,0,0)
+t4  0000000000000000 0000000000000000
+t5  0000000000000000 0000000000000000
+t6  0000000000000000 0000000000000000
+t7  0000000000000000 0000000000000000 MDI= (0,0), tag(0,1,2,3) = (0,0,0,0)
+*/
+
+// PATTERN_0
+  // port0,2
+ {{{0x00000000, 0x00000000}, // DW0
+   {0x00000000, 0x00000000}, // DW2
+   {0x00000000, 0x00000000}, // DW4
+   {0x00000000, 0x00000000}, // DW6
+   {0x00000000, 0x00000000}, // DW8
+   {0x00000000, 0x00000000}, // DW10
+   {0x00000000, 0x00000000}, // DW12
+   {0x00000000, 0x00000000}, // DW14
+  // port1,3
+   {0x00000000, 0x00000000}, // DW1
+   {0x00000000, 0x00000000}, // DW3
+   {0x00000000, 0x00000000}, // DW5
+   {0x00000000, 0x00000000}, // DW7
+   {0x00000000, 0x00000000}, // DW9
+   {0x00000000, 0x00000000}, // DW11
+   {0x00000000, 0x00000000}, // DW13
+   {0x00000000, 0x00000000}},// DW15
+
+
+/*
+---Pattern 1
+Pattern sent to encoder (x4 mode):
+    port0,2           port1,3
+t0  ffffffffffffffff ffffffffffffffff
+t1  ffffffffffffffff ffffffffffffffff
+t2  ffffffffffffffff ffffffffffffffff
+t3  ffffffffffffffff ffffffffffffffff MDI= (1,1), tag(0,1,2,3) = (1,1,1,1)
+t4  ffffffffffffffff ffffffffffffffff
+t5  ffffffffffffffff ffffffffffffffff
+t6  ffffffffffffffff ffffffffffffffff
+t7  ffffffffffffffff ffffffffffffffff MDI= (1,1), tag(0,1,2,3) = (1,1,1,1)
+*/
+
+// PATTERN_1
+  // port0,2
+  {{0xffffffff, 0xffffffff}, // DW0
+   {0xffffffff, 0xffffffff}, // DW2
+   {0xffffffff, 0xffffffff}, // DW4
+   {0xffffffff, 0xffffffff}, // DW6
+   {0xffffffff, 0xffffffff}, // DW8
+   {0xffffffff, 0xffffffff}, // DW10
+   {0xffffffff, 0xffffffff}, // DW12
+   {0xffffffff, 0xffffffff}, // DW14
+  // port1,3
+   {0xffffffff, 0xffffffff}, // DW1
+   {0xffffffff, 0xffffffff}, // DW3
+   {0xffffffff, 0xffffffff}, // DW5
+   {0xffffffff, 0xffffffff}, // DW7
+   {0xffffffff, 0xffffffff}, // DW9
+   {0xffffffff, 0xffffffff}, // DW11
+   {0xffffffff, 0xffffffff}, // DW13
+   {0xffffffff, 0xffffffff}},// DW15
+
+
+/*---Pattern 2
+Pattern sent to encoder (x4 mode):
+    port0,2           port1,3
+t0  5055555555555555 5555555555555555
+t1  a96aaaaaaaaaaaaa aaaaaaaaaaaaaaaa
+t2  6215555555555555 5555555555555555
+t3  dd5aaaaaaaaaaaaa aaaaaaaaaaaaaaaa MDI= (1,1), tag(0,1,2,3) = (1,1,1,1)
+t4  89eaaaaaaaaaaaaa aaaaaaaaaaaaaaaa
+t5  7fd5555555555555 5555555555555555
+t6  b32aaaaaaaaaaaaa aaaaaaaaaaaaaaaa
+t7  acc5555555555555 5555555555555555 MDI= (1,1), tag(0,1,2,3) = (1,1,1,1)
+*/
+
+// PATTERN_2
+  // port0,2
+  {{0x50555555, 0x55555555}, // DW0
+   {0xa96aaaaa, 0xaaaaaaaa}, // DW2
+   {0x62155555, 0x55555555}, // DW4
+   {0xdd5aaaaa, 0xaaaaaaaa}, // DW6
+   {0x89eaaaaa, 0xaaaaaaaa}, // DW8
+   {0x7fd55555, 0x55555555}, // DW10
+   {0xb32aaaaa, 0xaaaaaaaa}, // DW12
+   {0xacc55555, 0x55555555}, // DW14
+  // port1,3
+   {0x55555555, 0x55555555}, // DW1
+   {0xaaaaaaaa, 0xaaaaaaaa}, // DW3
+   {0x55555555, 0x55555555}, // DW5
+   {0xaaaaaaaa, 0xaaaaaaaa}, // DW7
+   {0xaaaaaaaa, 0xaaaaaaaa}, // DW9
+   {0x55555555, 0x55555555}, // DW11
+   {0xaaaaaaaa, 0xaaaaaaaa}, // DW13
+   {0x55555555, 0x55555555}},// DW15
+
+/*
+---Pattern 3
+Pattern sent to encoder (x4 mode):
+    port0,2           port1,3
+t0  aaaaaab7caaaaaaa aaaaaaaaaaaaaaaa
+t1  555555f2d5555555 5555555555555555
+t2  aaaaaad8aaaaaaaa aaaaaaaaaaaaaaaa
+t3  5555552495555555 5555555555555555 MDI= (0,0), tag(0,1,2,3) = (1,1,1,1)
+t4  55555540b5555555 5555555555555555
+t5  aaaaaa04baaaaaaa aaaaaaaaaaaaaaaa
+t6  555555c095555555 5555555555555555
+t7  aaaaaa956aaaaaaa aaaaaaaaaaaaaaaa MDI= (1,1), tag(0,1,2,3) = (0,0,0,0)
+*/
+
+// PATTERN_3
+  // port0,2
+  {{0xaaaaaab7, 0xcaaaaaaa}, // DW0
+   {0x555555f2, 0xd5555555}, // DW2
+   {0xaaaaaad8, 0xaaaaaaaa}, // DW4
+   {0x55555524, 0x95555555}, // DW6
+   {0x55555540, 0xb5555555}, // DW8
+   {0xaaaaaa04, 0xbaaaaaaa}, // DW10
+   {0x555555c0, 0x95555555}, // DW12
+   {0xaaaaaa95, 0x6aaaaaaa}, // DW14
+  // port1,3
+   {0xaaaaaaaa, 0xaaaaaaaa}, // DW1
+   {0x55555555, 0x55555555}, // DW3
+   {0xaaaaaaaa, 0xaaaaaaaa}, // DW5
+   {0x55555555, 0x55555555}, // DW7
+   {0x55555555, 0x55555555}, // DW9
+   {0xaaaaaaaa, 0xaaaaaaaa}, // DW11
+   {0x55555555, 0x55555555}, // DW13
+   {0xaaaaaaaa, 0xaaaaaaaa}},// DW15
+
+/*
+---Pattern 4
+Pattern sent to encoder (x4 mode):
+    port0,2           port1,3
+t0  ffffffffffff93ff ffffffffffffffff
+t1  ffffffffffffb5bf ffffffffffffffff
+t2  ffffffffffff207f ffffffffffffffff
+t3  ffffffffffffb37f ffffffffffffffff MDI= (0,0), tag(0,1,2,3) = (0,0,0,0)
+t4  0000000000002340 0000000000000000
+t5  00000000000062e0 0000000000000000
+t6  0000000000006740 0000000000000000
+t7  ffffffffffff6a3f ffffffffffffffff MDI= (1,0), tag(0,1,2,3) = (1,1,1,0)    
+*/
 
+// PATTERN_4
+  // port0,2
+  {{0xffffffff, 0xffff93ff}, // DW0
+   {0xffffffff, 0xffffb5bf}, // DW2
+   {0xffffffff, 0xffff207f}, // DW4
+   {0xffffffff, 0xffffb37f}, // DW6
+   {0x00000000, 0x00002340}, // DW8
+   {0x00000000, 0x000062e0}, // DW10
+   {0x00000000, 0x00006740}, // DW12
+   {0xffffffff, 0xffff6a3f}, // DW14
+  // port1,3
+   {0xffffffff, 0xffffffff}, // DW1
+   {0xffffffff, 0xffffffff}, // DW3
+   {0xffffffff, 0xffffffff}, // DW5
+   {0xffffffff, 0xffffffff}, // DW7
+   {0x00000000, 0x00000000}, // DW9
+   {0x00000000, 0x00000000}, // DW11
+   {0x00000000, 0x00000000}, // DW13
+   {0xffffffff, 0xffffffff}},// DW15
+
+/*
+---Pattern 5
+Pattern sent to encoder (x4 mode):
+    port0,2           port1,3
+t0  0000000000000000 0000000090c00000
+t1  0000000000000000 00000000b0400000
+t2  0000000000000000 0000000087a00000
+t3  0000000000000000 0000000033000000 MDI= (1,1), tag(0,1,2,3) = (1,1,1,1)
+t4  ffffffffffffffff ffffffff9dbfffff
+t5  ffffffffffffffff ffffffffa69fffff
+t6  ffffffffffffffff ffffffff257fffff
+t7  0000000000000000 00000000c7400000 MDI= (0,1), tag(0,1,2,3) = (0,0,0,1)
+*/
 
+// PATTERN_5
+  // port0,2
+  {{0x00000000, 0x00000000}, // DW0
+   {0x00000000, 0x00000000}, // DW2
+   {0x00000000, 0x00000000}, // DW4
+   {0x00000000, 0x00000000}, // DW6
+   {0xffffffff, 0xffffffff}, // DW8
+   {0xffffffff, 0xffffffff}, // DW10
+   {0xffffffff, 0xffffffff}, // DW12
+   {0x00000000, 0x00000000}, // DW14
+  // port1,3
+   {0x00000000, 0x90c00000}, // DW1
+   {0x00000000, 0xb0400000}, // DW3
+   {0x00000000, 0x87a00000}, // DW5
+   {0x00000000, 0x33000000}, // DW7
+   {0xffffffff, 0x9dbfffff}, // DW9
+   {0xffffffff, 0xa69fffff}, // DW11
+   {0xffffffff, 0x257fffff}, // DW13
+   {0x00000000, 0xc7400000}},// DW15
+
+/*
+---Pattern 6
+Pattern sent to encoder (x4 mode):
+    port0,2           port1,3
+t0  ffffffffffffffff ffffffff7e3fffff
+t1  0000000000000000 0000000018c00000
+t2  ffffffffffffffff ffffffffc8bfffff
+t3  0000000000000000 000000006b800000 MDI= (1,1), tag(0,1,2,3) = (0,1,0,1)
+t4  0000000000000000 00000000f2800000
+t5  ffffffffffffffff ffffffff659fffff
+t6  0000000000000000 00000000c5c00000
+t7  ffffffffffffffff ffffffff473fffff MDI= (0,0), tag(0,1,2,3) = (1,0,1,0)
+*/
+
+// PATTERN_6
+  // port0,2
+  {{0xffffffff, 0xffffffff}, // DW0
+   {0x00000000, 0x00000000}, // DW2
+   {0xffffffff, 0xffffffff}, // DW4
+   {0x00000000, 0x00000000}, // DW6
+   {0x00000000, 0x00000000}, // DW8
+   {0xffffffff, 0xffffffff}, // DW10
+   {0x00000000, 0x00000000}, // DW12
+   {0xffffffff, 0xffffffff}, // DW14
+  // port1,3
+   {0xffffffff, 0x7e3fffff}, // DW1
+   {0x00000000, 0x18c00000}, // DW3
+   {0xffffffff, 0xc8bfffff}, // DW5
+   {0x00000000, 0x6b800000}, // DW7
+   {0x00000000, 0xf2800000}, // DW9
+   {0xffffffff, 0x659fffff}, // DW11
+   {0x00000000, 0xc5c00000}, // DW13
+   {0xffffffff, 0x473fffff}},// DW15
+
+/*
+---Pattern 7
+Pattern sent to encoder (x4 mode):
+    port0,2           port1,3
+t0  8200000000000000 0000000000000000
+t1  d3bfffffffffffff ffffffffffffffff
+t2  d080000000000000 0000000000000000
+t3  539fffffffffffff ffffffffffffffff MDI= (0,0), tag(0,1,2,3) = (1,0,1,0)
+t4  63ffffffffffffff ffffffffffffffff
+t5  d640000000000000 0000000000000000
+t6  5c3fffffffffffff ffffffffffffffff
+t7  dcb0000000000000 0000000000000000 MDI= (1,1), tag(0,1,2,3) = (0,1,0,1)
+*/
+
+// PATTERN_7
+  // port0,2
+  {{0x82000000, 0x00000000}, // DW0
+   {0xd3bfffff, 0xffffffff}, // DW2
+   {0xd0800000, 0x00000000}, // DW4
+   {0x539fffff, 0xffffffff}, // DW6
+   {0x63ffffff, 0xffffffff}, // DW8
+   {0xd6400000, 0x00000000}, // DW10
+   {0x5c3fffff, 0xffffffff}, // DW12
+   {0xdcb00000, 0x00000000}, // DW14
+  // port1,3
+   {0x00000000, 0x00000000}, // DW1
+   {0xffffffff, 0xffffffff}, // DW3
+   {0x00000000, 0x00000000}, // DW5
+   {0xffffffff, 0xffffffff}, // DW7
+   {0xffffffff, 0xffffffff}, // DW9
+   {0x00000000, 0x00000000}, // DW11
+   {0xffffffff, 0xffffffff}, // DW13
+   {0x00000000, 0x00000000}},// DW15
+
+// PATTERN_8: random seed
+  {{0x12345678, 0x87654321},
+   {0x87654321, 0x12345678},
+   {0x12345678, 0x87654321},
+   {0x87654321, 0x12345678},
+   {0x12345678, 0x87654321},
+   {0x87654321, 0x12345678},
+   {0x12345678, 0x87654321},
+   {0x87654321, 0x12345678},
+   {0x12345678, 0x87654321},
+   {0x87654321, 0x12345678},
+   {0x12345678, 0x87654321},
+   {0x87654321, 0x12345678},
+   {0x12345678, 0x87654321},
+   {0x87654321, 0x12345678},
+   {0x12345678, 0x87654321},
+   {0x87654321, 0x12345678}}}};
+
+
+
+
+
+static const uint8_t mss_65thByte[2][MSS_MAX_PATTERNS][4]={
 
-// TODO: Update with actual patterns from Luis Lastras when they are ready
-static const uint8_t mss_65thByte[MSS_MAX_PATTERNS][4]={
 
 // bit1=tag0_2, bit2=tag1_3, bit3=MDI
 
-// PATTERN_0 - verified
-  {0x00,   // 1st 64B of cachline: tag0=0, tag1=0, MDI=0
+// PATTERN_0 (x8 mode)
+
+    // MDI= (0,0), tag(0,1,2,3) = (0,0,0,0)
+ {{0x00,   // 1st 64B of cachline: tag0=0, tag1=0, MDI=0
    0x00,   // 1st 64B of cachline: tag2=0, tag3=0, MDI=0
+    // MDI= (0,0), tag(0,1,2,3) = (0,0,0,0)
    0x00,   // 2nd 64B of cachline: tag0=0, tag1=0, MDI=0
    0x00},  // 2nd 64B of cachline: tag2=0, tag3=0, MDI=0
 
-// PATTERN_1 - verified
+// PATTERN_1 (x8 mode)
+
+    // MDI= (1,1), tag(0,1,2,3) = (1,1,1,1)
   {0xF0,   // 1st 64B of cachline: tag0=1, tag1=1, MDI=1
    0x70,   // 1st 64B of cachline: tag2=1, tag3=1, MDI=1
+    // MDI= (1,1), tag(0,1,2,3) = (1,1,1,1)
+   0x70,   // 2nd 64B of cachline: tag0=1, tag1=1, MDI=1
+   0xF0},  // 2nd 64B of cachline: tag2=1, tag3=1, MDI=1
+
+// PATTERN_2 (x8 mode)
+
+    // MDI= (1,1), tag(0,1,2,3) = (1,1,1,1)
+  {0xF0,   // 1st 64B of cachline: tag0=1, tag1=1, MDI=1
+   0xF0,   // 1st 64B of cachline: tag2=1, tag3=1, MDI=1
+    // MDI= (1,1), tag(0,1,2,3) = (1,1,1,1)
    0xF0,   // 2nd 64B of cachline: tag0=1, tag1=1, MDI=1
-   0x70},  // 2nd 64B of cachline: tag2=1, tag3=1, MDI=1
+   0xF0},  // 2nd 64B of cachline: tag2=1, tag3=1, MDI=1
+
+// PATTERN_3 (x8 mode)
+    // MDI= (0,0), tag(0,1,2,3) = (1,1,1,1)
+  {0x60,   // 1st 64B of cachline: tag0=1, tag1=1, MDI=0
+   0x60,   // 1st 64B of cachline: tag2=1, tag3=1, MDI=0
+    // MDI= (1,1), tag(0,1,2,3) = (0,0,0,0)
+   0x90,   // 2nd 64B of cachline: tag0=0, tag1=0, MDI=1
+   0x90},  // 2nd 64B of cachline: tag2=0, tag3=0, MDI=1
 
-// PATTERN_2 - verified
-  {0x70,   // 1st 64B of cachline: tag0=1, tag1=1, MDI=1
+// PATTERN_4 (x8 mode)
+    // MDI= (0,0), tag(0,1,2,3) = (0,0,0,0)
+  {0x00,   // 1st 64B of cachline: tag0=0, tag1=0, MDI=0
    0x00,   // 1st 64B of cachline: tag2=0, tag3=0, MDI=0
-   0x70,   // 2nd 64B of cachline: tag0=1, tag1=1, MDI=1
-   0x00},  // 2nd 64B of cachline: tag2=0, tag3=0, MDI=0
+    // MDI= (1,0), tag(0,1,2,3) = (1,1,1,0)
+   0xF0,   // 2nd 64B of cachline: tag0=1, tag1=1, MDI=1
+   0xC0},  // 2nd 64B of cachline: tag2=1, tag3=0, MDI=0
 
-// PATTERN_3 - verified
-  {0x80,   // 1st 64B of cachline: tag0=0, tag1=0, MDI=0
-   0x70,   // 1st 64B of cachline: tag2=1, tag3=1, MDI=1
-   0x80,   // 2nd 64B of cachline: tag0=0, tag1=0, MDI=0
-   0x70},  // 2nd 64B of cachline: tag2=1, tag3=1, MDI=1
-
-// PATTERN_4 - verified
-  {0xB0,   // 1st 64B of cachline: tag0=0, tag1=1, MDI=1
-   0xD0,   // 1st 64B of cachline: tag2=1, tag3=0, MDI=1
-   0xA0,   // 2nd 64B of cachline: tag0=0, tag1=1, MDI=0
-   0x40},  // 2nd 64B of cachline: tag2=1, tag3=0, MDI=0
-
-// PATTERN_5 - verified
-  {0xE0,   // 1st 64B of cachline: tag0=1, tag1=0, MDI=0
-  0x20,   // 1st 64B of cachline: tag2=0, tag3=1, MDI=0
-  0x50,   // 2nd 64B of cachline: tag0=1, tag1=0, MDI=1
-  0x30},  // 2nd 64B of cachline: tag2=0, tag3=1, MDI=1
-
-// PATTERN_6 - verified
-  {0x70,   // 1st 64B of cachline: tag0=1, tag1=1, MDI=1
+// PATTERN_5 (x8 mode)
+    // MDI= (1,1), tag(0,1,2,3) = (1,1,1,1)
+  {0xF0,   // 1st 64B of cachline: tag0=1, tag1=1, MDI=1
+   0xF0,   // 1st 64B of cachline: tag2=1, tag3=1, MDI=1
+    // MDI= (0,1), tag(0,1,2,3) = (0,0,0,1)
+   0x00,   // 2nd 64B of cachline: tag0=0, tag1=0, MDI=0
+   0x10},  // 2nd 64B of cachline: tag2=0, tag3=1, MDI=1
+
+// PATTERN_6 (x8 mode)
+    // MDI= (1,1), tag(0,1,2,3) = (0,1,0,1)
+  {0x30,   // 1st 64B of cachline: tag0=0, tag1=1, MDI=1
+   0x30,   // 1st 64B of cachline: tag2=0, tag3=1, MDI=1
+    // MDI= (0,0), tag(0,1,2,3) = (1,0,1,0)
+   0xC0,   // 2nd 64B of cachline: tag0=1, tag1=0, MDI=0
+   0xC0},  // 2nd 64B of cachline: tag2=1, tag3=0, MDI=0
+
+// PATTERN_7 (x8 mode)
+    // MDI= (0,0), tag(0,1,2,3) = (1,0,1,0)
+  {0xC0,   // 1st 64B of cachline: tag0=1, tag1=0, MDI=0
    0xC0,   // 1st 64B of cachline: tag2=1, tag3=0, MDI=0
-   0x60,   // 2nd 64B of cachline: tag0=1, tag1=1, MDI=0
-   0x50},  // 2nd 64B of cachline: tag2=1, tag3=0, MDI=1
+    // MDI= (1,1), tag(0,1,2,3) = (0,1,0,1)
+   0x30,   // 2nd 64B of cachline: tag0=0, tag1=1, MDI=1
+   0x30},  // 2nd 64B of cachline: tag2=0, tag3=1, MDI=1
 
-// PATTERN_7 - verified
+// PATTERN_8: random seed  (x8 mode)
   {0x20,   // 1st 64B of cachline: tag0=0, tag1=1, MDI=0
-   0x70,   // 1st 64B of cachline: tag2=1, tag3=1, MDI=1
+   0x60,   // 1st 64B of cachline: tag2=1, tag3=1, MDI=0
    0x30,   // 2nd 64B of cachline: tag0=0, tag1=1, MDI=1
-   0xE0},  // 2nd 64B of cachline: tag2=1, tag3=1, MDI=0
+   0x70}}, // 2nd 64B of cachline: tag2=1, tag3=1, MDI=1
 
-// PATTERN_8: random seed
+
+
+
+// bit1=tag0_2, bit2=tag1_3, bit3=MDI
+
+// PATTERN_0 (x4 mode)
+
+    // MDI= (0,0), tag(0,1,2,3) = (0,0,0,0)
+ {{0x00,   // 1st 64B of cachline: tag0=0, tag1=0, MDI=0
+   0x00,   // 1st 64B of cachline: tag2=0, tag3=0, MDI=0
+    // MDI= (0,0), tag(0,1,2,3) = (0,0,0,0)
+   0x00,   // 2nd 64B of cachline: tag0=0, tag1=0, MDI=0
+   0x00},  // 2nd 64B of cachline: tag2=0, tag3=0, MDI=0
+
+// PATTERN_1 (x4 mode)
+
+    // MDI= (1,1), tag(0,1,2,3) = (1,1,1,1)
+  {0xF0,   // 1st 64B of cachline: tag0=1, tag1=1, MDI=1
+   0xF0,   // 1st 64B of cachline: tag2=1, tag3=1, MDI=1
+    // MDI= (1,1), tag(0,1,2,3) = (1,1,1,1)
+   0xF0,   // 2nd 64B of cachline: tag0=1, tag1=1, MDI=1
+   0xF0},  // 2nd 64B of cachline: tag2=1, tag3=1, MDI=1
+
+// PATTERN_2 (x4 mode)
+
+    // MDI= (1,1), tag(0,1,2,3) = (1,1,1,1)
+  {0xF0,   // 1st 64B of cachline: tag0=1, tag1=1, MDI=1
+   0xF0,   // 1st 64B of cachline: tag2=1, tag3=1, MDI=1
+    // MDI= (1,1), tag(0,1,2,3) = (1,1,1,1)
+   0xF0,   // 2nd 64B of cachline: tag0=1, tag1=1, MDI=1
+   0xF0},  // 2nd 64B of cachline: tag2=1, tag3=1, MDI=1
+
+// PATTERN_3 (x4 mode)
+    // MDI= (0,0), tag(0,1,2,3) = (1,1,1,1)
+  {0x60,   // 1st 64B of cachline: tag0=1, tag1=1, MDI=0
+   0x60,   // 1st 64B of cachline: tag2=1, tag3=1, MDI=0
+    // MDI= (1,1), tag(0,1,2,3) = (0,0,0,0)
+   0x90,   // 2nd 64B of cachline: tag0=0, tag1=0, MDI=1
+   0x90},  // 2nd 64B of cachline: tag2=0, tag3=0, MDI=1
+
+// PATTERN_4 (x4 mode)
+    // MDI= (0,0), tag(0,1,2,3) = (0,0,0,0)
+  {0x00,   // 1st 64B of cachline: tag0=0, tag1=0, MDI=0
+   0x00,   // 1st 64B of cachline: tag2=0, tag3=0, MDI=0
+    // MDI= (1,0), tag(0,1,2,3) = (1,1,1,0)
+   0xF0,   // 2nd 64B of cachline: tag0=1, tag1=1, MDI=1
+   0xC0},  // 2nd 64B of cachline: tag2=1, tag3=0, MDI=0
+
+// PATTERN_5 (x4 mode)
+    // MDI= (1,1), tag(0,1,2,3) = (1,1,1,1)
+  {0xF0,   // 1st 64B of cachline: tag0=1, tag1=1, MDI=1
+   0xF0,   // 1st 64B of cachline: tag2=1, tag3=1, MDI=1
+    // MDI= (0,1), tag(0,1,2,3) = (0,0,0,1)
+   0x80,   // 2nd 64B of cachline: tag0=0, tag1=0, MDI=0
+   0x10},  // 2nd 64B of cachline: tag2=0, tag3=1, MDI=1
+
+// PATTERN_6 (x4 mode)
+    // MDI= (1,1), tag(0,1,2,3) = (0,1,0,1)
+  {0x30,   // 1st 64B of cachline: tag0=0, tag1=1, MDI=1
+   0x30,   // 1st 64B of cachline: tag2=0, tag3=1, MDI=1
+    // MDI= (0,0), tag(0,1,2,3) = (1,0,1,0)
+   0xC0,   // 2nd 64B of cachline: tag0=1, tag1=0, MDI=0
+   0xC0},  // 2nd 64B of cachline: tag2=1, tag3=0, MDI=0
+
+// PATTERN_7 (x4 mode)
+    // MDI= (0,0), tag(0,1,2,3) = (1,0,1,0)
+  {0xC0,   // 1st 64B of cachline: tag0=1, tag1=0, MDI=0
+   0xC0,   // 1st 64B of cachline: tag2=1, tag3=0, MDI=0
+    // MDI= (1,1), tag(0,1,2,3) = (0,1,0,1)
+   0x30,   // 2nd 64B of cachline: tag0=0, tag1=1, MDI=1
+   0x30},  // 2nd 64B of cachline: tag2=0, tag3=1, MDI=1
+
+// PATTERN_8: random seed  (x8 mode)
   {0x20,   // 1st 64B of cachline: tag0=0, tag1=1, MDI=0
    0x60,   // 1st 64B of cachline: tag2=1, tag3=1, MDI=0
    0x30,   // 2nd 64B of cachline: tag0=0, tag1=1, MDI=1
-   0x70}}; // 2nd 64B of cachline: tag2=1, tag3=1, MDI=1
+   0x70}}};// 2nd 64B of cachline: tag2=1, tag3=1, MDI=1
 
-// TODO: Update with actual patterns from Luis Lastras when they are ready
-static const uint32_t mss_ECC[MSS_MAX_PATTERNS][4]={
+
+
+static const uint32_t mss_ECC[2][MSS_MAX_PATTERNS][4]={
 
 // bit 4:15 ECC_c6_c5_c4, bit 16:31 ECC_c3_c2_c1_c0
 
-// PATTERN_0 - verified
-  {0x00000000,   // 1st 64B of cachline
+// PATTERN_0 (x8 mode)
+ {{0x00000000,   // 1st 64B of cachline
    0x00000000,   // 1st 64B of cachline
    0x00000000,   // 2nd 64B of cachline
    0x00000000},  // 2nd 64B of cachline
 
-// PATTERN_1 - verified
+// PATTERN_1 (x8 mode)
   {0x0DA49500,   // 1st 64B of cachline
    0x0234A60E,   // 1st 64B of cachline
    0x0DA49500,   // 2nd 64B of cachline
    0x0234A60E},  // 2nd 64B of cachline
 
-// PATTERN_2 - verified
-  {0x08A0AB54,   // 1st 64B of cachline
-   0x05CD9A13,   // 1st 64B of cachline
-   0x08A0AB54,   // 2nd 64B of cachline
-   0x05CD9A13},  // 2nd 64B of cachline
-
-// PATTERN_3 - verified
-  {0x05043E54,   // 1st 64B of cachline
-   0x07F93C1D,   // 1st 64B of cachline
-   0x05043E54,   // 2nd 64B of cachline
-   0x07F93C1D},  // 2nd 64B of cachline
-
-// PATTERN_4 - verified
-  {0x021C0F3D,   // 1st 64B of cachline
-   0x04332068,   // 1st 64B of cachline
-   0x0C33F1DA,   // 2nd 64B of cachline
-   0x0FF3F7AF},  // 2nd 64B of cachline
-
-// PATTERN_5 - verified
-  {0x04CA8334,   // 1st 64B of cachline
-   0x04F3D0DA,   // 1st 64B of cachline
-   0x019764DA,   // 2nd 64B of cachline
-   0x0DC751A1},  // 2nd 64B of cachline
-
-// PATTERN_6 - verified
-  {0x0CF6B55C,   // 1st 64B of cachline
-   0x08CCE671,   // 1st 64B of cachline
-   0x02D94BBB,   // 2nd 64B of cachline
-   0x030C31B6},  // 2nd 64B of cachline
-
-// PATTERN_7 - verified
-  {0x09150CD1,   // 1st 64B of cachline
-   0x0F9D48C9,   // 1st 64B of cachline
-   0x073AF236,   // 2nd 64B of cachline
-   0x045D9F0E},  // 2nd 64B of cachline
+// PATTERN_2 (x8 mode)
+  {0x0FFFFFFF,   // 1st 64B of cachline
+   0x0FFFFFFF,   // 1st 64B of cachline
+   0x0FFFFFFF,   // 2nd 64B of cachline
+   0x0FFFFFFF},  // 2nd 64B of cachline
+
+// PATTERN_3 (x8 mode)
+  {0x056A55AA,   // 1st 64B of cachline
+   0x056A55AA,   // 1st 64B of cachline
+   0x0A95AA55,   // 2nd 64B of cachline
+   0x0A95AA55},  // 2nd 64B of cachline
+
+// PATTERN_4 (x8 mode)
+  {0x00000000,   // 1st 64B of cachline
+   0x00000000,   // 1st 64B of cachline
+   0x0FFFFFFF,   // 2nd 64B of cachline
+   0x0FC0FF00},  // 2nd 64B of cachline
+
+// PATTERN_5 (x8 mode)
+  {0x0FFFFFFF,   // 1st 64B of cachline
+   0x0FFFFFFF,   // 1st 64B of cachline
+   0x0ED81C6A,   // 2nd 64B of cachline
+   0x0D970552},  // 2nd 64B of cachline
+
+// PATTERN_6 (x8 mode)
+  {0x003F00FF,   // 1st 64B of cachline
+   0x003F00FF,   // 1st 64B of cachline
+   0x0FC0FF00,   // 2nd 64B of cachline
+   0x0FC0FF00},  // 2nd 64B of cachline
+
+// PATTERN_7 (x8 mode)
+  {0x0FC0FF00,   // 1st 64B of cachline
+   0x0FC0FF00,   // 1st 64B of cachline
+   0x003F00FF,   // 2nd 64B of cachline
+   0x003F00FF},  // 2nd 64B of cachline
 
 // PATTERN_8: random
   {0x00000000,   // 1st 64B of cachline
    0x00000000,   // 1st 64B of cachline
    0x00000000,   // 2nd 64B of cachline
-   0x00000000}}; // 2nd 64B of cachline
+   0x00000000}}, // 2nd 64B of cachline
+
+// bit 4:15 ECC_c6_c5_c4, bit 16:31 ECC_c3_c2_c1_c0
+
+// PATTERN_0 (x4 mode)
+ {{0x00000000,   // 1st 64B of cachline
+   0x00000000,   // 1st 64B of cachline
+   0x00000000,   // 2nd 64B of cachline
+   0x00000000},  // 2nd 64B of cachline
+
+// PATTERN_1 (x4 mode)
+  {0x09978000,   // 1st 64B of cachline
+   0x03DBC0C0,   // 1st 64B of cachline
+   0x09978000,   // 2nd 64B of cachline
+   0x03DBC0C0},  // 2nd 64B of cachline
+
+// PATTERN_2 (x4 mode)
+  {0x0FFFF0F0,   // 1st 64B of cachline
+   0x0FFFF0F0,   // 1st 64B of cachline
+   0x0FFFF0F0,   // 2nd 64B of cachline
+   0x0FFFF0F0},  // 2nd 64B of cachline
+
+// PATTERN_3 (x4 mode)
+  {0x056A50A0,   // 1st 64B of cachline
+   0x056A50A0,   // 1st 64B of cachline
+   0x0A95A050,   // 2nd 64B of cachline
+   0x0A95A050},  // 2nd 64B of cachline
+
+// PATTERN_4 (x4 mode)
+  {0x00000000,   // 1st 64B of cachline
+   0x00000000,   // 1st 64B of cachline
+   0x0FFFF0F0,   // 2nd 64B of cachline
+   0x0FC0F000},  // 2nd 64B of cachline
+
+// PATTERN_5 (x4 mode)
+  {0x0FFFF0F0,   // 1st 64B of cachline
+   0x0FFFF0F0,   // 1st 64B of cachline
+   0x07BB8020,   // 2nd 64B of cachline
+   0x07A4A0D0},  // 2nd 64B of cachline
+
+// PATTERN_6 (x4 mode)
+  {0x003F00F0,   // 1st 64B of cachline
+   0x003F00F0,   // 1st 64B of cachline
+   0x0FC0F000,   // 2nd 64B of cachline
+   0x0FC0F000},  // 2nd 64B of cachline
+
+// PATTERN_7 (x4 mode)
+  {0x0FC0F000,   // 1st 64B of cachline
+   0x0FC0F000,   // 1st 64B of cachline
+   0x003F00F0,   // 2nd 64B of cachline
+   0x003F00F0},  // 2nd 64B of cachline
+
+// PATTERN_8: random
+  {0x00000000,   // 1st 64B of cachline
+   0x00000000,   // 1st 64B of cachline
+   0x00000000,   // 2nd 64B of cachline
+   0x00000000}}};// 2nd 64B of cachline
+
+
+
+
 
 //------------------------------------------------------------------------------
-// Function Porottypes - These are not externally called, so per RAS review, they
+// Function Prototypes - These are not externally called, so per RAS review, they
 // go in here
 //------------------------------------------------------------------------------
     void mss_get_dummy_mark_store( const fapi::Target & i_target,
@@ -1042,7 +1627,7 @@ fapi::ReturnCode mss_MaintCmd::stopCmd()
 
         FAPI_ERR("MBMSRQ[0]: Can't start new cmd if previous cmd still in progress on %s.",iv_target.toEcmdString());
 
-// TODO: Calling out FW high
+// Calling out FW high
 // Calling out MBA target low, deconfig, gard
         const fapi::Target & MBA = iv_target;
 // FFDC: Capture register we are checking
@@ -1064,7 +1649,7 @@ fapi::ReturnCode mss_MaintCmd::stopCmd()
 
         FAPI_ERR("MBAXCRn[0:3] = 0, meaning no memory configured behind this MBA on %s.",iv_target.toEcmdString());
 
-// TODO: Calling out FW high
+// Calling out FW high
 // FFDC: MBA target
         const fapi::Target & MBA = iv_target;
 // FFDC: Capture register we are checking
@@ -1082,7 +1667,7 @@ fapi::ReturnCode mss_MaintCmd::stopCmd()
 
         FAPI_ERR("CCS_MODEQ[29] = 1, meaning mux set for CCS instead of mainline on %s.",iv_target.toEcmdString());
 
-// TODO: Calling out FW high
+// Calling out FW high
 // FFDC: MBA target
         const fapi::Target & MBA = iv_target;
 // FFDC: Capture register we are checking
@@ -1102,7 +1687,7 @@ fapi::ReturnCode mss_MaintCmd::stopCmd()
 
         FAPI_ERR("MBSECC[0] = 1, meaning ECC check/correct disabled on %s.",iv_target.toEcmdString());
 
-// TODO: Calling out FW high
+// Calling out FW high
 // FFDC: MBA target
         const fapi::Target & MBA = iv_target;
 // FFDC: Capture register we are checking
@@ -1409,7 +1994,7 @@ fapi::ReturnCode mss_MaintCmd::stopCmd()
 
         FAPI_ERR("MBAFIRQ[0], invalid_maint_cmd on %s.",iv_target.toEcmdString());
 
-// TODO: Calling out FW high
+// Calling out FW high
 // FFDC: MBA target
         const fapi::Target & MBA = iv_target;
 // FFDC: Capture register we are checking
@@ -1431,7 +2016,7 @@ fapi::ReturnCode mss_MaintCmd::stopCmd()
 
         FAPI_ERR("MBAFIRQ[1], cmd started with invalid_maint_address on %s.",iv_target.toEcmdString());
 
-// TODO: Calling out FW high
+// Calling out FW high
 // FFDC: MBA target
         const fapi::Target & MBA = iv_target;
 // FFDC: Capture register we are checking
@@ -1500,7 +2085,7 @@ fapi::ReturnCode mss_MaintCmd::stopCmd()
       {
         FAPI_ERR("Maint cmd timeout on %s.",iv_target.toEcmdString());
 
-// TODO: Calling out FW high
+// Calling out FW high
 // Calling out MBA target low, deconfig, gard
         const fapi::Target & MBA = iv_target;
 // FFDC: Capture command type we are trying to run
@@ -1643,183 +2228,205 @@ fapi::ReturnCode mss_MaintCmd::stopCmd()
 
       FAPI_INF("ENTER mss_MaintCmd::loadPattern()");
 
-static const uint32_t maintBufferDataRegs[2][16][2]={
-// port0
-        {{MAINT0_MBS_MAINT_BUFF0_DATA0_0x0201160A, MAINT0_MBS_MAINT_BUFF0_DATA_ECC0_0x02011612},
-        {MAINT0_MBS_MAINT_BUFF2_DATA0_0x0201162A, MAINT0_MBS_MAINT_BUFF2_DATA_ECC0_0x02011632},
-        {MAINT0_MBS_MAINT_BUFF0_DATA1_0x0201160B, MAINT0_MBS_MAINT_BUFF0_DATA_ECC1_0x02011613},
-        {MAINT0_MBS_MAINT_BUFF2_DATA1_0x0201162B, MAINT0_MBS_MAINT_BUFF2_DATA_ECC1_0x02011633},
-        {MAINT0_MBS_MAINT_BUFF0_DATA2_0x0201160C, MAINT0_MBS_MAINT_BUFF0_DATA_ECC2_0x02011614},
-        {MAINT0_MBS_MAINT_BUFF2_DATA2_0x0201162C, MAINT0_MBS_MAINT_BUFF2_DATA_ECC2_0x02011634},
-        {MAINT0_MBS_MAINT_BUFF0_DATA3_0x0201160D, MAINT0_MBS_MAINT_BUFF0_DATA_ECC3_0x02011615},
-        {MAINT0_MBS_MAINT_BUFF2_DATA3_0x0201162D, MAINT0_MBS_MAINT_BUFF2_DATA_ECC3_0x02011635},
-
-// port1
-        {MAINT0_MBS_MAINT_BUFF1_DATA0_0x0201161A, MAINT0_MBS_MAINT_BUFF1_DATA_ECC0_0x02011622},
-        {MAINT0_MBS_MAINT_BUFF3_DATA0_0x0201163A, MAINT0_MBS_MAINT_BUFF3_DATA_ECC0_0x02011642},
-        {MAINT0_MBS_MAINT_BUFF1_DATA1_0x0201161B, MAINT0_MBS_MAINT_BUFF1_DATA_ECC1_0x02011623},
-        {MAINT0_MBS_MAINT_BUFF3_DATA1_0x0201163B, MAINT0_MBS_MAINT_BUFF3_DATA_ECC1_0x02011643},
-        {MAINT0_MBS_MAINT_BUFF1_DATA2_0x0201161C, MAINT0_MBS_MAINT_BUFF1_DATA_ECC2_0x02011624},
-        {MAINT0_MBS_MAINT_BUFF3_DATA2_0x0201163C, MAINT0_MBS_MAINT_BUFF3_DATA_ECC2_0x02011644},
-        {MAINT0_MBS_MAINT_BUFF1_DATA3_0x0201161D, MAINT0_MBS_MAINT_BUFF1_DATA_ECC3_0x02011625},
-        {MAINT0_MBS_MAINT_BUFF3_DATA3_0x0201163D, MAINT0_MBS_MAINT_BUFF3_DATA_ECC3_0x02011645}},
-
-// port2
-        {{MAINT1_MBS_MAINT_BUFF0_DATA0_0x0201170A, MAINT1_MBS_MAINT_BUFF0_DATA_ECC0_0x02011712},
-        {MAINT1_MBS_MAINT_BUFF2_DATA0_0x0201172A, MAINT1_MBS_MAINT_BUFF2_DATA_ECC0_0x02011732},
-        {MAINT1_MBS_MAINT_BUFF0_DATA1_0x0201170B, MAINT1_MBS_MAINT_BUFF0_DATA_ECC1_0x02011713},
-        {MAINT1_MBS_MAINT_BUFF2_DATA1_0x0201172B, MAINT1_MBS_MAINT_BUFF2_DATA_ECC1_0x02011733},
-        {MAINT1_MBS_MAINT_BUFF0_DATA2_0x0201170C, MAINT1_MBS_MAINT_BUFF0_DATA_ECC2_0x02011714},
-        {MAINT1_MBS_MAINT_BUFF2_DATA2_0x0201172C, MAINT1_MBS_MAINT_BUFF2_DATA_ECC2_0x02011734},
-        {MAINT1_MBS_MAINT_BUFF0_DATA3_0x0201170D, MAINT1_MBS_MAINT_BUFF0_DATA_ECC3_0x02011715},
-        {MAINT1_MBS_MAINT_BUFF2_DATA3_0x0201172D, MAINT1_MBS_MAINT_BUFF2_DATA_ECC3_0x02011735},
-
-// port3
-        {MAINT1_MBS_MAINT_BUFF1_DATA0_0x0201171A, MAINT1_MBS_MAINT_BUFF1_DATA_ECC0_0x02011722},
-        {MAINT1_MBS_MAINT_BUFF3_DATA0_0x0201173A, MAINT1_MBS_MAINT_BUFF3_DATA_ECC0_0x02011742},
-        {MAINT1_MBS_MAINT_BUFF1_DATA1_0x0201171B, MAINT1_MBS_MAINT_BUFF1_DATA_ECC1_0x02011723},
-        {MAINT1_MBS_MAINT_BUFF3_DATA1_0x0201173B, MAINT1_MBS_MAINT_BUFF3_DATA_ECC1_0x02011743},
-        {MAINT1_MBS_MAINT_BUFF1_DATA2_0x0201171C, MAINT1_MBS_MAINT_BUFF1_DATA_ECC2_0x02011724},
-        {MAINT1_MBS_MAINT_BUFF3_DATA2_0x0201173C, MAINT1_MBS_MAINT_BUFF3_DATA_ECC2_0x02011744},
-        {MAINT1_MBS_MAINT_BUFF1_DATA3_0x0201171D, MAINT1_MBS_MAINT_BUFF1_DATA_ECC3_0x02011725},
-        {MAINT1_MBS_MAINT_BUFF3_DATA3_0x0201173D, MAINT1_MBS_MAINT_BUFF3_DATA_ECC3_0x02011745}}};
-
-
-static const uint32_t maintBuffer65thRegs[4][2]={
-          {MAINT0_MBS_MAINT_BUFF_65TH_BYTE_64B_ECC0_0x0201164A,    MAINT1_MBS_MAINT_BUFF_65TH_BYTE_64B_ECC0_0x0201174A},
-          {MAINT0_MBS_MAINT_BUFF_65TH_BYTE_64B_ECC1_0x0201164B,    MAINT1_MBS_MAINT_BUFF_65TH_BYTE_64B_ECC1_0x0201174B},
-          {MAINT0_MBS_MAINT_BUFF_65TH_BYTE_64B_ECC2_0x0201164C,    MAINT1_MBS_MAINT_BUFF_65TH_BYTE_64B_ECC2_0x0201174C},
-          {MAINT0_MBS_MAINT_BUFF_65TH_BYTE_64B_ECC3_0x0201164D,    MAINT1_MBS_MAINT_BUFF_65TH_BYTE_64B_ECC3_0x0201174D}};
-
-
-          fapi::ReturnCode l_rc;
-          uint32_t l_ecmd_rc = 0;
-          ecmdDataBufferBase l_data(64);
-          ecmdDataBufferBase l_ecc(64);
-          ecmdDataBufferBase l_65th(64);
-          ecmdDataBufferBase l_mbmmr(64);
-          ecmdDataBufferBase l_mbsecc(64);
-          uint32_t loop = 0;
+        static const uint32_t maintBufferDataRegs[2][16][2]={
+        // port0
+        {{MAINT0_MBS_MAINT_BUFF0_DATA0_0x0201160A, MAINT0_MBS_MAINT_BUFF0_DATA_ECC0_0x02011612},// DW0
+        {MAINT0_MBS_MAINT_BUFF2_DATA0_0x0201162A, MAINT0_MBS_MAINT_BUFF2_DATA_ECC0_0x02011632}, // DW2
+        {MAINT0_MBS_MAINT_BUFF0_DATA1_0x0201160B, MAINT0_MBS_MAINT_BUFF0_DATA_ECC1_0x02011613}, // DW4
+        {MAINT0_MBS_MAINT_BUFF2_DATA1_0x0201162B, MAINT0_MBS_MAINT_BUFF2_DATA_ECC1_0x02011633}, // DW6
+        {MAINT0_MBS_MAINT_BUFF0_DATA2_0x0201160C, MAINT0_MBS_MAINT_BUFF0_DATA_ECC2_0x02011614}, // DW8
+        {MAINT0_MBS_MAINT_BUFF2_DATA2_0x0201162C, MAINT0_MBS_MAINT_BUFF2_DATA_ECC2_0x02011634}, // DW10
+        {MAINT0_MBS_MAINT_BUFF0_DATA3_0x0201160D, MAINT0_MBS_MAINT_BUFF0_DATA_ECC3_0x02011615}, // DW12
+        {MAINT0_MBS_MAINT_BUFF2_DATA3_0x0201162D, MAINT0_MBS_MAINT_BUFF2_DATA_ECC3_0x02011635}, // DW14
+
+        // port1
+        {MAINT0_MBS_MAINT_BUFF1_DATA0_0x0201161A, MAINT0_MBS_MAINT_BUFF1_DATA_ECC0_0x02011622}, // DW1
+        {MAINT0_MBS_MAINT_BUFF3_DATA0_0x0201163A, MAINT0_MBS_MAINT_BUFF3_DATA_ECC0_0x02011642}, // DW3
+        {MAINT0_MBS_MAINT_BUFF1_DATA1_0x0201161B, MAINT0_MBS_MAINT_BUFF1_DATA_ECC1_0x02011623}, // DW5
+        {MAINT0_MBS_MAINT_BUFF3_DATA1_0x0201163B, MAINT0_MBS_MAINT_BUFF3_DATA_ECC1_0x02011643}, // DW7
+        {MAINT0_MBS_MAINT_BUFF1_DATA2_0x0201161C, MAINT0_MBS_MAINT_BUFF1_DATA_ECC2_0x02011624}, // DW9
+        {MAINT0_MBS_MAINT_BUFF3_DATA2_0x0201163C, MAINT0_MBS_MAINT_BUFF3_DATA_ECC2_0x02011644}, // DW11
+        {MAINT0_MBS_MAINT_BUFF1_DATA3_0x0201161D, MAINT0_MBS_MAINT_BUFF1_DATA_ECC3_0x02011625}, // DW13
+        {MAINT0_MBS_MAINT_BUFF3_DATA3_0x0201163D, MAINT0_MBS_MAINT_BUFF3_DATA_ECC3_0x02011645}},// DW15
+
+        // port2
+        {{MAINT1_MBS_MAINT_BUFF0_DATA0_0x0201170A, MAINT1_MBS_MAINT_BUFF0_DATA_ECC0_0x02011712},// DW0
+        {MAINT1_MBS_MAINT_BUFF2_DATA0_0x0201172A, MAINT1_MBS_MAINT_BUFF2_DATA_ECC0_0x02011732}, // DW2
+        {MAINT1_MBS_MAINT_BUFF0_DATA1_0x0201170B, MAINT1_MBS_MAINT_BUFF0_DATA_ECC1_0x02011713}, // DW4
+        {MAINT1_MBS_MAINT_BUFF2_DATA1_0x0201172B, MAINT1_MBS_MAINT_BUFF2_DATA_ECC1_0x02011733}, // DW6
+        {MAINT1_MBS_MAINT_BUFF0_DATA2_0x0201170C, MAINT1_MBS_MAINT_BUFF0_DATA_ECC2_0x02011714}, // DW8
+        {MAINT1_MBS_MAINT_BUFF2_DATA2_0x0201172C, MAINT1_MBS_MAINT_BUFF2_DATA_ECC2_0x02011734}, // DW10
+        {MAINT1_MBS_MAINT_BUFF0_DATA3_0x0201170D, MAINT1_MBS_MAINT_BUFF0_DATA_ECC3_0x02011715}, // DW12
+        {MAINT1_MBS_MAINT_BUFF2_DATA3_0x0201172D, MAINT1_MBS_MAINT_BUFF2_DATA_ECC3_0x02011735}, // DW14
+
+        // port3
+        {MAINT1_MBS_MAINT_BUFF1_DATA0_0x0201171A, MAINT1_MBS_MAINT_BUFF1_DATA_ECC0_0x02011722}, // DW1
+        {MAINT1_MBS_MAINT_BUFF3_DATA0_0x0201173A, MAINT1_MBS_MAINT_BUFF3_DATA_ECC0_0x02011742}, // DW3
+        {MAINT1_MBS_MAINT_BUFF1_DATA1_0x0201171B, MAINT1_MBS_MAINT_BUFF1_DATA_ECC1_0x02011723}, // DW5
+        {MAINT1_MBS_MAINT_BUFF3_DATA1_0x0201173B, MAINT1_MBS_MAINT_BUFF3_DATA_ECC1_0x02011743}, // DW6
+        {MAINT1_MBS_MAINT_BUFF1_DATA2_0x0201171C, MAINT1_MBS_MAINT_BUFF1_DATA_ECC2_0x02011724}, // DW9
+        {MAINT1_MBS_MAINT_BUFF3_DATA2_0x0201173C, MAINT1_MBS_MAINT_BUFF3_DATA_ECC2_0x02011744}, // DW11
+        {MAINT1_MBS_MAINT_BUFF1_DATA3_0x0201171D, MAINT1_MBS_MAINT_BUFF1_DATA_ECC3_0x02011725}, // DW13
+        {MAINT1_MBS_MAINT_BUFF3_DATA3_0x0201173D, MAINT1_MBS_MAINT_BUFF3_DATA_ECC3_0x02011745}}};// DW15
+
+
+        static const uint32_t maintBuffer65thRegs[4][2]={
+        // MBA01                                                 MBA23
+        {MAINT0_MBS_MAINT_BUFF_65TH_BYTE_64B_ECC0_0x0201164A,    MAINT1_MBS_MAINT_BUFF_65TH_BYTE_64B_ECC0_0x0201174A}, // 1st 64B of cacheline
+        {MAINT0_MBS_MAINT_BUFF_65TH_BYTE_64B_ECC1_0x0201164B,    MAINT1_MBS_MAINT_BUFF_65TH_BYTE_64B_ECC1_0x0201174B}, // 1st 64B of cacheline
+        {MAINT0_MBS_MAINT_BUFF_65TH_BYTE_64B_ECC2_0x0201164C,    MAINT1_MBS_MAINT_BUFF_65TH_BYTE_64B_ECC2_0x0201174C}, // 2nd 64B of cacheline
+        {MAINT0_MBS_MAINT_BUFF_65TH_BYTE_64B_ECC3_0x0201164D,    MAINT1_MBS_MAINT_BUFF_65TH_BYTE_64B_ECC3_0x0201174D}};// 2nd 64B of cacheline
+        
 
-          FAPI_INF("pattern = 0x%.8X 0x%.8X",
-                   mss_maintBufferData[i_initPattern][0][0],
-                   mss_maintBufferData[i_initPattern][0][1]);
+        fapi::ReturnCode l_rc;
+        uint32_t l_ecmd_rc = 0;
+        ecmdDataBufferBase l_data(64);
+        ecmdDataBufferBase l_ecc(64);
+        ecmdDataBufferBase l_65th(64);
+        ecmdDataBufferBase l_mbmmr(64);
+        ecmdDataBufferBase l_mbsecc(64);
+        uint32_t loop = 0;
+        uint8_t l_dramWidth = 0;
 
-//----------------------------------------------------
-// Load the data: 16 loops x 64bits = 128B cacheline
-//----------------------------------------------------
-          FAPI_INF("Load the data: 16 loops x 64bits = 128B cacheline");
+        FAPI_INF("pattern = 0x%.8X 0x%.8X",
+                   mss_maintBufferData[l_dramWidth][i_initPattern][0][0],
+                   mss_maintBufferData[l_dramWidth][i_initPattern][0][1]);
 
-// Set bit 9 so that hw will generate the fabric ECC.
-// This is an 8B ECC protecting the data moving on internal buses in
-// the Centaur.
-          l_ecmd_rc |= l_ecc.flushTo0();
-          l_ecmd_rc |= l_ecc.setBit(9);
-          if(l_ecmd_rc)
-          {
+        //----------------------------------------------------
+        // Get l_dramWidth
+        //----------------------------------------------------          
+        l_rc = FAPI_ATTR_GET(ATTR_EFF_DRAM_WIDTH, &iv_target, l_dramWidth);
+        if(l_rc)
+        {
+            FAPI_ERR("Error getting DRAM width on %s.",iv_target.toEcmdString());
+            return l_rc;
+        }
+        
+        // Convert from attribute enum values: 8,4 to index values: 0,1
+        if(l_dramWidth == mss_MemConfig::X8)
+        {
+            l_dramWidth = 0;
+        }
+        else
+        {
+            l_dramWidth = 1;
+        }
+            
+
+        //----------------------------------------------------
+        // Load the data: 16 loops x 64bits = 128B cacheline
+        //----------------------------------------------------
+        FAPI_INF("Load the data: 16 loops x 64bits = 128B cacheline");
+
+        // Set bit 9 so that hw will generate the fabric ECC.
+        // This is an 8B ECC protecting the data moving on internal buses in
+        // the Centaur.
+        l_ecmd_rc |= l_ecc.flushTo0();
+        l_ecmd_rc |= l_ecc.setBit(9);
+        if(l_ecmd_rc)
+        {
             l_rc.setEcmdError(l_ecmd_rc);
             return l_rc;
-          }
+        }
 
-          for(loop=0; loop<16; loop++ )
-          {
-// A write to MAINT_BUFFx_DATAy will not update until the corresponding
-// MAINT_BUFFx_DATA_ECCy is written to.
-            l_ecmd_rc |= l_data.insert(mss_maintBufferData[i_initPattern][loop][0], 0, 32, 0);
-            l_ecmd_rc |= l_data.insert(mss_maintBufferData[i_initPattern][loop][1], 32, 32, 0);
+        for(loop=0; loop<16; loop++ )
+        {
+            // A write to MAINT_BUFFx_DATAy will not update until the corresponding
+            // MAINT_BUFFx_DATA_ECCy is written to.
+            l_ecmd_rc |= l_data.insert(mss_maintBufferData[l_dramWidth][i_initPattern][loop][0], 0, 32, 0);
+            l_ecmd_rc |= l_data.insert(mss_maintBufferData[l_dramWidth][i_initPattern][loop][1], 32, 32, 0);
             if(l_ecmd_rc)
             {
-              l_rc.setEcmdError(l_ecmd_rc);
-              return l_rc;
+                l_rc.setEcmdError(l_ecmd_rc);
+                return l_rc;
             }
             l_rc = fapiPutScom(iv_targetCentaur, maintBufferDataRegs[iv_mbaPosition][loop][0], l_data);
             if(l_rc) return l_rc;
 
             l_rc = fapiPutScom(iv_targetCentaur, maintBufferDataRegs[iv_mbaPosition][loop][1], l_ecc);
             if(l_rc) return l_rc;
-          }
+        }
 
-//----------------------------------------------------
-// Load the 65th byte: 4 loops to fill in the two 65th bytes in cacheline
-//----------------------------------------------------
-          FAPI_INF("Load the 65th byte: 4 loops to fill in the two 65th bytes in the cacheline");
+        //----------------------------------------------------
+        // Load the 65th byte: 4 loops to fill in the two 65th bytes in cacheline
+        //----------------------------------------------------
+        FAPI_INF("Load the 65th byte: 4 loops to fill in the two 65th bytes in the cacheline");
 
-          l_ecmd_rc |= l_65th.flushTo0();
+        l_ecmd_rc |= l_65th.flushTo0();
 
-// Set bit 56 so that hw will generate the fabric ECC.
-// This is an 8B ECC protecting the data moving on internal buses in Centaur.
-          l_ecmd_rc |= l_65th.setBit(56);
-          if(l_ecmd_rc)
-          {
+        // Set bit 56 so that hw will generate the fabric ECC.
+        // This is an 8B ECC protecting the data moving on internal buses in Centaur.
+        l_ecmd_rc |= l_65th.setBit(56);
+        if(l_ecmd_rc)
+        {
             l_rc.setEcmdError(l_ecmd_rc);
             return l_rc;
-          }
+        }
 
-          for(loop=0; loop<4; loop++ )
-          {
-            l_ecmd_rc |= l_65th.insert(mss_65thByte[i_initPattern][loop], 1, 3, 1);
+        for(loop=0; loop<4; loop++ )
+        {
+            l_ecmd_rc |= l_65th.insert(mss_65thByte[l_dramWidth][i_initPattern][loop], 1, 3, 1);
             if(l_ecmd_rc)
             {
-              l_rc.setEcmdError(l_ecmd_rc);
-              return l_rc;
+                l_rc.setEcmdError(l_ecmd_rc);
+                return l_rc;
             }
 
             l_rc = fapiPutScom(iv_targetCentaur, maintBuffer65thRegs[loop][iv_mbaPosition], l_65th);
             if(l_rc) return l_rc;
-          }
+        }
 
-//----------------------------------------------------
-// Save i_initPattern in unused maint mark reg
-// so we know what pattern was used when we do
-// UE isolation
-//----------------------------------------------------
+        //----------------------------------------------------
+        // Save i_initPattern in unused maint mark reg
+        // so we know what pattern was used when we do
+        // UE isolation
+        //----------------------------------------------------
 
-// No plans to use maint mark, but make sure it's disabled to be safe
-          l_rc = fapiGetScom(iv_targetCentaur, mss_mbsecc[iv_mbaPosition], l_mbsecc);
-          if(l_rc) return l_rc;
-          l_ecmd_rc |= l_mbsecc.clearBit(4);
-          if(l_ecmd_rc)
-          {
+        // No plans to use maint mark, but make sure it's disabled to be safe
+        l_rc = fapiGetScom(iv_targetCentaur, mss_mbsecc[iv_mbaPosition], l_mbsecc);
+        if(l_rc) return l_rc;
+        l_ecmd_rc |= l_mbsecc.clearBit(4);
+        if(l_ecmd_rc)
+        {
             l_rc.setEcmdError(l_ecmd_rc);
             return l_rc;
-          }
+        }
 
-          uint8_t l_attr_centaur_ec_enable_rce_with_other_errors_hw246685;
-          l_rc = FAPI_ATTR_GET(ATTR_CENTAUR_EC_ENABLE_RCE_WITH_OTHER_ERRORS_HW246685, &iv_targetCentaur, l_attr_centaur_ec_enable_rce_with_other_errors_hw246685);
-          if(l_rc) return l_rc;
+        uint8_t l_attr_centaur_ec_enable_rce_with_other_errors_hw246685;
+        l_rc = FAPI_ATTR_GET(ATTR_CENTAUR_EC_ENABLE_RCE_WITH_OTHER_ERRORS_HW246685, &iv_targetCentaur, l_attr_centaur_ec_enable_rce_with_other_errors_hw246685);
+        if(l_rc) return l_rc;
 
-          if(l_attr_centaur_ec_enable_rce_with_other_errors_hw246685) {
+        if(l_attr_centaur_ec_enable_rce_with_other_errors_hw246685)
+        {
             l_ecmd_rc = l_ecmd_rc | l_mbsecc.setBit(16);
-          }
+        }
 
-          if(l_ecmd_rc)
-          {
+        if(l_ecmd_rc)
+        {
             l_rc.setEcmdError(l_ecmd_rc);
             return l_rc;
-          }
+        }
 
 
-          l_rc = fapiPutScom(iv_targetCentaur, mss_mbsecc[iv_mbaPosition], l_mbsecc);
-          if(l_rc) return l_rc;
+        l_rc = fapiPutScom(iv_targetCentaur, mss_mbsecc[iv_mbaPosition], l_mbsecc);
+        if(l_rc) return l_rc;
 
 
-          l_ecmd_rc |= l_mbmmr.flushTo0();
-// Store i_initPattern, with range 0-8, in MBMMR bits 4-7
-          l_ecmd_rc |= l_mbmmr.insert((uint8_t)i_initPattern, 4, 4, 8-4);
-          if(l_ecmd_rc)
-          {
+        l_ecmd_rc |= l_mbmmr.flushTo0();
+        // Store i_initPattern, with range 0-8, in MBMMR bits 4-7
+        l_ecmd_rc |= l_mbmmr.insert((uint8_t)i_initPattern, 4, 4, 8-4);
+        if(l_ecmd_rc)
+        {
             l_rc.setEcmdError(l_ecmd_rc);
             return l_rc;
-          }
-          l_rc = fapiPutScom(iv_targetCentaur, mss_mbmmr[iv_mbaPosition] , l_mbmmr);
-          if(l_rc) return l_rc;
-
-
+        }
+        l_rc = fapiPutScom(iv_targetCentaur, mss_mbmmr[iv_mbaPosition] , l_mbmmr);
+        if(l_rc) return l_rc;
 
 
-          FAPI_INF("EXIT mss_MaintCmd::loadPattern()");
+        FAPI_INF("EXIT mss_MaintCmd::loadPattern()");
 
-          return l_rc;
+        return l_rc;
     }
 
 //---------------------------------------------------------
@@ -1827,216 +2434,216 @@ static const uint32_t maintBuffer65thRegs[4][2]={
 //---------------------------------------------------------
     fapi::ReturnCode mss_MaintCmd::loadSpeed(TimeBaseSpeed i_speed)
     {
+    
+        FAPI_INF("ENTER mss_MaintCmd::loadSpeed()");
 
-      FAPI_INF("ENTER mss_MaintCmd::loadSpeed()");
-
-      fapi::ReturnCode l_rc;
-      uint32_t l_ecmd_rc = 0;
-      ecmdDataBufferBase l_data(64);
-      uint32_t l_ddr_freq = 0;
-      uint64_t l_step_size = 0;
-      uint64_t l_num_address_bits = 0;
-      uint64_t l_num_addresses = 0;
-      uint64_t l_address_bit = 0;
-      ecmdDataBufferBase l_start_address(64);
-      ecmdDataBufferBase l_end_address(64);
-      uint64_t l_cmd_interval = 0;
-
-// burst_window_sel
-// MBMCTQ[6]: 0 = 512 Maint Clks
-//            1 = 536870912 Maint Clks
-      uint8_t l_burst_window_sel = 0;
-
-// timebase_sel
-// MBMCTQ[9:10]: 00 = 1 Maint Clk
-//               01 = 8192 Maint clks
-      uint8_t l_timebase_sel = 0;
-
-// timebase_burst_sel
-// MBMCTQ[11]: 0 = disable burst mode
-//             1 = enable burst mode
-      uint8_t l_timebase_burst_sel = 0;
-
-// timebase_interval
-// MBMCTQ[12:23]: The operation interval for timebase operations
-//                equals the timebase_sel x MBMCTQ[12:23].
-// NOTE: Should never be 0, or will hang mainline traffic.
-      uint32_t l_timebase_interval = 1;
-
-// burst_window
-// MBMCTQ[24:31]: The burst window for timebase operations with burst mode
-//                enabled equals burst_window_sel x MBMCTQ[24:31]
-      uint8_t l_burst_window = 0;
-
-// burst_interval
-// MBMCTQ[32:39]: The burst interval for timebase operations with burst mode
-//                enabled equals the number of burst windows that will have
-//                no operations occurring in them.
-      uint8_t l_burst_interval = 0;
-
-      l_rc = fapiGetScom(iv_target, MBA01_MBMCTQ_0x0301060A, l_data);
-      if(l_rc) return l_rc;
-
+        fapi::ReturnCode l_rc;
+        uint32_t l_ecmd_rc = 0;
+        ecmdDataBufferBase l_data(64);
+        uint32_t l_ddr_freq = 0;
+        uint64_t l_step_size = 0;
+        uint64_t l_num_address_bits = 0;
+        uint64_t l_num_addresses = 0;
+        uint64_t l_address_bit = 0;
+        ecmdDataBufferBase l_start_address(64);
+        ecmdDataBufferBase l_end_address(64);
+        uint64_t l_cmd_interval = 0;
+
+        // burst_window_sel
+        // MBMCTQ[6]: 0 = 512 Maint Clks
+        //            1 = 536870912 Maint Clks
+        uint8_t l_burst_window_sel = 0;
+
+        // timebase_sel
+        // MBMCTQ[9:10]: 00 = 1 Maint Clk
+        //               01 = 8192 Maint clks
+        uint8_t l_timebase_sel = 0;
+
+        // timebase_burst_sel
+        // MBMCTQ[11]: 0 = disable burst mode
+        //             1 = enable burst mode
+        uint8_t l_timebase_burst_sel = 0;
+
+        // timebase_interval
+        // MBMCTQ[12:23]: The operation interval for timebase operations
+        //                equals the timebase_sel x MBMCTQ[12:23].
+        // NOTE: Should never be 0, or will hang mainline traffic.
+        uint32_t l_timebase_interval = 1;
+
+        // burst_window
+        // MBMCTQ[24:31]: The burst window for timebase operations with burst mode
+        //                enabled equals burst_window_sel x MBMCTQ[24:31]
+        uint8_t l_burst_window = 0;
+
+        // burst_interval
+        // MBMCTQ[32:39]: The burst interval for timebase operations with burst mode
+        //                enabled equals the number of burst windows that will have
+        //                no operations occurring in them.
+        uint8_t l_burst_interval = 0;
+
+        l_rc = fapiGetScom(iv_target, MBA01_MBMCTQ_0x0301060A, l_data);
+        if(l_rc) return l_rc;
 
 
-      if ( (FAST_MIN_BW_IMPACT == i_speed) ||
-           (FAST_MED_BW_IMPACT == i_speed) ||
-           (FAST_MAX_BW_IMPACT == i_speed) )           
-      {
-        l_burst_window_sel = 0;
-        l_timebase_sel = 0;
-        l_timebase_burst_sel = 0;
-        l_timebase_interval = 512;
-        l_burst_window = 0;
-        l_burst_interval = 0;
-      }
-
-      else // BG_SCRUB
-      {
-// Get l_ddr_freq from ATTR_MSS_FREQ
-// Possible frequencies are 800, 1066, 1333, 1600, 1866, and 2133 MHz
-// NOTE: Max 32 address bits using 800 and 1066 result in scrub
-// taking longer than 12h, but these is no plan to actually use
-// those frequencies.
-        l_rc = FAPI_ATTR_GET( ATTR_MSS_FREQ, &iv_targetCentaur, l_ddr_freq);
-        if (l_rc)
+        if (FAST_MAX_BW_IMPACT == i_speed)           
         {
-          FAPI_ERR("Failed to get attribute: ATTR_MSS_FREQ on %s.",iv_target.toEcmdString());
-          return l_rc;
+            l_timebase_sel = 0;
+            l_timebase_interval = 1;
+        }
+      
+        else if (FAST_MED_BW_IMPACT == i_speed)           
+        {
+            l_timebase_sel = 0;
+            l_timebase_interval = 512;
+        }
+      
+        else if (FAST_MIN_BW_IMPACT == i_speed)           
+        {
+            l_timebase_sel = 1;
+            l_timebase_interval = 12;
         }
 
-// Make sure it's non-zero, to avoid divide by 0
-        if (l_ddr_freq == 0)
+        else // BG_SCRUB
         {
-          FAPI_ERR("ATTR_MSS_FREQ set to zero so can't calculate scrub rate on %s.",iv_target.toEcmdString());
+            // Get l_ddr_freq from ATTR_MSS_FREQ
+            // Possible frequencies are 800, 1066, 1333, 1600, 1866, and 2133 MHz
+            // NOTE: Max 32 address bits using 800 and 1066 result in scrub
+            // taking longer than 12h, but these is no plan to actually use
+            // those frequencies.
+            l_rc = FAPI_ATTR_GET( ATTR_MSS_FREQ, &iv_targetCentaur, l_ddr_freq);
+            if (l_rc)
+            {
+                FAPI_ERR("Failed to get attribute: ATTR_MSS_FREQ on %s.",iv_target.toEcmdString());
+                return l_rc;
+            }
 
-// TODO: Calling out FW high
-// FFDC: MBA target
-          const fapi::Target & MBA = iv_target;
-// FFDC: Capture command type we are trying to run
-          const mss_MaintCmd::CmdType & CMD_TYPE = iv_cmdType;
+            // Make sure it's non-zero, to avoid divide by 0
+            if (l_ddr_freq == 0)
+            {
+                FAPI_ERR("ATTR_MSS_FREQ set to zero so can't calculate scrub rate on %s.",iv_target.toEcmdString());
 
-// Create new log
-          FAPI_SET_HWP_ERROR(l_rc, RC_MSS_MAINT_ZERO_DDR_FREQ);
-          return l_rc;
-        }
+                // Calling out FW high
+                // FFDC: MBA target
+                const fapi::Target & MBA = iv_target;
+                // FFDC: Capture command type we are trying to run
+                const mss_MaintCmd::CmdType & CMD_TYPE = iv_cmdType;
+
+                // Create new log
+                FAPI_SET_HWP_ERROR(l_rc, RC_MSS_MAINT_ZERO_DDR_FREQ);
+                return l_rc;
+            }
 
-// l_timebase_sel
-// MBMCTQ[9:10]: 00 = 1 * Maint Clk
-//               01 = 8192 * Maint Clk
-// Where Maint Clk = 2/1_ddr_freq
-        l_timebase_sel = 1;
+            // l_timebase_sel
+            // MBMCTQ[9:10]: 00 = 1 * Maint Clk
+            //               01 = 8192 * Maint Clk
+            // Where Maint Clk = 2/1_ddr_freq
+            l_timebase_sel = 1;
 
-// Get l_step_size in nSec
-        l_step_size = 8192*2*1000/l_ddr_freq;
+            // Get l_step_size in nSec
+            l_step_size = 8192*2*1000/l_ddr_freq;
 
-        FAPI_DBG("l_ddr_freq = %d MHz, l_step_size = %d nSec",
+            FAPI_DBG("l_ddr_freq = %d MHz, l_step_size = %d nSec",
                  (uint32_t)l_ddr_freq, (uint32_t)l_step_size);
 
-// Get l_end_address
-        l_rc = mss_get_address_range( iv_target,
+            // Get l_end_address
+            l_rc = mss_get_address_range( iv_target,
                                       MSS_ALL_RANKS,
                                       l_start_address,
                                       l_end_address );
-        if (l_rc)
-        {
-          FAPI_ERR("mss_get_address_range failed on %s.",iv_target.toEcmdString());
-          return l_rc;
-        }
+            if (l_rc)
+            {
+                FAPI_ERR("mss_get_address_range failed on %s.",iv_target.toEcmdString());
+                return l_rc;
+            }
 
-// Get l_num_address_bits by counting bits set to 1 in l_end_address.
-        for(l_address_bit=0; l_address_bit<37; l_address_bit++ )
-        {
-          if(l_end_address.isBitSet(l_address_bit))
-          {
-            l_num_address_bits++;
-          }
-        }
+            // Get l_num_address_bits by counting bits set to 1 in l_end_address.
+            for(l_address_bit=0; l_address_bit<37; l_address_bit++ )
+            {
+                if(l_end_address.isBitSet(l_address_bit))
+                {
+                    l_num_address_bits++;
+                }
+            }
 
-// NOTE: Assumption is max 32 address bits, which can be done
-// in 12h (+/- 2h). More than 32 address bits would
-// double scrub time for every extra address bit.
-        if (l_num_address_bits > 32)
-        {
-          FAPI_INF("WARNING: l_num_address_bits: %d, is greater than 32, so scrub will take longer than 12h.",(uint32_t)l_num_address_bits);
-        }
+            // NOTE: Assumption is max 32 address bits, which can be done
+            // in 12h (+/- 2h). More than 32 address bits would
+            // double scrub time for every extra address bit.
+            if (l_num_address_bits > 32)
+            {
+                FAPI_INF("WARNING: l_num_address_bits: %d, is greater than 32, so scrub will take longer than 12h.",(uint32_t)l_num_address_bits);
+            }
 
-// NOTE: Smallest number of address bits is supposed to be 25.
-// So if for some reason it's less (like in VBU),
-// use 25 anyway so the scrub rate calculation still works.
-        if (l_num_address_bits < 25)
-        {
-          FAPI_INF("WARNING: l_num_address_bits: %d, is less than 25, but using 25 in calculation anyway.",(uint32_t)l_num_address_bits);
-          l_num_address_bits = 25;
-        }
+            // NOTE: Smallest number of address bits is supposed to be 25.
+            // So if for some reason it's less (like in VBU),
+            // use 25 anyway so the scrub rate calculation still works.
+            if (l_num_address_bits < 25)
+            {
+                FAPI_INF("WARNING: l_num_address_bits: %d, is less than 25, but using 25 in calculation anyway.",(uint32_t)l_num_address_bits);
+                l_num_address_bits = 25;
+            }
 
- // Get l_num_addresses
-        l_num_addresses = 1;
-        for(uint32_t i=0; i<l_num_address_bits; i++ )
-        {
-          l_num_addresses *=2;
-        }
- // Convert to M addresses
-        l_num_addresses /=1000000;
+            // Get l_num_addresses
+            l_num_addresses = 1;
+            for(uint32_t i=0; i<l_num_address_bits; i++ )
+            {
+                l_num_addresses *=2;
+            }
+            // Convert to M addresses
+            l_num_addresses /=1000000;
 
- // Get interval between cmds in order to through l_num_addresses in 12h
-        l_cmd_interval = (12 * 60 * 60 * 1000)/l_num_addresses;
+            // Get interval between cmds in order to through l_num_addresses in 12h
+            l_cmd_interval = (12 * 60 * 60 * 1000)/l_num_addresses;
 
- // How many times to multiply l_step_size to get l_cmd_interval?
-        l_timebase_interval = l_cmd_interval/l_step_size;
+            // How many times to multiply l_step_size to get l_cmd_interval?
+            l_timebase_interval = l_cmd_interval/l_step_size;
 
- // Round up to nearest integer for more accurate number
-        l_timebase_interval += (l_cmd_interval % l_step_size >= l_step_size/2) ? 1:0;
+            // Round up to nearest integer for more accurate number
+            l_timebase_interval += (l_cmd_interval % l_step_size >= l_step_size/2) ? 1:0;
 
- // Make sure smallest is 1
-        if (l_timebase_interval == 0) l_timebase_interval = 1;
+            // Make sure smallest is 1
+            if (l_timebase_interval == 0) l_timebase_interval = 1;
 
-        FAPI_DBG("l_num_address_bits = %d, l_num_addresses = %d (M), l_cmd_interval = %d nSec, l_timebase_interval = %d",
+            FAPI_DBG("l_num_address_bits = %d, l_num_addresses = %d (M), l_cmd_interval = %d nSec, l_timebase_interval = %d",
                  (uint32_t)l_num_address_bits, (uint32_t)l_num_addresses, (uint32_t)l_cmd_interval, (uint32_t)l_timebase_interval);
 
- // Disable burst mode
-        l_timebase_burst_sel = 0;   // Disable burst mode
-        l_burst_window_sel = 0;     // Don't care since burst mode disabled
-        l_burst_window = 0;         // Don't care since burst mode disabled
-        l_burst_interval = 0;       // Don't care since burst mode disabled
-      }
+        } // End BG_SCRUB
 
-// burst_window_sel
-// MBMCTQ[6]
-      l_ecmd_rc |= l_data.insert( l_burst_window_sel, 6, 1, 8-1 );
+        // burst_window_sel
+        // MBMCTQ[6]
+        l_ecmd_rc |= l_data.insert( l_burst_window_sel, 6, 1, 8-1 );
 
-// timebase_sel
-// MBMCTQ[9:10]
-      l_ecmd_rc |= l_data.insert( l_timebase_sel, 9, 2, 8-2 );
+        // timebase_sel
+        // MBMCTQ[9:10]
+        l_ecmd_rc |= l_data.insert( l_timebase_sel, 9, 2, 8-2 );
 
-// timebase_burst_sel
-// MBMCTQ[11]
-      l_ecmd_rc |= l_data.insert( l_timebase_burst_sel, 11, 1, 8-1 );
+        // timebase_burst_sel
+        // MBMCTQ[11]
+        l_ecmd_rc |= l_data.insert( l_timebase_burst_sel, 11, 1, 8-1 );
 
-// timebase_interval
-// MBMCTQ[12:23]
-      l_ecmd_rc |= l_data.insert( l_timebase_interval, 12, 12, 32-12 );
+        // timebase_interval
+        // MBMCTQ[12:23]
+        l_ecmd_rc |= l_data.insert( l_timebase_interval, 12, 12, 32-12 );
 
-// burst_window
-// MBMCTQ[24:31]
-      l_ecmd_rc |= l_data.insert( l_burst_window, 24, 8, 8-8 );
+        // burst_window
+        // MBMCTQ[24:31]
+        l_ecmd_rc |= l_data.insert( l_burst_window, 24, 8, 8-8 );
 
-// burst_interval
-// MBMCTQ[32:39]
-      l_ecmd_rc |= l_data.insert( l_burst_interval, 32, 8, 8-8 );
+        // burst_interval
+        // MBMCTQ[32:39]
+        l_ecmd_rc |= l_data.insert( l_burst_interval, 32, 8, 8-8 );
 
-      if(l_ecmd_rc)
-      {
-        l_rc.setEcmdError(l_ecmd_rc);
-        return l_rc;
-      }
+        if(l_ecmd_rc)
+        {
+            l_rc.setEcmdError(l_ecmd_rc);
+            return l_rc;
+        }
 
-      l_rc = fapiPutScom(iv_target, MBA01_MBMCTQ_0x0301060A, l_data);
-      if(l_rc) return l_rc;
+        l_rc = fapiPutScom(iv_target, MBA01_MBMCTQ_0x0301060A, l_data);
+        if(l_rc) return l_rc;
 
-      FAPI_INF("EXIT mss_MaintCmd::loadSpeed()");
+        FAPI_INF("EXIT mss_MaintCmd::loadSpeed()");
 
-      return l_rc;
+        return l_rc;
     }
 
 
@@ -2129,6 +2736,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       if(iv_poll == false)
       {
         FAPI_INF("Cmd has started. Use attentions to detect cmd complete.");
+        FAPI_INF("EXIT mss_SuperFastInit::setupAndExecuteCmd()");
         return l_rc;
       }
 
@@ -2239,6 +2847,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       if(iv_poll == false)
       {
         FAPI_INF("Cmd has started. Use attentions to detect cmd complete.");
+        FAPI_INF("EXIT mss_SuperFastRandomInit::setupAndExecuteCmd()");
         return l_rc;
       }
 
@@ -2362,6 +2971,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       if(iv_poll == false)
       {
         FAPI_INF("Cmd has started. Use attentions to detect cmd complete.");
+        FAPI_INF("EXIT mss_SuperFastRead::setupAndExecuteCmd()");
         return l_rc;
       }
 
@@ -2627,6 +3237,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       if(iv_poll == false)
       {
         FAPI_INF("Cmd has started. Use attentions to detect cmd complete.");
+        FAPI_INF("EXIT Display::setupAndExecuteCmd()");
         return l_rc;
       }
 
@@ -2783,8 +3394,6 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       l_rc = fapiGetScom(iv_target, MBA01_MBMACAQ_0x0301060D, l_mbmacaq);
       if(l_rc) return l_rc;
 
-// Collect FFDC
-      l_rc = collectFFDC(); if(l_rc) return l_rc;
 
 // Clear bits 0 and 8 in MBSPA AND register
       l_ecmd_rc |= l_mbspa_and.flushTo1();
@@ -2884,6 +3493,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       if(iv_poll == false)
       {
         FAPI_INF("Cmd has started. Use attentions to detect cmd complete.");
+        FAPI_INF("EXIT mss_TimeBaseScrub::setupAndExecuteCmd()");
         return l_rc;
       }
 
@@ -2958,8 +3568,6 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       l_rc = loadEndAddress(); if(l_rc) return l_rc;
 
 // Load speed: MBMCTQ
-// TODO: May be able to go faster during IPL than runtime, since don't
-// have to worry about hanging fetch traffic during IPL.
       l_rc = loadSpeed(iv_speed); if(l_rc) return l_rc;
 
 // Load stop conditions: MBASCTLQ
@@ -2975,6 +3583,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       if(iv_poll == false)
       {
         FAPI_INF("Cmd has started. Use attentions to detect cmd complete.");
+        FAPI_INF("EXIT mss_TimeBaseSteerCleanup::setupAndExecuteCmd()");
         return l_rc;
       }
 
@@ -3028,7 +3637,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
         {{0x01,         0x41},         {0x03,        0x43},         {0x07,         0x47},       {0xff,         0xff}},  // TYPE_6
         {{0x11,         0x51},         {0x13,        0x53},         {0x17,         0x57},       {0xff,         0xff}},  // TYPE_7
         {{0x31,         0x71},         {0x33,        0x73},         {0x37,         0x77},       {0xff,         0xff}}}; // TYPE_8
-// TODO: Need to update when 5D config confirmed.
+
 
         fapi::ReturnCode l_rc;
         uint32_t l_ecmd_rc = 0;
@@ -3098,7 +3707,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
         {
           FAPI_ERR("MBAXCRn[0:3] = 0, meaning no memory configured behind this MBA on %s.",i_target.toEcmdString());
 
-// TODO: Calling out FW high
+// Calling out FW high
 // FFDC: MBA target
           const fapi::Target & MBA = i_target;
 // FFDC: Capture register we are checking
@@ -3236,7 +3845,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
                    l_dramSize, l_dramWidth, l_dram_gen, i_target.toEcmdString());
 
 
-// TODO: Calling out FW high
+// Calling out FW high
 // FFDC: MBA target
           const fapi::Target & MBA = i_target;
 // FFDC: Capture register we are checking
@@ -3284,7 +3893,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
         {
           FAPI_ERR("MBAXCRn configured with unsupported combination of l_configType, l_configSubType, l_slotConfig on %s.",i_target.toEcmdString());
 
-// TODO: Calling out FW high
+// Calling out FW high
 // FFDC: MBA target
           const fapi::Target & MBA = i_target;
 // FFDC: Capture register we are checking
@@ -3368,7 +3977,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
           if (i_rank>=8)
           {
             FAPI_ERR("i_rank input to mss_get_address_range out of range on %s.",i_target.toEcmdString());
-// TODO: Calling out FW high
+// Calling out FW high
 // FFDC: MBA target
             const fapi::Target & MBA = i_target;
 // FFDC: Capture i_rank;
@@ -3468,11 +4077,13 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       uint8_t l_symbolsPerChip = 4;
       fapi::Target l_targetCentaur;
       uint8_t l_mbaPosition = 0;
+      ecmdDataBufferBase l_mbscfg(64);
+      uint8_t l_dd2_enable_exit_point_1 = 0;
 
       o_symbolMark = MSS_INVALID_SYMBOL;
       o_chipMark = MSS_INVALID_SYMBOL;
 
-// Get Centaur target for the given MBA
+      // Get Centaur target for the given MBA
       l_rc = fapiGetParentChip(i_target, l_targetCentaur);
       if(l_rc)
       {
@@ -3481,7 +4092,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       }
 
 
-// Get MBA position: 0 = mba01, 1 = mba23
+      // Get MBA position: 0 = mba01, 1 = mba23
       l_rc = FAPI_ATTR_GET(ATTR_CHIP_UNIT_POS, &i_target, l_mbaPosition);
       if(l_rc)
       {
@@ -3489,7 +4100,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
         return l_rc;
       }
 
-// Get l_dramWidth
+      // Get l_dramWidth
       l_rc = FAPI_ATTR_GET(ATTR_EFF_DRAM_WIDTH, &i_target, l_dramWidth);
       if(l_rc)
       {
@@ -3497,27 +4108,27 @@ static const uint32_t maintBuffer65thRegs[4][2]={
         return l_rc;
       }
 
-// Check for i_rank out of range
+      // Check for i_rank out of range
       if (i_rank>=8)
       {
         FAPI_ERR("i_rank input to mss_get_mark_store out of range on %s.",i_target.toEcmdString());
-// TODO: Calling out FW high
-// FFDC: MBA target
+        // Calling out FW high
+        // FFDC: MBA target
         const fapi::Target & MBA = i_target;
-// FFDC: Capture i_rank;
+        // FFDC: Capture i_rank;
         uint8_t RANK = i_rank;
 
-// Create new log.
+        // Create new log.
         FAPI_SET_HWP_ERROR(l_rc, RC_MSS_MAINT_GET_MARK_STORE_BAD_INPUT);
         return l_rc;
       }
 
-// Read markstore register for the given rank
+      // Read markstore register for the given rank
       l_rc = fapiGetScom(l_targetCentaur, mss_markStoreRegs[i_rank][l_mbaPosition], l_markstore);
       if(l_rc) return l_rc;
 
-// If MPE FIR for the given rank (scrub or fetch) is on after the read,
-// we will read one more time just to make sure we get latest.
+      // If MPE FIR for the given rank (scrub or fetch) is on after the read,
+      // we will read one more time just to make sure we get latest.
       l_rc = fapiGetScom(l_targetCentaur, mss_mbeccfir[l_mbaPosition], l_mbeccfir);
       if(l_rc) return l_rc;
       if (l_mbeccfir.isBitSet(i_rank) || l_mbeccfir.isBitSet(20 + i_rank))
@@ -3526,7 +4137,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
         if(l_rc) return l_rc;
       }
 
-// Get l_symbolMarkGalois
+      // Get l_symbolMarkGalois
       l_ecmd_rc |= l_markstore.extractPreserve(&l_symbolMarkGalois, 0, 8, 8-8);
       if(l_ecmd_rc)
       {
@@ -3542,17 +4153,17 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       {
         FAPI_ERR("l_symbolMarkGalois invalid: symbol mark not allowed in x4 mode on %s.",i_target.toEcmdString());
 
-// TODO: Calling out FW high
-// FFDC: MBA target
+        // Calling out FW high
+        // FFDC: MBA target
         const fapi::Target & MBA = i_target;
-// FFDC: DRAM width
+        // FFDC: DRAM width
         uint8_t DRAM_WIDTH = l_dramWidth;
-// FFDC: Capure i_rank;
+        // FFDC: Capure i_rank;
         uint8_t RANK = i_rank;
-// FFDC: Capture markstore
+        // FFDC: Capture markstore
         ecmdDataBufferBase & MARKSTORE = l_markstore;
 
-// Create new log.
+        // Create new log.
         FAPI_SET_HWP_ERROR(l_rc, RC_MSS_MAINT_X4_SYMBOL_ON_READ);
         return l_rc;
       }
@@ -3572,23 +4183,23 @@ static const uint32_t maintBuffer65thRegs[4][2]={
         {
           FAPI_ERR("Invalid galois field in markstore on %s.",i_target.toEcmdString());
 
-// TODO: Calling out FW high
-// FFDC: MBA target
+        // Calling out FW high
+        // FFDC: MBA target
           const fapi::Target & MBA = i_target;
-// FFDC: DRAM width
+        // FFDC: DRAM width
           uint8_t DRAM_WIDTH = l_dramWidth;
-// FFDC: Capure i_rank;
+        // FFDC: Capure i_rank;
           uint8_t RANK = i_rank;
-// FFDC: Capture markstore
+        // FFDC: Capture markstore
           ecmdDataBufferBase & MARKSTORE = l_markstore;
 
-// Create new log.
+        // Create new log.
           FAPI_SET_HWP_ERROR(l_rc, RC_MSS_MAINT_INVALID_MARKSTORE);
           return l_rc;
         }
       }
 
-// Get l_chipMarkGalois
+      // Get l_chipMarkGalois
       l_ecmd_rc |= l_markstore.extractPreserve(&l_chipMarkGalois, 8, 8, 8-8);
       if(l_ecmd_rc)
       {
@@ -3622,28 +4233,61 @@ static const uint32_t maintBuffer65thRegs[4][2]={
             break;
           }
         }
-// TODO: create error if x4 mode and symbol 0,1?
+      // TODO: create error if x4 mode and symbol 0,1?
 
         if ( MSS_SYMBOLS_PER_RANK <= o_chipMark )
         {
           FAPI_ERR("Invalid galois field in markstore on %s.",i_target.toEcmdString());
 
-// TODO: Calling out FW high
-// FFDC: MBA target
+        // Calling out FW high
+        // FFDC: MBA target
           const fapi::Target & MBA = i_target;
-// FFDC: DRAM width
+        // FFDC: DRAM width
           uint8_t DRAM_WIDTH = l_dramWidth;
-// FFDC: Capure i_rank;
+        // FFDC: Capure i_rank;
           uint8_t RANK = i_rank;
-// FFDC: Capture markstore
+        // FFDC: Capture markstore
           ecmdDataBufferBase & MARKSTORE = l_markstore;
 
-// Create new log.
+        // Create new log.
           FAPI_SET_HWP_ERROR(l_rc, RC_MSS_MAINT_INVALID_MARKSTORE);
           return l_rc;
         }
       }
 
+
+      // Get attribute that tells we have cen DD2, and can enable exit poing 1
+      l_rc = FAPI_ATTR_GET(ATTR_CENTAUR_EC_DD2_ENABLE_EXIT_POINT_1, &i_target, l_dd2_enable_exit_point_1);
+      if(l_rc)
+      {
+        FAPI_ERR("Error getting ATTR_CENTAUR_EC_DD2_ENABLE_EXIT_POINT_1");
+        return l_rc;
+      }    
+
+      if(l_dd2_enable_exit_point_1)
+      {   
+          // If valid chip or symbol mark, enable exit point 1
+          if ((o_chipMark != MSS_INVALID_SYMBOL) || (o_symbolMark != MSS_INVALID_SYMBOL))
+          {
+
+              // Read MBSCFGQ
+              l_rc = fapiGetScom(l_targetCentaur, MBSCFGQ_0x02011411, l_mbscfg);
+              if(l_rc) return l_rc;
+              
+              l_ecmd_rc |= l_mbscfg.setBit(0);
+              if(l_ecmd_rc)
+              {
+                l_rc.setEcmdError(l_ecmd_rc);
+                return l_rc;
+              }
+           
+              // Write MBSCFGQ
+              l_rc = fapiPutScom(l_targetCentaur, MBSCFGQ_0x02011411, l_mbscfg);
+              if(l_rc) return l_rc;
+          }
+      }
+        
+
       FAPI_INF("mss_get_mark_store(): rank%d, chip mark = %d, symbol mark = %d",
                i_rank, o_chipMark, o_symbolMark );
 
@@ -3674,8 +4318,13 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       uint8_t l_chipMarkGalois = 0;
       fapi::Target l_targetCentaur;
       uint8_t l_mbaPosition = 0;
+      uint8_t l_rank_index = 0;
+      bool l_exit_point_1_needed = false;
+      ecmdDataBufferBase l_mbscfg(64);
+      uint8_t l_dd2_enable_exit_point_1 = 0;
+      
 
-// Get Centaur target for the given MBA
+      // Get Centaur target for the given MBA
       l_rc = fapiGetParentChip(i_target, l_targetCentaur);
       if(l_rc)
       {
@@ -3684,7 +4333,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       }
 
 
-// Get MBA position: 0 = mba01, 1 = mba23
+      // Get MBA position: 0 = mba01, 1 = mba23
       l_rc = FAPI_ATTR_GET(ATTR_CHIP_UNIT_POS, &i_target, l_mbaPosition);
       if(l_rc)
       {
@@ -3693,7 +4342,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       }
 
 
-// Get l_dramWidth
+      // Get l_dramWidth
       l_rc = FAPI_ATTR_GET(ATTR_EFF_DRAM_WIDTH, &i_target, l_dramWidth);
       if(l_rc)
       {
@@ -3701,22 +4350,22 @@ static const uint32_t maintBuffer65thRegs[4][2]={
         return l_rc;
       }
 
-// Check for i_rank out of range
+      // Check for i_rank out of range
       if (i_rank>=8)
       {
         FAPI_ERR("i_rank input to mss_put_mark_store out of range on %s.",i_target.toEcmdString());
-// TODO: Calling out FW high
-// FFDC: MBA target
+        // Calling out FW high
+        // FFDC: MBA target
         const fapi::Target & MBA = i_target;
-// FFDC: Capture i_rank;
+        // FFDC: Capture i_rank;
         uint8_t RANK = i_rank;
 
-// Create new log.
+        // Create new log.
         FAPI_SET_HWP_ERROR(l_rc, RC_MSS_MAINT_PUT_MARK_STORE_BAD_INPUT);
         return l_rc;
       }
 
-// Get l_symbolMarkGalois
+      // Get l_symbolMarkGalois
       if (i_symbolMark == MSS_INVALID_SYMBOL) // No symbol mark
       {
         l_symbolMarkGalois = 0x00;
@@ -3725,19 +4374,19 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       {
         FAPI_ERR("i_symbolMark invalid: symbol mark not allowed in x4 mode on %s.",i_target.toEcmdString());
 
-// TODO: Calling out FW high
-// FFDC: MBA target
+        // Calling out FW high
+        // FFDC: MBA target
         const fapi::Target & MBA = i_target;
-// FFDC: DRAM width
+        // FFDC: DRAM width
         uint8_t DRAM_WIDTH = l_dramWidth;
-// FFDC: Capure i_rank;
+        // FFDC: Capure i_rank;
         uint8_t RANK = i_rank;
-// FFDC: Capure i_symbolMark;
+        // FFDC: Capure i_symbolMark;
         uint8_t SYMBOL_MARK = i_symbolMark;
-// FFDC: Capure i_chipMark;
+        // FFDC: Capure i_chipMark;
         uint8_t CHIP_MARK = i_chipMark;
 
-// Create new log.
+        // Create new log.
         FAPI_SET_HWP_ERROR(l_rc, RC_MSS_MAINT_X4_SYMBOL_ON_WRITE);
         return l_rc;
       }
@@ -3745,19 +4394,19 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       {
         FAPI_ERR("i_symbolMark invalid: symbol index out of range on %s.",i_target.toEcmdString());
 
-// TODO: Calling out FW high
-// FFDC: MBA target
+        // Calling out FW high
+        // FFDC: MBA target
         const fapi::Target & MBA = i_target;
-// FFDC: DRAM width
+        // FFDC: DRAM width
         uint8_t DRAM_WIDTH = l_dramWidth;
-// FFDC: Capure i_rank;
+        // FFDC: Capure i_rank;
         uint8_t RANK = i_rank;
-// FFDC: Capure i_symbolMark;
+        // FFDC: Capure i_symbolMark;
         uint8_t SYMBOL_MARK = i_symbolMark;
-// FFDC: Capure i_chipMark;
+        // FFDC: Capure i_chipMark;
         uint8_t CHIP_MARK = i_chipMark;
 
-// Create new log.
+        // Create new log.
         FAPI_SET_HWP_ERROR(l_rc, RC_MSS_MAINT_INVALID_SYMBOL_INDEX);
         return l_rc;
       }
@@ -3768,7 +4417,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       l_ecmd_rc |= l_markstore.insert( l_symbolMarkGalois, 0, 8, 0 );
 
 
-// Get l_chipMarkGalois
+      // Get l_chipMarkGalois
       if (i_chipMark == MSS_INVALID_SYMBOL) // No chip mark
       {
         l_chipMarkGalois = 0x00;
@@ -3777,19 +4426,19 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       {
         FAPI_ERR("i_chipMark invalid: symbol index out of range on %s.",i_target.toEcmdString());
 
-// TODO: Calling out FW high
-// FFDC: MBA target
+        // Calling out FW high
+        // FFDC: MBA target
         const fapi::Target & MBA = i_target;
-// FFDC: DRAM width
+        // FFDC: DRAM width
         uint8_t DRAM_WIDTH = l_dramWidth;
-// FFDC: Capure i_rank;
+        // FFDC: Capure i_rank;
         uint8_t RANK = i_rank;
-// FFDC: Capure i_symbolMark;
+        // FFDC: Capure i_symbolMark;
         uint8_t SYMBOL_MARK = i_symbolMark;
-// FFDC: Capure i_chipMark;
+        // FFDC: Capure i_chipMark;
         uint8_t CHIP_MARK = i_chipMark;
 
-// Create new log.
+        // Create new log.
         FAPI_SET_HWP_ERROR(l_rc, RC_MSS_MAINT_INVALID_SYMBOL_INDEX);
         return l_rc;
       }
@@ -3797,19 +4446,19 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       {
         FAPI_ERR("i_chipMark invalid: not first symbol index of a x8 chip on %s.",i_target.toEcmdString());
 
-// TODO: Calling out FW high
-// FFDC: MBA target
+        // Calling out FW high
+        // FFDC: MBA target
         const fapi::Target & MBA = i_target;
-// FFDC: DRAM width
+        // FFDC: DRAM width
         uint8_t DRAM_WIDTH = l_dramWidth;
-// FFDC: Capure i_rank;
+        // FFDC: Capure i_rank;
         uint8_t RANK = i_rank;
-// FFDC: Capure i_symbolMark;
+        // FFDC: Capure i_symbolMark;
         uint8_t SYMBOL_MARK = i_symbolMark;
-// FFDC: Capure i_chipMark;
+        // FFDC: Capure i_chipMark;
         uint8_t CHIP_MARK = i_chipMark;
 
-// Create new log.
+        // Create new log.
         FAPI_SET_HWP_ERROR(l_rc, RC_MSS_MAINT_INVALID_CHIP_INDEX);
         return l_rc;
 
@@ -3818,23 +4467,23 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       {
         FAPI_ERR("i_chipMark invalid: not first symbol index of a x4 chip on %s.",i_target.toEcmdString());
 
-// TODO: Calling out FW high
-// FFDC: MBA target
+        // Calling out FW high
+        // FFDC: MBA target
         const fapi::Target & MBA = i_target;
-// FFDC: DRAM width
+        // FFDC: DRAM width
         uint8_t DRAM_WIDTH = l_dramWidth;
-// FFDC: Capure i_rank;
+        // FFDC: Capure i_rank;
         uint8_t RANK = i_rank;
-// FFDC: Capure i_symbolMark;
+        // FFDC: Capure i_symbolMark;
         uint8_t SYMBOL_MARK = i_symbolMark;
-// FFDC: Capure i_chipMark;
+        // FFDC: Capure i_chipMark;
         uint8_t CHIP_MARK = i_chipMark;
 
-// Create new log.
+        // Create new log.
         FAPI_SET_HWP_ERROR(l_rc, RC_MSS_MAINT_INVALID_CHIP_INDEX);
         return l_rc;
       }
-// TODO: create error if x4 mode and symbol 0,1?
+      // TODO: create error if x4 mode and symbol 0,1?
       else // Convert from symbol index to galois field
       {
         l_chipMarkGalois = mss_symbol2Galois[i_chipMark];
@@ -3846,39 +4495,93 @@ static const uint32_t maintBuffer65thRegs[4][2]={
         return l_rc;
       }
 
-// Write markstore register for the given rank
+      // Write markstore register for the given rank
       l_rc = fapiPutScom(l_targetCentaur, mss_markStoreRegs[i_rank][l_mbaPosition], l_markstore);
       if(l_rc) return l_rc;
 
-// If MPE FIR for the given rank (scrub or fetch) is on after the write,
-// we will return a fapi::ReturnCode to indicate write may not have worked.
-// Up to caller to read again if they want to see what new chip mark is.
+      // If MPE FIR for the given rank (scrub or fetch) is on after the write,
+      // we will return a fapi::ReturnCode to indicate write may not have worked.
+      // Up to caller to read again if they want to see what new chip mark is.
       l_rc = fapiGetScom(l_targetCentaur, mss_mbeccfir[l_mbaPosition], l_mbeccfir);
       if(l_rc) return l_rc;
       if (l_mbeccfir.isBitSet(i_rank) || l_mbeccfir.isBitSet(20 + i_rank))
       {
-// TODO: Can FW distingish this rc from all the others
-// so they know they just need to retry after clearing MPE FIR?
-
         FAPI_ERR("Markstore write may have been blocked due to MPE FIR set on %s.",i_target.toEcmdString());
 
-// FFDC: MBA target
+        // FFDC: MBA target
         const fapi::Target & MBA = i_target;
-// FFDC: DRAM width
+        // FFDC: DRAM width
         uint8_t DRAM_WIDTH = l_dramWidth;
-// FFDC: Capure i_rank;
+        // FFDC: Capure i_rank;
         uint8_t RANK = i_rank;
-// FFDC: Capure i_symbolMark;
+        // FFDC: Capure i_symbolMark;
         uint8_t SYMBOL_MARK = i_symbolMark;
-// FFDC: Capure i_chipMark;
+        // FFDC: Capure i_chipMark;
         uint8_t CHIP_MARK = i_chipMark;
-// FFDC: Capture MBECCFIR
+        // FFDC: Capture MBECCFIR
         ecmdDataBufferBase & MBECCFIR = l_mbeccfir;
 
-// Create new log.
+        // Create new log.
         FAPI_SET_HWP_ERROR(l_rc, RC_MSS_MAINT_MARKSTORE_WRITE_BLOCKED);
         return l_rc;
       }
+      
+
+      // Get attribute that tells we have cen DD2, and can enable exit poing 1
+      l_rc = FAPI_ATTR_GET(ATTR_CENTAUR_EC_DD2_ENABLE_EXIT_POINT_1, &i_target, l_dd2_enable_exit_point_1);
+      if(l_rc)
+      {
+        FAPI_ERR("Error getting ATTR_CENTAUR_EC_DD2_ENABLE_EXIT_POINT_1");
+        return l_rc;
+      }    
+
+      if(l_dd2_enable_exit_point_1)
+      {   
+          // Read all mark store for both MBAs
+          for ( l_mbaPosition = 0; l_mbaPosition < 2; l_mbaPosition++)
+          {
+              for ( l_rank_index = 0; l_rank_index < MSS_MAX_RANKS; l_rank_index++ )
+              {
+                l_rc = fapiGetScom(l_targetCentaur, mss_markStoreRegs[l_rank_index][l_mbaPosition], l_markstore);
+                if(l_rc) return l_rc;
+                
+                if (l_markstore.isBitSet(0,16))
+                {
+                    // Mark found, so exit point 1 needed
+                    l_exit_point_1_needed = true;
+                    break;
+                }
+              }
+              if (l_exit_point_1_needed) break;
+          }
+
+          // Read MBSCFGQ
+          l_rc = fapiGetScom(l_targetCentaur, MBSCFGQ_0x02011411, l_mbscfg);
+          if(l_rc) return l_rc;
+          
+          // Enable exit point 1
+          if (l_exit_point_1_needed)
+          {
+            l_ecmd_rc |= l_mbscfg.setBit(0);
+          }
+          // Else, disable exit point 1
+          else
+          {
+            l_ecmd_rc |= l_mbscfg.clearBit(0);
+          }
+
+          if(l_ecmd_rc)
+          {
+            l_rc.setEcmdError(l_ecmd_rc);
+            return l_rc;
+          }
+       
+          // Write MBSCFGQ
+          l_rc = fapiPutScom(l_targetCentaur, MBSCFGQ_0x02011411, l_mbscfg);
+          if(l_rc) return l_rc;
+          
+      } // End if l_dd2_enable_exit_point_1
+
 
       FAPI_INF("EXIT mss_put_mark_store()");
       return l_rc;
@@ -3914,7 +4617,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       o_dramSparePort1Symbol = MSS_INVALID_SYMBOL;
       o_eccSpareSymbol = MSS_INVALID_SYMBOL;
 
-// Get Centaur target for the given MBA
+      // Get Centaur target for the given MBA
       l_rc = fapiGetParentChip(i_target, l_targetCentaur);
       if(l_rc)
       {
@@ -3923,7 +4626,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       }
 
 
-// Get MBA position: 0 = mba01, 1 = mba23
+      // Get MBA position: 0 = mba01, 1 = mba23
       l_rc = FAPI_ATTR_GET(ATTR_CHIP_UNIT_POS, &i_target, l_mbaPosition);
       if(l_rc)
       {
@@ -3931,7 +4634,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
         return l_rc;
       }
 
-// Get l_dramWidth
+      // Get l_dramWidth
       l_rc = FAPI_ATTR_GET(ATTR_EFF_DRAM_WIDTH, &i_target, l_dramWidth);
       if(l_rc)
       {
@@ -3940,41 +4643,41 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       }
 
 
-// Check for i_rank or i_muxType out of range
+      // Check for i_rank or i_muxType out of range
       if ((i_rank>=8) ||
           !((i_muxType==mss_SteerMux::READ_MUX) || (i_muxType==mss_SteerMux::WRITE_MUX)))
       {
         FAPI_ERR("i_rank or i_muxType input to mss_get_steer_mux out of range on %s.",i_target.toEcmdString());
-// TODO: Calling out FW high
-// FFDC: MBA target
+        // Calling out FW high
+        // FFDC: MBA target
         const fapi::Target & MBA = i_target;
-// FFDC: Capture i_rank;
+        // FFDC: Capture i_rank;
         uint8_t RANK = i_rank;
-// FFDC: Capure i_muxType
+        // FFDC: Capure i_muxType
         uint8_t MUX_TYPE = i_muxType;
 
-// Create new log.
+        // Create new log.
         FAPI_SET_HWP_ERROR(l_rc, RC_MSS_MAINT_GET_STEER_MUX_BAD_INPUT);
         return l_rc;
       }
 
 
-// Read steer mux register for the given rank and mux type (read or write).
+      // Read steer mux register for the given rank and mux type (read or write).
       if (i_muxType == mss_SteerMux::READ_MUX)
       {
-// Read muxes are in the MBS
+        // Read muxes are in the MBS
         l_rc = fapiGetScom(l_targetCentaur, mss_readMuxRegs[i_rank][l_mbaPosition], l_steerMux);
         if(l_rc) return l_rc;
       }
       else
       {
-// Write muxes are in the MBA
+        // Write muxes are in the MBA
         l_rc = fapiGetScom(i_target, mss_writeMuxRegs[i_rank], l_steerMux);
         if(l_rc) return l_rc;
       }
 
-//***************************************
-// Get l_dramSparePort0Index
+
+      // Get l_dramSparePort0Index
       l_ecmd_rc |= l_steerMux.extractPreserve(&l_dramSparePort0Index, 0, 5, 8-5);
       if(l_ecmd_rc)
       {
@@ -3982,7 +4685,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
         return l_rc;
       }
 
-// Get o_dramSparePort0Symbol if index in valid range
+      // Get o_dramSparePort0Symbol if index in valid range
       if ((l_dramWidth == mss_MemConfig::X8) && (l_dramSparePort0Index < MSS_X8_STEER_OPTIONS_PER_PORT))
       {
         o_dramSparePort0Symbol = mss_x8dramSparePort0Index_to_symbol[l_dramSparePort0Index];
@@ -3995,26 +4698,26 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       {
         FAPI_ERR("Steer mux l_dramSparePort0Index out of range on %s.",i_target.toEcmdString());
 
-// TODO: Calling out FW high
-// FFDC: MBA target
+        // Calling out FW high
+        // FFDC: MBA target
         const fapi::Target & MBA = i_target;
-// FFDC: DRAM width
+        // FFDC: DRAM width
         uint8_t DRAM_WIDTH = l_dramWidth;
-// FFDC: Capure i_rank;
+        // FFDC: Capure i_rank;
         uint8_t RANK = i_rank;
-// FFDC: Capure i_muxType
+        // FFDC: Capure i_muxType
         uint8_t MUX_TYPE = i_muxType;
-// FFDC: Capture steer mux
+        // FFDC: Capture steer mux
         ecmdDataBufferBase & STEER_MUX = l_steerMux;
 
-// Create new log.
+        // Create new log.
         FAPI_SET_HWP_ERROR(l_rc, RC_MSS_MAINT_INVALID_STEER_MUX);
         return l_rc;
       }
 
 
-//***************************************
-// Get l_dramSparePort1Index
+
+      // Get l_dramSparePort1Index
       l_ecmd_rc |= l_steerMux.extractPreserve(&l_dramSparePort1Index, 5, 5, 8-5);
       if(l_ecmd_rc)
       {
@@ -4022,7 +4725,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
         return l_rc;
       }
 
-// Get o_dramSparePort1Symbol if index in valid range
+      // Get o_dramSparePort1Symbol if index in valid range
       if ((l_dramWidth == mss_MemConfig::X8) && (l_dramSparePort1Index < MSS_X8_STEER_OPTIONS_PER_PORT))
       {
         o_dramSparePort1Symbol = mss_x8dramSparePort1Index_to_symbol[l_dramSparePort1Index];
@@ -4035,26 +4738,26 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       {
         FAPI_ERR("Steer mux l_dramSparePort1Index out of range on %s.",i_target.toEcmdString());
 
-// TODO: Calling out FW high
-// FFDC: MBA target
+        // Calling out FW high
+        // FFDC: MBA target
         const fapi::Target & MBA = i_target;
-// FFDC: DRAM width
+        // FFDC: DRAM width
         uint8_t DRAM_WIDTH = l_dramWidth;
-// FFDC: Capure i_rank;
+        // FFDC: Capure i_rank;
         uint8_t RANK = i_rank;
-// FFDC: Capure i_muxType
+        // FFDC: Capure i_muxType
         uint8_t MUX_TYPE = i_muxType;
-// FFDC: Capture steer mux
+        // FFDC: Capture steer mux
         ecmdDataBufferBase & STEER_MUX = l_steerMux;
 
-// Create new log.
+        // Create new log.
         FAPI_SET_HWP_ERROR(l_rc, RC_MSS_MAINT_INVALID_STEER_MUX);
         return l_rc;
       }
 
 
-//***************************************
-// Get l_eccSpareIndex
+
+      // Get l_eccSpareIndex
       l_ecmd_rc |= l_steerMux.extractPreserve(&l_eccSpareIndex, 10, 6, 8-6);
       if(l_ecmd_rc)
       {
@@ -4062,7 +4765,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
         return l_rc;
       }
 
-// Get o_eccSpareSymbol if index in valid range
+      // Get o_eccSpareSymbol if index in valid range
       if (l_eccSpareIndex < MSS_X4_ECC_STEER_OPTIONS)
       {
         o_eccSpareSymbol = mss_eccSpareIndex_to_symbol[l_eccSpareIndex];
@@ -4071,19 +4774,19 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       {
         FAPI_ERR("o_eccSpareSymbol out of range on %s.",i_target.toEcmdString());
 
-// TODO: Calling out FW high
-// FFDC: MBA target
+        // Calling out FW high
+        // FFDC: MBA target
         const fapi::Target & MBA = i_target;
-// FFDC: DRAM width
+        // FFDC: DRAM width
         uint8_t DRAM_WIDTH = l_dramWidth;
-// FFDC: Capure i_rank;
+        // FFDC: Capure i_rank;
         uint8_t RANK = i_rank;
-// FFDC: Capure i_muxType
+        // FFDC: Capure i_muxType
         uint8_t MUX_TYPE = i_muxType;
-// FFDC: Capture steer mux
+        // FFDC: Capture steer mux
         ecmdDataBufferBase & STEER_MUX = l_steerMux;
-
-// Create new log.
+        
+        // Create new log.
         FAPI_SET_HWP_ERROR(l_rc, RC_MSS_MAINT_INVALID_STEER_MUX);
         return l_rc;
       }
@@ -4160,7 +4863,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
           (i_symbol >= 72))
       {
         FAPI_ERR("i_rank or i_muxType or i_steerType or i_symbol input to mss_get_steer_mux out of range on %s.",i_target.toEcmdString());
-// TODO: Calling out FW high
+// Calling out FW high
 // FFDC: MBA target
         const fapi::Target & MBA = i_target;
 // FFDC: Capture i_rank;
@@ -4213,7 +4916,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
           {
             FAPI_ERR("No match for i_symbol = %d in mss_x8dramSparePort0Index_to_symbol[] on %s.", i_symbol, i_target.toEcmdString());
 
-// TODO: Calling out FW high
+// Calling out FW high
 // FFDC: MBA target
             const fapi::Target & MBA = i_target;
 // FFDC: DRAM width
@@ -4249,7 +4952,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
           {
             FAPI_ERR("No match for i_symbol in mss_x4dramSparePort0Index_to_symbol[] on %s.",i_target.toEcmdString());
 
-// TODO: Calling out FW high
+// Calling out FW high
 // FFDC: MBA target
             const fapi::Target & MBA = i_target;
 // FFDC: DRAM width
@@ -4292,7 +4995,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
           {
             FAPI_ERR("No match for i_symbol in mss_x8dramSparePort1Index_to_symbol[] on %s.",i_target.toEcmdString());
 
-// TODO: Calling out FW high
+// Calling out FW high
 // FFDC: MBA target
             const fapi::Target & MBA = i_target;
 // FFDC: DRAM width
@@ -4328,7 +5031,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
           {
             FAPI_ERR("No match for i_symbol in mss_x4dramSparePort1Index_to_symbol[] on %s.",i_target.toEcmdString());
 
-// TODO: Calling out FW high
+// Calling out FW high
 // FFDC: MBA target
             const fapi::Target & MBA = i_target;
 // FFDC: DRAM width
@@ -4372,7 +5075,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
           {
             FAPI_ERR("No match for i_symbol in mss_eccSpareIndex_to_symbol[] on %s.",i_target.toEcmdString());
 
-// TODO: Calling out FW high
+// Calling out FW high
 // FFDC: MBA target
             const fapi::Target & MBA = i_target;
 // FFDC: DRAM width
@@ -4395,7 +5098,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
         {
           FAPI_ERR("ECC_SPARE not valid with x8 mode on %s.",i_target.toEcmdString());
 
-// TODO: Calling out FW high
+// Calling out FW high
 // FFDC: MBA target
           const fapi::Target & MBA = i_target;
 // FFDC: DRAM width
@@ -4490,7 +5193,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
       if ((i_rank>=MSS_MAX_RANKS) || (i_symbol>=MSS_SYMBOLS_PER_RANK))
       {
         FAPI_ERR("i_rank or i_symbol input to mss_do_steer out of range on %s.",i_target.toEcmdString());
-// TODO: Calling out FW high
+// Calling out FW high
 // FFDC: MBA target
         const fapi::Target & MBA = i_target;
 // FFDC: Capture i_rank;
@@ -4556,9 +5259,6 @@ static const uint32_t maintBuffer65thRegs[4][2]={
 
       fapiDelay(HW_MODE_DELAY, SIM_MODE_DELAY);
 
-// TODO: Could be precise and find cal interval from:
-// ATTR_EFF_ZQCAL_INTERVAL (in clocks... so still have to know freq)
-// ATTR_EFF_MEMCAL_INTERVAL (in clocks... so still have to know freq)
 
 //------------------------------------------------------
 // Update read mux
@@ -5943,16 +6643,16 @@ static const uint32_t maintBuffer65thRegs[4][2]={
                                            uint8_t (&o_bad_bits)[2][10])
 
     {
-      FAPI_INF("ENTER mss_IPL_UE_isolation()");
+        FAPI_INF("ENTER mss_IPL_UE_isolation()");
 
-      fapi::ReturnCode l_rc;
-      uint32_t l_ecmd_rc = 0;
+        fapi::ReturnCode l_rc;
+        uint32_t l_ecmd_rc = 0;
 
-      static const uint32_t maintBufferReadDataRegs[2][2][8]={
+        static const uint32_t maintBufferReadDataRegs[2][2][8]={
 
         // UE trap 0:
         // Port0                                    beat  double word
-        {{MAINT0_MBA_MAINT_BUFF0_DATA0_0x03010655, // 0     DW0
+      {{MAINT0_MBA_MAINT_BUFF0_DATA0_0x03010655, // 0     DW0
         MAINT0_MBA_MAINT_BUFF2_DATA0_0x03010675, // 1     DW2
         MAINT0_MBA_MAINT_BUFF0_DATA1_0x03010656, // 2     DW4
         MAINT0_MBA_MAINT_BUFF2_DATA1_0x03010676, // 3     DW6
@@ -5962,7 +6662,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
         MAINT0_MBA_MAINT_BUFF2_DATA3_0x03010678},// 7     DW14
 
         // Port1
-        {MAINT0_MBA_MAINT_BUFF1_DATA0_0x03010665, // 0     DW1
+       {MAINT0_MBA_MAINT_BUFF1_DATA0_0x03010665, // 0     DW1
         MAINT0_MBA_MAINT_BUFF3_DATA0_0x03010685, // 1     DW3
         MAINT0_MBA_MAINT_BUFF1_DATA1_0x03010666, // 2     DW5
         MAINT0_MBA_MAINT_BUFF3_DATA1_0x03010686, // 3     DW7
@@ -5973,7 +6673,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
 
         // UE trap 1:
         // Port0
-        {{MAINT0_MBA_MAINT_BUFF0_DATA4_0x03010659, // 0     DW0
+      {{MAINT0_MBA_MAINT_BUFF0_DATA4_0x03010659, // 0     DW0
         MAINT0_MBA_MAINT_BUFF2_DATA4_0x03010679, // 1     DW2
         MAINT0_MBA_MAINT_BUFF0_DATA5_0x0301065a, // 2     DW4
         MAINT0_MBA_MAINT_BUFF2_DATA5_0x0301067a, // 3     DW6
@@ -5983,7 +6683,7 @@ static const uint32_t maintBuffer65thRegs[4][2]={
         MAINT0_MBA_MAINT_BUFF2_DATA7_0x0301067c},// 7     DW14
 
         // Port1
-        {MAINT0_MBA_MAINT_BUFF1_DATA4_0x03010669, // 0     DW1
+       {MAINT0_MBA_MAINT_BUFF1_DATA4_0x03010669, // 0     DW1
         MAINT0_MBA_MAINT_BUFF3_DATA4_0x03010689, // 1     DW3
         MAINT0_MBA_MAINT_BUFF1_DATA5_0x0301066a, // 2     DW5
         MAINT0_MBA_MAINT_BUFF3_DATA5_0x0301068a, // 3     DW7
@@ -5994,148 +6694,171 @@ static const uint32_t maintBuffer65thRegs[4][2]={
 
 
         static const uint32_t maintBufferRead65thByteRegs[2][4]={
-          // UE trap 0
-          {MAINT0_MBA_MAINT_BUFF_65TH_BYTE_64B_ECC0_0x03010695,
-          MAINT0_MBA_MAINT_BUFF_65TH_BYTE_64B_ECC1_0x03010696,
-          MAINT0_MBA_MAINT_BUFF_65TH_BYTE_64B_ECC2_0x03010697,
-          MAINT0_MBA_MAINT_BUFF_65TH_BYTE_64B_ECC3_0x03010698},
-          // UE trap 1
-          {MAINT0_MBA_MAINT_BUFF_65TH_BYTE_64B_ECC4_0x03010699,
-          MAINT0_MBA_MAINT_BUFF_65TH_BYTE_64B_ECC5_0x0301069a,
-          MAINT0_MBA_MAINT_BUFF_65TH_BYTE_64B_ECC6_0x0301069b,
-          MAINT0_MBA_MAINT_BUFF_65TH_BYTE_64B_ECC7_0x0301069c}};
-
-
-          uint8_t l_UE_trap = 0; // 0,1, since UE can be in 1st or 2nd half of buffer
-          uint8_t l_port = 0;    // 0,1
-          uint8_t l_beat = 0;    // 0-7
-          uint8_t l_byte = 0;    // 0-9
-          uint8_t l_loop = 0;
-          ecmdDataBufferBase l_data(64);
-          ecmdDataBufferBase l_UE_trap0_signature(64);
-          ecmdDataBufferBase l_UE_trap1_signature(64);
-          ecmdDataBufferBase l_mbmmr(64);
-          ecmdDataBufferBase l_mbmct(64);
-          ecmdDataBufferBase l_mbstr(64);
-          uint8_t l_initPattern = 0;
-          uint8_t l_cmd_type = 0;
-          fapi::Target l_targetCentaur;
-          uint8_t l_mbaPosition = 0;
-          uint32_t l_tmp_data_diff[2];
-          uint8_t l_tag_MDI = 0;
-          uint8_t l_tmp_65th_byte_diff = 0;
-          ecmdDataBufferBase l_diff(64);
-          uint32_t l_ECC = 0;
-          uint32_t l_tmp_ECC_diff = 0;
-          ecmdDataBufferBase l_ECC_diff(32);
-          uint8_t l_ECC_c6_c5_c4_01 = 0;
-          uint8_t l_ECC_c6_c5_c4_23 = 0;
-          uint8_t l_ECC_c3_c2_c1_c0_01 = 0;
-          uint8_t l_ECC_c3_c2_c1_c0_23 = 0;
-          uint8_t l_dramSparePort0Symbol = MSS_INVALID_SYMBOL;
-          uint8_t l_dramSparePort1Symbol = MSS_INVALID_SYMBOL;
-          uint8_t l_eccSpareSymbol = MSS_INVALID_SYMBOL;
-
-          //----------------------------------------------------
-          // Initialize o_bad_bits
-          //----------------------------------------------------
-
-          for(l_port=0; l_port<2; l_port++ )
-          {
+        // UE trap 0
+       {MAINT0_MBA_MAINT_BUFF_65TH_BYTE_64B_ECC0_0x03010695,
+        MAINT0_MBA_MAINT_BUFF_65TH_BYTE_64B_ECC1_0x03010696,
+        MAINT0_MBA_MAINT_BUFF_65TH_BYTE_64B_ECC2_0x03010697,
+        MAINT0_MBA_MAINT_BUFF_65TH_BYTE_64B_ECC3_0x03010698},
+        // UE trap 1
+       {MAINT0_MBA_MAINT_BUFF_65TH_BYTE_64B_ECC4_0x03010699,
+        MAINT0_MBA_MAINT_BUFF_65TH_BYTE_64B_ECC5_0x0301069a,
+        MAINT0_MBA_MAINT_BUFF_65TH_BYTE_64B_ECC6_0x0301069b,
+        MAINT0_MBA_MAINT_BUFF_65TH_BYTE_64B_ECC7_0x0301069c}};
+
+        
+        uint8_t l_UE_trap = 0; // 0,1, since UE can be in 1st or 2nd half of buffer
+        uint8_t l_port = 0;    // 0,1
+        uint8_t l_beat = 0;    // 0-7
+        uint8_t l_byte = 0;    // 0-9
+        uint8_t l_nibble = 0;  // 0-17
+        uint8_t l_loop = 0;
+        ecmdDataBufferBase l_data(64);
+        ecmdDataBufferBase l_UE_trap0_signature(64);
+        ecmdDataBufferBase l_UE_trap1_signature(64);
+        ecmdDataBufferBase l_mbmmr(64);
+        ecmdDataBufferBase l_mbmct(64);
+        ecmdDataBufferBase l_mbstr(64);
+        uint8_t l_initPattern = 0;
+        uint8_t l_cmd_type = 0;
+        fapi::Target l_targetCentaur;
+        uint8_t l_mbaPosition = 0;
+        uint32_t l_tmp_data_diff[2];
+        uint8_t l_tag_MDI = 0;
+        uint8_t l_tmp_65th_byte_diff = 0;
+        ecmdDataBufferBase l_diff(64);
+        uint32_t l_ECC = 0;
+        uint32_t l_tmp_ECC_diff = 0;
+        ecmdDataBufferBase l_ECC_diff(32);
+        uint8_t l_ECC_c6_c5_c4_01 = 0;
+        uint8_t l_ECC_c6_c5_c4_23 = 0;
+        uint8_t l_ECC_c3_c2_c1_c0_01 = 0;
+        uint8_t l_ECC_c3_c2_c1_c0_23 = 0;
+        uint8_t l_dramSparePort0Symbol = MSS_INVALID_SYMBOL;
+        uint8_t l_dramSparePort1Symbol = MSS_INVALID_SYMBOL;
+        uint8_t l_eccSpareSymbol = MSS_INVALID_SYMBOL;
+        uint8_t l_dramWidth = 0;
+
+
+        //----------------------------------------------------
+        // Get l_dramWidth
+        //----------------------------------------------------          
+        l_rc = FAPI_ATTR_GET(ATTR_EFF_DRAM_WIDTH, &i_target, l_dramWidth);
+        if(l_rc)
+        {
+            FAPI_ERR("Error getting DRAM width on %s.",i_target.toEcmdString());
+            return l_rc;
+        }
+        
+        // Convert from attribute enum values: 8,4 to index values: 0,1
+        if(l_dramWidth == mss_MemConfig::X8)
+        {
+            l_dramWidth = 0;
+        }
+        else
+        {
+            l_dramWidth = 1;
+        }
+
+        //----------------------------------------------------
+        // Initialize o_bad_bits
+        //----------------------------------------------------
+
+        for(l_port=0; l_port<2; l_port++ )
+        {
             for(l_byte=0; l_byte<10; l_byte++ )
             {
-              o_bad_bits[l_port][l_byte] = 0;
+                o_bad_bits[l_port][l_byte] = 0;
             }
-          }
+        }
 
 
-          //----------------------------------------------------
-          // Get the expected pattern (stored in mbmmr reg)
-          //----------------------------------------------------
+        //----------------------------------------------------
+        // Get the expected pattern (stored in mbmmr reg)
+        //----------------------------------------------------
 
-         // Get Centaur target for the given MBA
-          l_rc = fapiGetParentChip(i_target, l_targetCentaur);
-          if(l_rc)
-          {
+        // Get Centaur target for the given MBA
+        l_rc = fapiGetParentChip(i_target, l_targetCentaur);
+        if(l_rc)
+        {
             FAPI_ERR("Error getting Centaur parent target for the given MBA, on %s.",i_target.toEcmdString());
             return l_rc;
-          }
+        }
 
-          // Get MBA position: 0 = mba01, 1 = mba23
-          l_rc = FAPI_ATTR_GET(ATTR_CHIP_UNIT_POS, &i_target, l_mbaPosition);
-          if(l_rc)
-          {
+        // Get MBA position: 0 = mba01, 1 = mba23
+        l_rc = FAPI_ATTR_GET(ATTR_CHIP_UNIT_POS, &i_target, l_mbaPosition);
+        if(l_rc)
+        {
             FAPI_ERR("Error getting MBA position on %s.",i_target.toEcmdString());
             return l_rc;
-          }
+        }
 
-          // MBMMR[4:7] contains the pattern index
-          l_rc = fapiGetScom(l_targetCentaur, mss_mbmmr[l_mbaPosition], l_mbmmr);
-          if(l_rc) return l_rc;
-          l_ecmd_rc |= l_mbmmr.extractPreserve(&l_initPattern, 4, 4, 8-4);
-          if(l_ecmd_rc)
-          {
+        // MBMMR[4:7] contains the pattern index
+        l_rc = fapiGetScom(l_targetCentaur, mss_mbmmr[l_mbaPosition], l_mbmmr);
+        if(l_rc) return l_rc;
+        l_ecmd_rc |= l_mbmmr.extractPreserve(&l_initPattern, 4, 4, 8-4);
+        if(l_ecmd_rc)
+        {
             l_rc.setEcmdError(l_ecmd_rc);
             return l_rc;
-          }
+        }
 
-          // MBMCT[0:4] contains the cmd type
-          l_rc = fapiGetScom(i_target, MBA01_MBMCTQ_0x0301060A, l_mbmct);
-          if(l_rc) return l_rc;
-          l_ecmd_rc |= l_mbmct.extractPreserve(&l_cmd_type, 0, 5, 8-5);
-          if(l_ecmd_rc)
-          {
+        // MBMCT[0:4] contains the cmd type
+        l_rc = fapiGetScom(i_target, MBA01_MBMCTQ_0x0301060A, l_mbmct);
+        if(l_rc) return l_rc;
+        l_ecmd_rc |= l_mbmct.extractPreserve(&l_cmd_type, 0, 5, 8-5);
+        if(l_ecmd_rc)
+        {
             l_rc.setEcmdError(l_ecmd_rc);
             return l_rc;
-          }
+        }
 
-          // No isolation if cmd is timebased steer cleanup
-          if (l_cmd_type == 2)
-          {
+        // No isolation if cmd is timebased steer cleanup
+        if (l_cmd_type == 2)
+        {
             FAPI_ERR("WARNING: rank%d maint UE during steer cleanup - no bad bit isolation possible on %s.", i_rank, i_target.toEcmdString());
             return l_rc;
-          }
+        }
 
-          // No isolation if pattern is random
-          if (l_initPattern == 8)
-          {
+        // No isolation if pattern is random
+        if (l_initPattern == 8)
+        {
             FAPI_ERR("WARNING: rank%d maint UE with random pattern - no bad bit isolation possible on %s.", i_rank, i_target.toEcmdString());
             return l_rc;
-          }
+        }
 
 
-          FAPI_INF("Expected pattern%d = 0x%.8X 0x%.8X",l_initPattern,
-                   mss_maintBufferData[l_initPattern][0][0],
-                   mss_maintBufferData[l_initPattern][0][1]);
+        FAPI_INF("Expected pattern%d = 0x%.8X 0x%.8X",l_initPattern,
+                   mss_maintBufferData[l_dramWidth][l_initPattern][0][0],
+                   mss_maintBufferData[l_dramWidth][l_initPattern][0][1]);
 
-          //----------------------------------------------------
-          // Figure out which half of the buffer has the UE...
-          // Remember we had to first load the buffers with
-          // a hex signatue, and whichever gets overwritten
-          // has a UE trapped
-          //----------------------------------------------------
-          l_rc = fapiGetScom(i_target, MAINT0_MBA_MAINT_BUFF0_DATA0_0x03010655, l_UE_trap0_signature);
-          if(l_rc) return l_rc;
+        //----------------------------------------------------
+        // Figure out which half of the buffer has the UE...
+        // Remember we had to first load the buffers with
+        // a hex signatue, and whichever gets overwritten
+        // has a UE trapped
+        //----------------------------------------------------
+        l_rc = fapiGetScom(i_target, MAINT0_MBA_MAINT_BUFF0_DATA0_0x03010655, l_UE_trap0_signature);
+        if(l_rc) return l_rc;
 
-          l_rc = fapiGetScom(i_target, MAINT0_MBA_MAINT_BUFF0_DATA4_0x03010659, l_UE_trap1_signature);
-          if(l_rc) return l_rc;
+        l_rc = fapiGetScom(i_target, MAINT0_MBA_MAINT_BUFF0_DATA4_0x03010659, l_UE_trap1_signature);
+        if(l_rc) return l_rc;
 
-          // UE may be trapped in both halves of the buffer,
-          // but we will only use one.
-          if ((l_UE_trap0_signature.getWord(0) != 0xFACEB00C) &&
-              (l_UE_trap0_signature.getWord(0) != 0xD15C0DAD))
-          {
+        // UE may be trapped in both halves of the buffer,
+        // but we will only use one.
+        if ((l_UE_trap0_signature.getWord(0) != 0xFACEB00C) &&
+            (l_UE_trap0_signature.getWord(0) != 0xD15C0DAD))
+        {
             FAPI_INF("UE trapped in 1st half of maint buffer");
             l_UE_trap = 0;
-          }
-          else if ((l_UE_trap1_signature.getWord(0) != 0xFACEB00C) &&
-                   (l_UE_trap1_signature.getWord(0) != 0xD15C0DAD))
-          {
+        }
+        else if ((l_UE_trap1_signature.getWord(0) != 0xFACEB00C) &&
+                 (l_UE_trap1_signature.getWord(0) != 0xD15C0DAD))
+        {
             FAPI_INF("UE trapped in 2nd half of maint buffer");
             l_UE_trap = 1;
-          }
-          else
-          {
+        }
+        else
+        {
             FAPI_ERR("IPL UE trapping didn't work on i_rank = %d on %s.", i_rank, i_target.toEcmdString());
 
             // Read for FFDC: MBSTR[59]: UE trap enable bit
@@ -6159,16 +6882,16 @@ static const uint32_t maintBuffer65thRegs[4][2]={
             FAPI_SET_HWP_ERROR(l_rc, RC_MSS_MAINT_NO_UE_TRAP);
 
             return l_rc;
-          }
+        }
 
 
 
-          //----------------------------------------------------
-          // DATA: Do XOR of expected and actual data to find stuck bits
-          //----------------------------------------------------
+        //----------------------------------------------------
+        // DATA: Do XOR of expected and actual data to find stuck bits
+        //----------------------------------------------------
 
-          for(l_port=0; l_port<2; l_port++ )
-          {
+        for(l_port=0; l_port<2; l_port++ )
+        {
             l_tmp_data_diff[0] = 0;
             l_tmp_data_diff[1] = 0;
 
@@ -6176,19 +6899,19 @@ static const uint32_t maintBuffer65thRegs[4][2]={
             for(l_beat=0; l_beat<8; l_beat++ )
             {
 
-              l_rc = fapiGetScom(i_target, maintBufferReadDataRegs[l_UE_trap][l_port][l_beat], l_data);
-              if(l_rc) return l_rc;
-              FAPI_INF("Actual data, beat%d: 0x%.8X 0x%.8X", l_beat, l_data.getWord(0), l_data.getWord(1));
+                l_rc = fapiGetScom(i_target, maintBufferReadDataRegs[l_UE_trap][l_port][l_beat], l_data);
+                if(l_rc) return l_rc;
+                FAPI_INF("Actual data, beat%d: 0x%.8X 0x%.8X", l_beat, l_data.getWord(0), l_data.getWord(1));
 
-              FAPI_INF("Expected pattern%d = 0x%.8X 0x%.8X",l_initPattern,
-                       mss_maintBufferData[l_initPattern][l_port*8 + l_beat][0],
-                       mss_maintBufferData[l_initPattern][l_port*8 + l_beat][1]);
+                FAPI_INF("Expected pattern%d = 0x%.8X 0x%.8X",l_initPattern,
+                       mss_maintBufferData[l_dramWidth][l_initPattern][l_port*8 + l_beat][0],
+                       mss_maintBufferData[l_dramWidth][l_initPattern][l_port*8 + l_beat][1]);
 
-              // DO XOR of actual and expected data, and OR the result together for all 8 beats
-              l_tmp_data_diff[0] |= l_data.getWord(0) ^ mss_maintBufferData[l_initPattern][l_port*8 + l_beat][0];
-              l_tmp_data_diff[1] |= l_data.getWord(1) ^ mss_maintBufferData[l_initPattern][l_port*8 + l_beat][1];
+                // DO XOR of actual and expected data, and OR the result together for all 8 beats
+                l_tmp_data_diff[0] |= l_data.getWord(0) ^ mss_maintBufferData[l_dramWidth][l_initPattern][l_port*8 + l_beat][0];
+                l_tmp_data_diff[1] |= l_data.getWord(1) ^ mss_maintBufferData[l_dramWidth][l_initPattern][l_port*8 + l_beat][1];
 
-              FAPI_INF("***************************************** l_tmp_diff: 0x%.8X 0x%.8X", l_tmp_data_diff[0], l_tmp_data_diff[1]);
+                FAPI_INF("***************************************** l_tmp_diff: 0x%.8X 0x%.8X", l_tmp_data_diff[0], l_tmp_data_diff[1]);
             }
 
             // Put l_tmp_diff into a ecmdDataBufferBase to make it easier
@@ -6197,30 +6920,30 @@ static const uint32_t maintBuffer65thRegs[4][2]={
             l_ecmd_rc |= l_diff.insert(l_tmp_data_diff[1], 32, 32, 0);
             if(l_ecmd_rc)
             {
-              l_rc.setEcmdError(l_ecmd_rc);
-              return l_rc;
+                l_rc.setEcmdError(l_ecmd_rc);
+                return l_rc;
             }
 
             for(l_byte=0; l_byte<8; l_byte++ )
             {
-              l_ecmd_rc |= l_diff.extractPreserve(&o_bad_bits[l_port][l_byte], 8*l_byte, 8, 0);
+                l_ecmd_rc |= l_diff.extractPreserve(&o_bad_bits[l_port][l_byte], 8*l_byte, 8, 0);
             }
             if(l_ecmd_rc)
             {
-              l_rc.setEcmdError(l_ecmd_rc);
-              return l_rc;
+                l_rc.setEcmdError(l_ecmd_rc);
+                return l_rc;
             }
 
-          } // End loop on ports
+        } // End loop on ports
 
 
 
-          //----------------------------------------------------
-          // 65th byte: Do XOR of expected and actual 65th byte to find stuck bits
-          //----------------------------------------------------
+        //----------------------------------------------------
+        // 65th byte: Do XOR of expected and actual 65th byte to find stuck bits
+        //----------------------------------------------------
 
-          for(l_loop=0; l_loop<4; l_loop++ )
-          {
+        for(l_loop=0; l_loop<4; l_loop++ )
+        {
             l_tag_MDI = 0;
             l_tmp_65th_byte_diff = 0;
 
@@ -6234,57 +6957,57 @@ static const uint32_t maintBuffer65thRegs[4][2]={
             l_ecmd_rc |= l_data.extractPreserve(&l_tag_MDI, 0, 4, 0);
             if(l_ecmd_rc)
             {
-              l_rc.setEcmdError(l_ecmd_rc);
-              return l_rc;
+                l_rc.setEcmdError(l_ecmd_rc);
+                return l_rc;
             }
-
+            
             FAPI_INF("Actual:   bit0 (Checkbit0_1), bit1(Tag0_2), bit2(Tag1_3), bit3(MDI) = 0x%.2X", l_tag_MDI);
 
-            FAPI_INF("Expected: bit0 (Checkbit0_1), bit1(Tag0_2), bit2(Tag1_3), bit3(MDI) = 0x%.2X", mss_65thByte[l_initPattern][l_loop]);
+            FAPI_INF("Expected: bit0 (Checkbit0_1), bit1(Tag0_2), bit2(Tag1_3), bit3(MDI) = 0x%.2X", mss_65thByte[l_dramWidth][l_initPattern][l_loop]);
 
             // DO XOR of actual and expected data
-            l_tmp_65th_byte_diff = l_tag_MDI ^ mss_65thByte[l_initPattern][l_loop];
+            l_tmp_65th_byte_diff = l_tag_MDI ^ mss_65thByte[l_dramWidth][l_initPattern][l_loop];
             FAPI_INF("***************************************** l_tmp_65th_byte_diff: 0x%.2X", l_tmp_65th_byte_diff);
 
 
             // Check for mismatch in bit 0: Checkbit0_1
             if (l_tmp_65th_byte_diff & 0x80)
             {
-              // Checkbit0_1 maps to port0 bit 64, which is on byte8
-              o_bad_bits[0][8] |= 0x80;
+                // Checkbit0_1 maps to port0 bit 64, which is on byte8
+                o_bad_bits[0][8] |= 0x80;
             }
 
             // Check for mismatch in bit 1: Tag0_2
             if (l_tmp_65th_byte_diff & 0x40)
             {
-              // Tag0_2 maps to port0 bit 65, which is on byte8
-              o_bad_bits[0][8] |= 0x40;
+                // Tag0_2 maps to port0 bit 65, which is on byte8
+                o_bad_bits[0][8] |= 0x40;
             }
 
             // Check for mismatch in bit 2: Tag1_3
             if (l_tmp_65th_byte_diff & 0x20)
             {
-              // Tag1_3 maps to port0 bit 64, which is on byte8
-              o_bad_bits[0][8] |= 0x80;
+                // Tag1_3 maps to port0 bit 64, which is on byte8
+                o_bad_bits[0][8] |= 0x80;
             }
 
             // Check for mismatch in bit 3: MDI
             if (l_tmp_65th_byte_diff & 0x10)
             {
-              // MDI maps to port0 bit 65, which is on byte8
-              o_bad_bits[0][8] |= 0x40;
+                // MDI maps to port0 bit 65, which is on byte8
+                o_bad_bits[0][8] |= 0x40;
             }
-          } // End loops through trapped 65th byte info
-
+        } // End loops through trapped 65th byte info
 
-          //----------------------------------------------------
-          // ECC: Do XOR of expected and actual ECC bits to find stuck bits
-          //----------------------------------------------------
+        
+        //----------------------------------------------------
+        // ECC: Do XOR of expected and actual ECC bits to find stuck bits
+        //----------------------------------------------------
 
-          for(l_loop=0; l_loop<4; l_loop++ )
-          {
+        for(l_loop=0; l_loop<4; l_loop++ )
+        {
             l_ECC = 0;
-
+        
             l_rc = fapiGetScom(i_target, maintBufferRead65thByteRegs[l_UE_trap][l_loop], l_data);
             if(l_rc) return l_rc;
 
@@ -6292,107 +7015,225 @@ static const uint32_t maintBuffer65thRegs[4][2]={
             l_ecmd_rc |= l_data.extractPreserve(&l_ECC, 4, 28, 4);
             if(l_ecmd_rc)
             {
-              l_rc.setEcmdError(l_ecmd_rc);
-              return l_rc;
+                l_rc.setEcmdError(l_ecmd_rc);
+                return l_rc;
             }
 
             FAPI_INF("Actual:   ECC = 0x%.8X", l_ECC);
 
-            FAPI_INF("Expected: ECC = 0x%.8X", mss_ECC[l_initPattern][l_loop]);
+            FAPI_INF("Expected: ECC = 0x%.8X", mss_ECC[l_dramWidth][l_initPattern][l_loop]);
 
             // DO XOR of actual and expected data
-            l_tmp_ECC_diff |= l_ECC ^ mss_ECC[l_initPattern][l_loop];
+            l_tmp_ECC_diff |= l_ECC ^ mss_ECC[l_dramWidth][l_initPattern][l_loop];
             FAPI_INF("***************************************** l_tmp_ECC_diff: 0x%.8X", l_tmp_ECC_diff);
-          }
+        }
 
-          // Put l_tmp_ECC_diff into a ecmdDataBufferBase to make it easier
-          // to get into o_bad_bits
-          l_ecmd_rc |= l_ECC_diff.insert(l_tmp_ECC_diff, 0, 32, 0);
-          if(l_ecmd_rc)
-          {
+        // Put l_tmp_ECC_diff into a ecmdDataBufferBase to make it easier
+        // to get into o_bad_bits
+        l_ecmd_rc |= l_ECC_diff.insert(l_tmp_ECC_diff, 0, 32, 0);
+        if(l_ecmd_rc)
+        {
             l_rc.setEcmdError(l_ecmd_rc);
             return l_rc;
-          }
+        }
 
-          l_ecmd_rc |= l_ECC_diff.extractPreserve(&l_ECC_c6_c5_c4_01, 4, 6, 8-6);
-          l_ecmd_rc |= l_ECC_diff.extractPreserve(&l_ECC_c6_c5_c4_23, 10, 6, 8-6);
-          l_ecmd_rc |= l_ECC_diff.extractPreserve(&l_ECC_c3_c2_c1_c0_01, 16, 8, 0);
-          l_ecmd_rc |= l_ECC_diff.extractPreserve(&l_ECC_c3_c2_c1_c0_23, 24, 8, 0);
-          if(l_ecmd_rc)
-          {
+        l_ecmd_rc |= l_ECC_diff.extractPreserve(&l_ECC_c6_c5_c4_01, 4, 6, 8-6);
+        l_ecmd_rc |= l_ECC_diff.extractPreserve(&l_ECC_c6_c5_c4_23, 10, 6, 8-6);
+        l_ecmd_rc |= l_ECC_diff.extractPreserve(&l_ECC_c3_c2_c1_c0_01, 16, 8, 0);
+        l_ecmd_rc |= l_ECC_diff.extractPreserve(&l_ECC_c3_c2_c1_c0_23, 24, 8, 0);
+        if(l_ecmd_rc)
+        {
             l_rc.setEcmdError(l_ecmd_rc);
             return l_rc;
-          }
+        }
 
-          // The 6 bits of ECC_c6_c5_c4 maps to byte8 on port0
-          o_bad_bits[0][8] |= l_ECC_c6_c5_c4_01 | l_ECC_c6_c5_c4_23;
-          // The 8 bits of ECC_c3_c2_c1_c0 maps to byte8 byte on port1
-          o_bad_bits[1][8] |= l_ECC_c3_c2_c1_c0_01 | l_ECC_c3_c2_c1_c0_23;
+        // The 6 bits of ECC_c6_c5_c4 maps to byte8 on port0
+        o_bad_bits[0][8] |= l_ECC_c6_c5_c4_01 | l_ECC_c6_c5_c4_23;
+        // The 8 bits of ECC_c3_c2_c1_c0 maps to byte8 byte on port1
+        o_bad_bits[1][8] |= l_ECC_c3_c2_c1_c0_01 | l_ECC_c3_c2_c1_c0_23;
 
 
-          //----------------------------------------------------
-          // Spare: Mark byte9 bad if bad bits found in position being steered
-          //----------------------------------------------------
+        //----------------------------------------------------
+        // Spare: Mark byte9 bad if bad bits found in position being steered
+        //----------------------------------------------------
 
-          // READ steer mux, which gets me a symbol for port0 and port1
-          l_rc = mss_check_steering(i_target,
-                                    i_rank,
-                                    l_dramSparePort0Symbol,
-                                    l_dramSparePort1Symbol,
-                                    l_eccSpareSymbol);
-          if(l_rc) return l_rc;
+        // READ steer mux, which gets me a symbol for port0 and port1
+        l_rc = mss_check_steering(i_target,
+                                  i_rank,
+                                  l_dramSparePort0Symbol,
+                                  l_dramSparePort1Symbol,
+                                  l_eccSpareSymbol);
+        if(l_rc) return l_rc;
+        
 
-          // If steering on port0
-          if ( l_dramSparePort0Symbol != 0xff)
-          {
-            // Find the byte being steered
-            l_byte = mss_x8_chip_mark_to_centaurDQ[l_dramSparePort0Symbol/4][0]/8;
+        //----------------------------
+        // x8
+        //----------------------------
+        if (l_dramWidth == 0)
+        {
+            // If steering on port0
+            if ( l_dramSparePort0Symbol != 0xff)
+            {
+                // Find the byte being steered
+                l_byte = mss_x8_chip_mark_to_centaurDQ[l_dramSparePort0Symbol/4][0]/8;
+
+                // If that byte has any bad bits in it, copy them to byte9,
+                if (o_bad_bits[0][l_byte])
+                {
+                    o_bad_bits[0][9] = o_bad_bits[0][l_byte];
+
+                    // Clear byte being steered, since it did not contribute to UE
+                    o_bad_bits[0][l_byte] = 0;
+                }
+            }
 
-            // If that byte has any bad bits in it, copy them to byte9,
-            if (o_bad_bits[0][l_byte])
+            // If steering on port1
+            if ( l_dramSparePort1Symbol != 0xff)
             {
-              o_bad_bits[0][9] = o_bad_bits[0][l_byte];
+                // Find the byte being steered
+                l_byte = mss_x8_chip_mark_to_centaurDQ[l_dramSparePort1Symbol/4][0]/8;
 
-            // Clear byte being steered, since it did not contribute to UE
-              o_bad_bits[0][l_byte] = 0;
+                // If that byte has any bad bits in it, copy them to byte9,
+                if (o_bad_bits[1][l_byte])
+                {
+                    o_bad_bits[1][9] = o_bad_bits[1][l_byte];
+
+                    // Clear byte being steered, since it did not contribute to UE
+                    o_bad_bits[1][l_byte] = 0;
+                }
             }
-          }
+        }
 
-          // If steering on port1
-          if ( l_dramSparePort1Symbol != 0xff)
-          {
-            // Find the byte being steered
-            l_byte = mss_x8_chip_mark_to_centaurDQ[l_dramSparePort1Symbol/4][0]/8;
+        //----------------------------
+        // x4
+        //----------------------------
+        else
+        {
+            // If steering on port0
+            if ( l_dramSparePort0Symbol != 0xff)
+            {
+                // Find the nibble being steered (0-17)
+                l_nibble = mss_x4_chip_mark_to_centaurDQ[l_dramSparePort0Symbol/2][0]/4;
 
-            // If that byte has any bad bits in it, copy them to byte9,
-            if (o_bad_bits[1][l_byte])
+                // If odd nibble (1,3,5,7,9,11,13,15,17)
+                if (l_nibble % 2)
+                {
+                    // If that nibble has any bad bits in it, copy them to byte9,
+                    if (o_bad_bits[0][l_nibble/2] & 0x0f)
+                    {
+                        o_bad_bits[0][9] = (o_bad_bits[0][l_nibble/2] << 4) & 0xf0;
+
+                        // Clear nibble being steered, since it did not contribute to UE
+                        o_bad_bits[0][l_nibble/2] &= 0xf0;
+                    }
+                }
+                
+                // Else even nibble (0,2,4,6,8,10,12,14,16)
+                else
+                {
+                    // If that nibble has any bad bits in it, copy them to byte9,
+                    if (o_bad_bits[0][l_nibble/2] & 0xf0)
+                    {
+                        o_bad_bits[0][9] = o_bad_bits[0][l_nibble/2] & 0xf0;
+
+                        // Clear nibble being steered, since it did not contribute to UE
+                        o_bad_bits[0][l_nibble/2] &= 0x0f;
+                    }
+                }                        
+            }
+
+            // If steering on port1
+            if ( l_dramSparePort1Symbol != 0xff)
             {
-              o_bad_bits[1][9] = o_bad_bits[1][l_byte];
+                // Find the nibble being steered (0-17)
+                l_nibble = mss_x4_chip_mark_to_centaurDQ[l_dramSparePort1Symbol/2][0]/4;
+
+                // If odd nibble (1,3,5,7,9,11,13,15,17)
+                if (l_nibble % 2)
+                {
+                    // If that nibble has any bad bits in it, copy them to byte9,
+                    if (o_bad_bits[1][l_nibble/2] & 0x0f)
+                    {
+                        o_bad_bits[1][9] = (o_bad_bits[1][l_nibble/2] << 4) & 0xf0;
 
-              // Clear byte being steered, since it did not contribute to UE
-              o_bad_bits[1][l_byte] = 0;
+                        // Clear nibble being steered, since it did not contribute to UE
+                        o_bad_bits[1][l_nibble/2] &= 0xf0;
+                    }
+                }
+                
+                // Else even nibble (0,2,4,6,8,10,12,14,16)
+                else
+                {
+                    // If that nibble has any bad bits in it, copy them to byte9,
+                    if (o_bad_bits[1][l_nibble/2] & 0xf0)
+                    {
+                        o_bad_bits[1][9] = o_bad_bits[1][l_nibble/2] & 0xf0;
+
+                        // Clear nibble being steered, since it did not contribute to UE
+                        o_bad_bits[1][l_nibble/2] &= 0x0f;
+                    }
+                }                        
             }
-          }
 
-          //----------------------------------------------------
-          // Show results
-          //----------------------------------------------------
 
-          FAPI_ERR("WARNING: IPL UE isolation results for rank = %d on %s.", i_rank, i_target.toEcmdString());
-          FAPI_ERR("WARNING: Expected pattern = 0x%.8X", mss_maintBufferData[l_initPattern][0][0]);
-          for(l_port=0; l_port<2; l_port++ )
-          {
+            // If ecc spare used
+            if ( l_eccSpareSymbol != 0xff)
+            {
+                // Find the nibble being steered (0-17)
+                l_nibble = mss_x4_chip_mark_to_centaurDQ[l_eccSpareSymbol/2][0]/4;
+
+                // Find the port being steered (0,1)
+                l_port = mss_x4_chip_mark_to_centaurDQ[l_eccSpareSymbol/2][1];
+
+                // If odd nibble (1,3,5,7,9,11,13,15,17)
+                if (l_nibble % 2)
+                {
+                    // If that nibble has any bad bits in it, copy them to port1,nibble 17
+                    if (o_bad_bits[l_port][l_nibble/2] & 0x0f)
+                    {
+                        o_bad_bits[1][8] |= o_bad_bits[l_port][l_nibble/2] & 0x0f;
+
+                        // Clear nibble being steered, since it did not contribute to UE
+                        o_bad_bits[l_port][l_nibble/2] &= 0xf0;
+                    }
+                }
+                
+                // Else even nibble (0,2,4,6,8,10,12,14,16)
+                else
+                {
+                    // If that nibble has any bad bits in it, copy them to port1,nibble 17
+                    if (o_bad_bits[l_port][l_nibble/2] & 0xf0)
+                    {
+                        o_bad_bits[1][8] |= (o_bad_bits[l_port][l_nibble/2] >> 4) & 0x0f;
+
+                        // Clear nibble being steered, since it did not contribute to UE
+                        o_bad_bits[l_port][l_nibble/2] &= 0x0f;
+                    }
+                }                        
+            }
+        }
+
+
+
+        //----------------------------------------------------
+        // Show results
+        //----------------------------------------------------
+
+        FAPI_ERR("WARNING: IPL UE isolation results for rank = %d on %s.", i_rank, i_target.toEcmdString());
+        FAPI_ERR("WARNING: Expected pattern = 0x%.8X", mss_maintBufferData[l_dramWidth][l_initPattern][0][0]);
+        for(l_port=0; l_port<2; l_port++ )
+        {
             for(l_byte=0; l_byte<10; l_byte++ )
             {
-              FAPI_ERR("WARNING: o_bad_bits[port%d][byte%d] = %02x",
+                FAPI_ERR("WARNING: o_bad_bits[port%d][byte%d] = %02x",
                        l_port, l_byte, o_bad_bits[l_port][l_byte]);
             }
-          }
+        }
 
 
-          FAPI_INF("EXIT mss_IPL_UE_isolation()");
+        FAPI_INF("EXIT mss_IPL_UE_isolation()");
 
-          return l_rc;
+        return l_rc;
 
 
     }
diff --git a/src/usr/hwpf/hwp/utility_procedures/mss_unmask_errors.C b/src/usr/hwpf/hwp/utility_procedures/mss_unmask_errors.C
index 5e52c1d4f..9fb6ba757 100644
--- a/src/usr/hwpf/hwp/utility_procedures/mss_unmask_errors.C
+++ b/src/usr/hwpf/hwp/utility_procedures/mss_unmask_errors.C
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: mss_unmask_errors.C,v 1.6 2014/03/11 03:07:42 gollub Exp $
+// $Id: mss_unmask_errors.C,v 1.8 2014/04/08 16:15:56 gollub Exp $
 //------------------------------------------------------------------------------
 // Don't forget to create CVS comments when you check in your changes!
 //------------------------------------------------------------------------------
@@ -38,6 +38,32 @@
 //         |          |         | to use cmd complete attention instead.
 //   1.5   | 10/31/13 | gollub  | For DD1 use MBSPA[8], for DD2 using MBSPA[0].
 //   1.6   | 10/03/14 | gollub  | Unmkask MBS_FIR_REG[15]: dir_ce for DD2 only
+//   1.7   |07-APR-14 | gollub  | Added mss_unmask_pervasive_errors
+//         |          |         | TP_PERV_LFIR: 0,13,14 change to recoverable unmask
+//         |          |         | NEST_PERV_LFIR: 0 changed to recoverable unmask
+//         |          |         | MEM_PERV_LFIR: 0 changed to recoverable unmask
+//         |          |         |
+//         |          |         | MBS_FIR_REG: 29,30 change to recoverable unmask
+//         |          |         | MBECCFIR: 48,50,51 change to recoverable unmask
+//         |          |         | MBSFIR: 15,16 change to recoverable unmask
+//         |          |         | SCAC_LFIR: 35,35 change to recoverable unmask
+//         |          |         | MBAFIR 7 changed to channel checkstop
+//         |          |         | MBAFIR 15,16 change to recoverable unmask
+//         |          |         | DDRPHY_FIR_REG 53 change to recoverable unmask
+//         |          |         | MBACALFIR 19,20,21 change to recoverable unmask
+//         |          |         |
+//         |          |         | MBS_FIR_REG 6 changed to channel checkstop
+//         |          |         | MBSFIR 0 changed to channel checkstop
+//         |          |         | MBAFIR 3,5 changed to channel checkstop
+//         |          |         | MBACALFIR 13,18 changed to channel checkstop
+//         |          |         |
+//         |          |         | New DD2: MBS_FIR_REG 29 recoverable masked
+//         |          |         | New DD2: MBS_FIR_REG 30 channel checkstop unmasked
+//         |          |         | New DD2: MBSFIR 2 recoverable masked
+//         |          |         | New DD2: MBSFIR 3 recoverable masked
+//         |          |         | New DD2: MBAFIR 8 channel checkstop unmasked
+//         |          |         | New DD2: MBACALFIR 20,21,22 recoverable masked
+//   1.8   |08-APR-14 | gollub  | Removed debug trace
 
 //------------------------------------------------------------------------------
 //  Includes
@@ -54,6 +80,384 @@ using namespace fapi;
         
 
 //------------------------------------------------------------------------------
+// mss_unmask_pervasive_errors
+//------------------------------------------------------------------------------
+                                           
+fapi::ReturnCode mss_unmask_pervasive_errors( const fapi::Target & i_target,
+                                              fapi::ReturnCode i_bad_rc )
+                                           
+{
+
+    FAPI_INF("ENTER mss_unmask_pervasive_errors()"); 
+    
+    fapi::ReturnCode l_rc;
+    uint32_t l_ecmd_rc = 0;            
+
+    //*************************
+    //*************************
+    // TP_PERV_LFIR
+    //*************************
+    //*************************
+
+    ecmdDataBufferBase l_tp_perv_lfir_mask_or(64);    
+    ecmdDataBufferBase l_tp_perv_lfir_mask_and(64);
+    ecmdDataBufferBase l_tp_perv_lfir_action0(64);
+    ecmdDataBufferBase l_tp_perv_lfir_action1(64);
+        
+    // TODO: Here is where I could clear bits that were bogus, before I unmask 
+    //       them. But typically we are expecting the bit set at this point
+    //       to be valid errors for PRD to log.
+
+
+    //(Action0, Action1, Mask)
+    //
+    // (0,0,0) = checkstop
+    // (0,1,0) = recoverable error
+    // (1,0,0) = report unused
+    // (1,1,0) = machine check
+    // (x,x,1) = error is masked
+
+
+    // Read action0
+    l_rc = fapiGetScom_w_retry(i_target, TP_PERV_LFIR_ACT0_0x01040010, l_tp_perv_lfir_action0);
+    if(l_rc)
+    {
+        // Log passed in error before returning with new error
+        if (i_bad_rc) fapiLogError(i_bad_rc);        
+        return l_rc;
+    }
+
+    // Read action1
+    l_rc = fapiGetScom_w_retry(i_target, TP_PERV_LFIR_ACT1_0x01040011, l_tp_perv_lfir_action1);
+    if(l_rc)
+    {
+        // Log passed in error before returning with new error
+        if (i_bad_rc) fapiLogError(i_bad_rc);        
+        return l_rc;
+    }
+
+
+    l_ecmd_rc |= l_tp_perv_lfir_mask_or.flushTo0();
+    l_ecmd_rc |= l_tp_perv_lfir_mask_and.flushTo1();
+
+    // 0	CFIR internal parity error		    recoverable	    unmask
+    l_ecmd_rc |= l_tp_perv_lfir_action0.clearBit(0);     
+    l_ecmd_rc |= l_tp_perv_lfir_action1.setBit(0);
+    l_ecmd_rc |= l_tp_perv_lfir_mask_and.clearBit(0);
+
+    // 1	GPIO (PCB error)	        		recoverable 	mask (forever)
+    // 2	CC (PCB error)		        		recoverable 	mask (forever)
+    // 3	CC (OPCG, parity, scan collision)	recoverable 	mask (forever)
+    // 4	PSC (PCB error)				        recoverable 	mask (forever)
+    // 5	PSC (parity error)			        recoverable 	mask (forever)
+    // 6	Thermal (parity error)			    recoverable 	mask (forever)
+    // 7	Thermal (PCB error)			        recoverable 	mask (forever)
+    // 8	Thermal (critical Trip error)		recoverable 	mask (forever)
+    // 9	Thermal (fatal Trip error)		    recoverable 	mask (forever)
+    // 10	Thermal (Voltage trip error)		recoverable 	mask (forever)
+    // 11	Trace Array				            recoverable 	mask (forever)
+    // 12	Trace Array				            recoverable 	mask (forever)
+    l_ecmd_rc |= l_tp_perv_lfir_action0.clearBit(1,12);     
+    l_ecmd_rc |= l_tp_perv_lfir_action1.setBit(1,12);
+    l_ecmd_rc |= l_tp_perv_lfir_mask_or.setBit(1,12);
+    
+    // 13	ITR 				                recoverable 	unmask
+    l_ecmd_rc |= l_tp_perv_lfir_action0.clearBit(13);     
+    l_ecmd_rc |= l_tp_perv_lfir_action1.setBit(13);
+    l_ecmd_rc |= l_tp_perv_lfir_mask_and.clearBit(13);
+
+    // 14	ITR 				                recoverable 	unmask
+    l_ecmd_rc |= l_tp_perv_lfir_action0.clearBit(14);     
+    l_ecmd_rc |= l_tp_perv_lfir_action1.setBit(14);
+    l_ecmd_rc |= l_tp_perv_lfir_mask_and.clearBit(14);
+
+
+    // 15	ITR (itr_tc_pcbsl_slave_fir_err)	recoverable 	mask (forever)
+    // 16	PIB					                recoverable 	mask (forever)
+    // 17	PIB					                recoverable 	mask (forever)
+    // 18	PIB					                recoverable 	mask (forever)
+    l_ecmd_rc |= l_tp_perv_lfir_action0.clearBit(15,4);     
+    l_ecmd_rc |= l_tp_perv_lfir_action1.setBit(15,4);
+    l_ecmd_rc |= l_tp_perv_lfir_mask_or.setBit(15,4);
+
+
+    // NOTE: 19 and 20 already cleared and unmasked in cen_mem_pll_setup.C
+    // 19	nest PLLlock				        recoverable 	unmask
+    // 20	mem PLLlock				            recoverable 	unmask
+
+    // 21:39	unused local errors		        recoverable 	mask (forever)
+    // 40	local xstop in another chiplet		recoverable 	mask (forever)
+    l_ecmd_rc |= l_tp_perv_lfir_action0.clearBit(21,20);     
+    l_ecmd_rc |= l_tp_perv_lfir_action1.setBit(21,20);
+    l_ecmd_rc |= l_tp_perv_lfir_mask_or.setBit(21,20);
+
+    // 41:63	Reserved			not implemented, so won't touch these
+
+    
+    if(l_ecmd_rc)
+    {
+        // Log passed in error before returning with new error
+        if (i_bad_rc) fapiLogError(i_bad_rc);        
+
+        l_rc.setEcmdError(l_ecmd_rc);
+        return l_rc;
+    }                                                                              
+
+    // Write action0
+    l_rc = fapiPutScom_w_retry(i_target, TP_PERV_LFIR_ACT0_0x01040010, l_tp_perv_lfir_action0);
+    if(l_rc)
+    {
+        // Log passed in error before returning with new error
+        if (i_bad_rc) fapiLogError(i_bad_rc);        
+        return l_rc;
+    }
+
+    // Write action1
+    l_rc = fapiPutScom_w_retry(i_target, TP_PERV_LFIR_ACT1_0x01040011, l_tp_perv_lfir_action1);
+    if(l_rc)
+    {
+        // Log passed in error before returning with new error
+        if (i_bad_rc) fapiLogError(i_bad_rc);        
+        return l_rc;
+    }
+
+    
+    // Write mask OR
+    l_rc = fapiPutScom_w_retry(i_target, TP_PERV_LFIR_MASK_OR_0x0104000F, l_tp_perv_lfir_mask_or); 
+    if(l_rc)
+    {
+        // Log passed in error before returning with new error
+        if (i_bad_rc) fapiLogError(i_bad_rc);        
+        return l_rc;
+    }
+
+    // Write mask AND
+    l_rc = fapiPutScom_w_retry(i_target,  TP_PERV_LFIR_MASK_AND_0x0104000E, l_tp_perv_lfir_mask_and); 
+    if(l_rc)
+    {
+        // Log passed in error before returning with new error
+        if (i_bad_rc) fapiLogError(i_bad_rc);        
+        return l_rc;
+    }
+
+
+    //*************************
+    //*************************
+    // NEST_PERV_LFIR
+    //*************************
+    //*************************
+
+    ecmdDataBufferBase l_nest_perv_lfir_mask_or(64);    
+    ecmdDataBufferBase l_nest_perv_lfir_mask_and(64);
+    ecmdDataBufferBase l_nest_perv_lfir_action0(64);
+    ecmdDataBufferBase l_nest_perv_lfir_action1(64);
+        
+    // TODO: Here is where I could clear bits that were bogus, before I unmask 
+    //       them. But typically we are expecting the bit set at this point
+    //       to be valid errors for PRD to log.
+
+
+    //(Action0, Action1, Mask)
+    //
+    // (0,0,0) = checkstop
+    // (0,1,0) = recoverable error
+    // (1,0,0) = report unused
+    // (1,1,0) = machine check
+    // (x,x,1) = error is masked
+
+    l_ecmd_rc |= l_nest_perv_lfir_action0.flushTo0();
+    l_ecmd_rc |= l_nest_perv_lfir_action1.flushTo0();
+    l_ecmd_rc |= l_nest_perv_lfir_mask_or.flushTo0();
+    l_ecmd_rc |= l_nest_perv_lfir_mask_and.flushTo1();
+
+    // 0	CFIR internal parity error		    recoverable	    unmask
+    l_ecmd_rc |= l_nest_perv_lfir_action0.clearBit(0);     
+    l_ecmd_rc |= l_nest_perv_lfir_action1.setBit(0);
+    l_ecmd_rc |= l_nest_perv_lfir_mask_and.clearBit(0);
+
+    // 1	GPIO (PCB error)	        		recoverable 	mask (forever)
+    // 2	CC (PCB error)		        		recoverable 	mask (forever)
+    // 3	CC (OPCG, parity, scan collision)	recoverable 	mask (forever)
+    // 4	PSC (PCB error)				        recoverable 	mask (forever)
+    // 5	PSC (parity error)			        recoverable 	mask (forever)
+    // 6	Thermal (parity error)			    recoverable 	mask (forever)
+    // 7	Thermal (PCB error)			        recoverable 	mask (forever)
+    // 8	Thermal (critical Trip error)		recoverable 	mask (forever)
+    // 9	Thermal (fatal Trip error)		    recoverable 	mask (forever)
+    // 10	Thermal (Voltage trip error)		recoverable 	mask (forever)
+    // 11	Trace Array				            recoverable 	mask (forever)
+    // 12	Trace Array				            recoverable 	mask (forever)
+    // 13:39	unused local errors		        recoverable 	mask (forever)
+    // 40	local xstop in another chiplet		recoverable 	mask (forever)
+    l_ecmd_rc |= l_nest_perv_lfir_action0.clearBit(1,40);     
+    l_ecmd_rc |= l_nest_perv_lfir_action1.setBit(1,40);
+    l_ecmd_rc |= l_nest_perv_lfir_mask_or.setBit(1,40);
+
+    // 41:63	Reserved			not implemented, so won't touch these
+
+    
+    if(l_ecmd_rc)
+    {
+        // Log passed in error before returning with new error
+        if (i_bad_rc) fapiLogError(i_bad_rc);        
+
+        l_rc.setEcmdError(l_ecmd_rc);
+        return l_rc;
+    }                                                                              
+
+    // Write action0
+    l_rc = fapiPutScom_w_retry(i_target, NEST_PERV_LFIR_ACT0_0x02040010, l_nest_perv_lfir_action0);
+    if(l_rc)
+    {
+        // Log passed in error before returning with new error
+        if (i_bad_rc) fapiLogError(i_bad_rc);        
+        return l_rc;
+    }
+
+    // Write action1
+    l_rc = fapiPutScom_w_retry(i_target, NEST_PERV_LFIR_ACT1_0x02040011, l_nest_perv_lfir_action1);
+    if(l_rc)
+    {
+        // Log passed in error before returning with new error
+        if (i_bad_rc) fapiLogError(i_bad_rc);        
+        return l_rc;
+    }
+
+    
+    // Write mask OR
+    l_rc = fapiPutScom_w_retry(i_target, NEST_PERV_LFIR_MASK_OR_0x0204000F, l_nest_perv_lfir_mask_or); 
+    if(l_rc)
+    {
+        // Log passed in error before returning with new error
+        if (i_bad_rc) fapiLogError(i_bad_rc);        
+        return l_rc;
+    }
+
+    // Write mask AND
+    l_rc = fapiPutScom_w_retry(i_target,  NEST_PERV_LFIR_MASK_AND_0x0204000E, l_nest_perv_lfir_mask_and); 
+    if(l_rc)
+    {
+        // Log passed in error before returning with new error
+        if (i_bad_rc) fapiLogError(i_bad_rc);        
+        return l_rc;
+    }
+
+
+    //*************************
+    //*************************
+    // MEM_PERV_LFIR
+    //*************************
+    //*************************
+
+    ecmdDataBufferBase l_mem_perv_lfir_mask_or(64);    
+    ecmdDataBufferBase l_mem_perv_lfir_mask_and(64);
+    ecmdDataBufferBase l_mem_perv_lfir_action0(64);
+    ecmdDataBufferBase l_mem_perv_lfir_action1(64);
+        
+    // TODO: Here is where I could clear bits that were bogus, before I unmask 
+    //       them. But typically we are expecting the bit set at this point
+    //       to be valid errors for PRD to log.
+
+
+    //(Action0, Action1, Mask)
+    //
+    // (0,0,0) = checkstop
+    // (0,1,0) = recoverable error
+    // (1,0,0) = report unused
+    // (1,1,0) = machine check
+    // (x,x,1) = error is masked
+
+    l_ecmd_rc |= l_mem_perv_lfir_action0.flushTo0();
+    l_ecmd_rc |= l_mem_perv_lfir_action1.flushTo0();
+    l_ecmd_rc |= l_mem_perv_lfir_mask_or.flushTo0();
+    l_ecmd_rc |= l_mem_perv_lfir_mask_and.flushTo1();
+
+    // 0	CFIR internal parity error		    recoverable	    unmask
+    l_ecmd_rc |= l_mem_perv_lfir_action0.clearBit(0);     
+    l_ecmd_rc |= l_mem_perv_lfir_action1.setBit(0);
+    l_ecmd_rc |= l_mem_perv_lfir_mask_and.clearBit(0);
+
+    // 1	GPIO (PCB error)	        		recoverable 	mask (forever)
+    // 2	CC (PCB error)		        		recoverable 	mask (forever)
+    // 3	CC (OPCG, parity, scan collision)	recoverable 	mask (forever)
+    // 4	PSC (PCB error)				        recoverable 	mask (forever)
+    // 5	PSC (parity error)			        recoverable 	mask (forever)
+    // 6	Thermal (parity error)			    recoverable 	mask (forever)
+    // 7	Thermal (PCB error)			        recoverable 	mask (forever)
+    // 8	Thermal (critical Trip error)		recoverable 	mask (forever)
+    // 9	Thermal (fatal Trip error)		    recoverable 	mask (forever)
+    // 10	Thermal (Voltage trip error)		recoverable 	mask (forever)
+    // 11	mba01 Trace Array		            recoverable 	mask (forever)
+    // 12	mba01 Trace Array		            recoverable 	mask (forever)
+    // 13	mba23 Trace Array		            recoverable 	mask (forever)
+    // 14	mba23 Trace Array		            recoverable 	mask (forever)
+    // 15:39	unused local errors		        recoverable 	mask (forever)
+    // 40	local xstop in another chiplet		recoverable 	mask (forever)
+    l_ecmd_rc |= l_mem_perv_lfir_action0.clearBit(1,40);     
+    l_ecmd_rc |= l_mem_perv_lfir_action1.setBit(1,40);
+    l_ecmd_rc |= l_mem_perv_lfir_mask_or.setBit(1,40);
+
+    // 41:63	Reserved			not implemented, so won't touch these
+
+    
+    if(l_ecmd_rc)
+    {
+        // Log passed in error before returning with new error
+        if (i_bad_rc) fapiLogError(i_bad_rc);        
+
+        l_rc.setEcmdError(l_ecmd_rc);
+        return l_rc;
+    }                                                                              
+
+    // Write action0
+    l_rc = fapiPutScom_w_retry(i_target, MEM_PERV_LFIR_ACT0_0x03040010, l_mem_perv_lfir_action0);
+    if(l_rc)
+    {
+        // Log passed in error before returning with new error
+        if (i_bad_rc) fapiLogError(i_bad_rc);        
+        return l_rc;
+    }
+
+    // Write action1
+    l_rc = fapiPutScom_w_retry(i_target, MEM_PERV_LFIR_ACT1_0x03040011, l_mem_perv_lfir_action1);
+    if(l_rc)
+    {
+        // Log passed in error before returning with new error
+        if (i_bad_rc) fapiLogError(i_bad_rc);        
+        return l_rc;
+    }
+
+    
+    // Write mask OR
+    l_rc = fapiPutScom_w_retry(i_target, MEM_PERV_LFIR_MASK_OR_0x0304000F, l_mem_perv_lfir_mask_or); 
+    if(l_rc)
+    {
+        // Log passed in error before returning with new error
+        if (i_bad_rc) fapiLogError(i_bad_rc);        
+        return l_rc;
+    }
+
+    // Write mask AND
+    l_rc = fapiPutScom_w_retry(i_target,  MEM_PERV_LFIR_MASK_AND_0x0304000E, l_mem_perv_lfir_mask_and); 
+    if(l_rc)
+    {
+        // Log passed in error before returning with new error
+        if (i_bad_rc) fapiLogError(i_bad_rc);        
+        return l_rc;
+    }
+
+
+    
+    
+    FAPI_INF("EXIT mss_unmask_pervasive_errors()"); 
+
+    return i_bad_rc;
+}
+
+
+
+
+//------------------------------------------------------------------------------
 // mss_unmask_inband_errors
 //------------------------------------------------------------------------------
                                            
@@ -62,7 +466,7 @@ fapi::ReturnCode mss_unmask_inband_errors( const fapi::Target & i_target,
                                            
 {
 
-    FAPI_INF("ENTER mss_unmask_inband_errors()");
+    FAPI_INF("ENTER mss_unmask_inband_errors()"); 
     
     fapi::ReturnCode l_rc;
     uint32_t l_ecmd_rc = 0;            
@@ -79,6 +483,18 @@ fapi::ReturnCode mss_unmask_inband_errors( const fapi::Target & i_target,
     ecmdDataBufferBase l_mbs_fir_action0(64);
     ecmdDataBufferBase l_mbs_fir_action1(64);
     
+    uint8_t l_dd2_fir_bit_defn_changes = 0;
+
+    // Get attribute that tells us if mbspa 0 cmd complete attention is fixed for dd2    
+    l_rc = FAPI_ATTR_GET(ATTR_CENTAUR_EC_DD2_FIR_BIT_DEFN_CHANGES, &i_target, l_dd2_fir_bit_defn_changes);
+    if(l_rc)
+    {
+        FAPI_ERR("Error getting ATTR_CENTAUR_EC_DD2_FIR_BIT_DEFN_CHANGES");
+        // Log passed in error before returning with new error
+        if (i_bad_rc) fapiLogError(i_bad_rc);                
+        return l_rc;
+    }        
+    
     // Read mask 
     l_rc = fapiGetScom_w_retry(i_target, MBS_FIR_MASK_REG_0x02011403, l_mbs_fir_mask); 
     if(l_rc)
@@ -136,9 +552,10 @@ fapi::ReturnCode mss_unmask_inband_errors( const fapi::Target & i_target,
     l_ecmd_rc |= l_mbs_fir_action1.setBit(5);
     l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(5);
 
-    // 6    int_buffer_ue           recoverable         unmask
+    // 6    int_buffer_ue           channel checkstop   unmask
+    // HW278850: 8B ecc UE from SRB,PFB not transformed to SUE when allocating into L4
     l_ecmd_rc |= l_mbs_fir_action0.clearBit(6);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(6);
+    l_ecmd_rc |= l_mbs_fir_action1.clearBit(6);
     l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(6);
 
     // 7    int_buffer_sue          recoverable         mask (forever)
@@ -252,17 +669,55 @@ fapi::ReturnCode mss_unmask_inband_errors( const fapi::Target & i_target,
     l_ecmd_rc |= l_mbs_fir_action1.setBit(28);
     l_ecmd_rc |= l_mbs_fir_mask_or.setBit(28);
 
-    // 29    internal_scom_error     recoverable         mask (tbd)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(29);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(29);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(29);
+    if (l_dd2_fir_bit_defn_changes)
+    {
+        // 29    dir_purge_ce		        recoverable          mask
+        l_ecmd_rc |= l_mbs_fir_action0.clearBit(29);            
+        l_ecmd_rc |= l_mbs_fir_action1.setBit(29);
+        l_ecmd_rc |= l_mbs_fir_mask_or.setBit(29);
+
+    	// 30    proximal_ce_ue             channel checkstop    mask (until unmask_fetch_errors)
+        l_ecmd_rc |= l_mbs_fir_action0.clearBit(30);            
+        l_ecmd_rc |= l_mbs_fir_action1.clearBit(30);
+        l_ecmd_rc |= l_mbs_fir_mask_or.setBit(30);
+
+        // 31    spare			            recoverable 	     mask
+        l_ecmd_rc |= l_mbs_fir_action0.clearBit(31);            
+        l_ecmd_rc |= l_mbs_fir_action1.setBit(31);
+        l_ecmd_rc |= l_mbs_fir_mask_or.setBit(31);
+        
+        // 32    spare			            recoverable 	     mask
+        l_ecmd_rc |= l_mbs_fir_action0.clearBit(32);            
+        l_ecmd_rc |= l_mbs_fir_action1.setBit(32);
+        l_ecmd_rc |= l_mbs_fir_mask_or.setBit(33);
+
+        // 33    internal_scom_error        recoverable          unmask
+        l_ecmd_rc |= l_mbs_fir_action0.clearBit(33);            
+        l_ecmd_rc |= l_mbs_fir_action1.setBit(33);
+        l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(33);
+
+        // 34    internal_scom_error_copy   recoverable          unmask
+        l_ecmd_rc |= l_mbs_fir_action0.clearBit(34);            
+        l_ecmd_rc |= l_mbs_fir_action1.setBit(34);
+        l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(34);
+
+        // 35:63    Reserved                not implemented, so won't touch these
+    }
+    
+    else
+    {
+        // 29    internal_scom_error     recoverable         unmask
+        l_ecmd_rc |= l_mbs_fir_action0.clearBit(29);            
+        l_ecmd_rc |= l_mbs_fir_action1.setBit(29);
+        l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(29);
 
-    // 30    internal_scom_error_copy recoverable        mask (tbd)
-    l_ecmd_rc |= l_mbs_fir_action0.clearBit(30);            
-    l_ecmd_rc |= l_mbs_fir_action1.setBit(30);
-    l_ecmd_rc |= l_mbs_fir_mask_or.setBit(30);
+        // 30    internal_scom_error_copy recoverable        unmask
+        l_ecmd_rc |= l_mbs_fir_action0.clearBit(30);            
+        l_ecmd_rc |= l_mbs_fir_action1.setBit(30);
+        l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(30);
 
-    // 31:63    Reserved                not implemented, so won't touch these
+        // 31:63    Reserved                not implemented, so won't touch these
+    }
     
     if(l_ecmd_rc)
     {
@@ -418,10 +873,10 @@ fapi::ReturnCode mss_unmask_ddrphy_errors( const fapi::Target & i_target,
     l_ecmd_rc |= l_ddrphy_fir_action1.setBit(52);
     l_ecmd_rc |= l_ddrphy_fir_mask_and.clearBit(52);
 
-    // 53   ddr01_fir_parity_err    recoverable         mask (forever)
+    // 53   ddr01_fir_parity_err    recoverable         unmask
     l_ecmd_rc |= l_ddrphy_fir_action0.clearBit(53);            
     l_ecmd_rc |= l_ddrphy_fir_action1.setBit(53);
-    l_ecmd_rc |= l_ddrphy_fir_mask_or.setBit(53);
+    l_ecmd_rc |= l_ddrphy_fir_mask_and.clearBit(53);
     
     // 54   Reserved                recoverable         mask (forever)
     l_ecmd_rc |= l_ddrphy_fir_action0.clearBit(54);            
@@ -561,6 +1016,27 @@ fapi::ReturnCode mss_unmask_ddrphy_errors( const fapi::Target & i_target,
     ecmdDataBufferBase l_mbafir_action0(64);
     ecmdDataBufferBase l_mbafir_action1(64);
             
+    uint8_t l_dd2_fir_bit_defn_changes = 0;
+    fapi::Target l_targetCentaur;
+    
+    // Get Centaur target for the given MBA
+    l_rc = fapiGetParentChip(i_target, l_targetCentaur);
+    if(l_rc)
+    {
+        FAPI_ERR("Error getting Centaur parent target for the given MBA");
+        return l_rc;
+    }
+    
+    // Get attribute that tells us if mbspa 0 cmd complete attention is fixed for dd2    
+    l_rc = FAPI_ATTR_GET(ATTR_CENTAUR_EC_DD2_FIR_BIT_DEFN_CHANGES, &l_targetCentaur, l_dd2_fir_bit_defn_changes);
+    if(l_rc)
+    {
+        FAPI_ERR("Error getting ATTR_CENTAUR_EC_DD2_FIR_BIT_DEFN_CHANGES");
+        // Log passed in error before returning with new error
+        if (i_bad_rc) fapiLogError(i_bad_rc);                
+        return l_rc;
+    }        
+
     
     // Read mask
     l_rc = fapiGetScom_w_retry(i_target,
@@ -607,9 +1083,9 @@ fapi::ReturnCode mss_unmask_ddrphy_errors( const fapi::Target & i_target,
     l_ecmd_rc |= l_mbafir_action1.setBit(2);
     l_ecmd_rc |= l_mbafir_mask_or.setBit(2);
 
-    // 3	Internal_fsm_error          recoverable         unmask
+    // 3	Internal_fsm_error          channel checkstop   unmask
     l_ecmd_rc |= l_mbafir_action0.clearBit(3);            
-    l_ecmd_rc |= l_mbafir_action1.setBit(3);
+    l_ecmd_rc |= l_mbafir_action1.clearBit(3);
     l_ecmd_rc |= l_mbafir_mask_and.clearBit(3);
 
     // 4	MCBIST_Error                recoverable         mask (forever)
@@ -617,9 +1093,9 @@ fapi::ReturnCode mss_unmask_ddrphy_errors( const fapi::Target & i_target,
     l_ecmd_rc |= l_mbafir_action1.setBit(4);
     l_ecmd_rc |= l_mbafir_mask_or.setBit(4);
     
-    // 5	scom_cmd_reg_pe             recoverable         unmask
+    // 5	scom_cmd_reg_pe             channel checkstop   unmask
     l_ecmd_rc |= l_mbafir_action0.clearBit(5);            
-    l_ecmd_rc |= l_mbafir_action1.setBit(5);
+    l_ecmd_rc |= l_mbafir_action1.clearBit(5);
     l_ecmd_rc |= l_mbafir_mask_and.clearBit(5);
 
     // 6	channel_chkstp_err          channel checkstop   unmask
@@ -627,25 +1103,40 @@ fapi::ReturnCode mss_unmask_ddrphy_errors( const fapi::Target & i_target,
     l_ecmd_rc |= l_mbafir_action1.clearBit(6);
     l_ecmd_rc |= l_mbafir_mask_and.clearBit(6);
 
-    // 7	wrd_caw2_data_ce_ue_err     recoverable         masked (until mss_unmask_maint_errors)
+    // 7	wrd_caw2_data_ce_ue_err     channel checkstop   masked (until mss_unmask_maint_errors)
     l_ecmd_rc |= l_mbafir_action0.clearBit(7);            
-    l_ecmd_rc |= l_mbafir_action1.setBit(7);
+    l_ecmd_rc |= l_mbafir_action1.clearBit(7);
     l_ecmd_rc |= l_mbafir_mask_or.setBit(7);
 
-    // 8:14	RESERVED                    recoverable         mask (forever)
-    l_ecmd_rc |= l_mbafir_action0.clearBit(8,7);            
-    l_ecmd_rc |= l_mbafir_action1.setBit(8,7);
-    l_ecmd_rc |= l_mbafir_mask_or.setBit(8,7);
+    if (l_dd2_fir_bit_defn_changes)
+    {
+        // 8	maint_1hot_st_error_dd2 channel checkstop   unmask
+        l_ecmd_rc |= l_mbafir_action0.clearBit(8);            
+        l_ecmd_rc |= l_mbafir_action1.clearBit(8);
+        l_ecmd_rc |= l_mbafir_mask_and.clearBit(8);    
+    }
+    else
+    {
+        // 8	RESERVED                recoverable         mask (forever)
+        l_ecmd_rc |= l_mbafir_action0.clearBit(8);            
+        l_ecmd_rc |= l_mbafir_action1.setBit(8);
+        l_ecmd_rc |= l_mbafir_mask_or.setBit(8);    
+    }
+
+    // 9:14	RESERVED                    recoverable         mask (forever)
+    l_ecmd_rc |= l_mbafir_action0.clearBit(9,6);            
+    l_ecmd_rc |= l_mbafir_action1.setBit(9,6);
+    l_ecmd_rc |= l_mbafir_mask_or.setBit(9,6);
 
-    // 15	internal scom error         recoverable         mask (tbd)
+    // 15	internal scom error         recoverable         unmask
     l_ecmd_rc |= l_mbafir_action0.clearBit(15);            
     l_ecmd_rc |= l_mbafir_action1.setBit(15);
-    l_ecmd_rc |= l_mbafir_mask_or.setBit(15);
+    l_ecmd_rc |= l_mbafir_mask_and.clearBit(15);
 
-    // 16	internal scom error clone   recoverable         mask (tbd)
+    // 16	internal scom error clone   recoverable         unmask
     l_ecmd_rc |= l_mbafir_action0.clearBit(16);            
     l_ecmd_rc |= l_mbafir_action1.setBit(16);
-    l_ecmd_rc |= l_mbafir_mask_or.setBit(16);
+    l_ecmd_rc |= l_mbafir_mask_and.clearBit(16);
 
 
     // 17:63 RESERVED           not implemented, so won't touch these
@@ -770,6 +1261,28 @@ fapi::ReturnCode mss_unmask_draminit_errors( const fapi::Target & i_target,
     ecmdDataBufferBase l_mbacalfir_mask_and(64);        
     ecmdDataBufferBase l_mbacalfir_action0(64);
     ecmdDataBufferBase l_mbacalfir_action1(64);
+    
+    uint8_t l_dd2_fir_bit_defn_changes = 0;
+    fapi::Target l_targetCentaur;
+    
+    // Get Centaur target for the given MBA
+    l_rc = fapiGetParentChip(i_target, l_targetCentaur);
+    if(l_rc)
+    {
+        FAPI_ERR("Error getting Centaur parent target for the given MBA");
+        return l_rc;
+    }    
+
+    // Get attribute that tells us if mbspa 0 cmd complete attention is fixed for dd2    
+    l_rc = FAPI_ATTR_GET(ATTR_CENTAUR_EC_DD2_FIR_BIT_DEFN_CHANGES, &l_targetCentaur, l_dd2_fir_bit_defn_changes);
+    if(l_rc)
+    {
+        FAPI_ERR("Error getting ATTR_CENTAUR_EC_DD2_FIR_BIT_DEFN_CHANGES");
+        // Log passed in error before returning with new error
+        if (i_bad_rc) fapiLogError(i_bad_rc);                
+        return l_rc;
+    }        
+    
 
 
     // Read mask
@@ -799,17 +1312,17 @@ fapi::ReturnCode mss_unmask_draminit_errors( const fapi::Target & i_target,
     l_ecmd_rc |= l_mbacalfir_mask_or.flushTo0();
     l_ecmd_rc |= l_mbacalfir_mask_and.flushTo1();        
     
-    // 0	MBA Recoverable Error       recoverable         mask
+    // 0	MBA Recoverable Error       recoverable         mask (until after draminit_training)
     l_ecmd_rc |= l_mbacalfir_action0.clearBit(0);            
     l_ecmd_rc |= l_mbacalfir_action1.setBit(0);
     l_ecmd_rc |= l_mbacalfir_mask_or.setBit(0);
 
-    // 1	MBA Nonrecoverable Error    channel checkstop   mask
+    // 1	MBA Nonrecoverable Error    channel checkstop   mask (until after draminit_mc)
     l_ecmd_rc |= l_mbacalfir_action0.clearBit(1);            
     l_ecmd_rc |= l_mbacalfir_action1.clearBit(1);
     l_ecmd_rc |= l_mbacalfir_mask_or.setBit(1);
 
-    // 2	Refresh Overrun             recoverable         mask
+    // 2	Refresh Overrun             recoverable         mask (until after draminit_mc)
     l_ecmd_rc |= l_mbacalfir_action0.clearBit(2);            
     l_ecmd_rc |= l_mbacalfir_action1.setBit(2);
     l_ecmd_rc |= l_mbacalfir_mask_or.setBit(2);
@@ -825,12 +1338,12 @@ fapi::ReturnCode mss_unmask_draminit_errors( const fapi::Target & i_target,
     l_ecmd_rc |= l_mbacalfir_action1.setBit(4);
     l_ecmd_rc |= l_mbacalfir_mask_or.setBit(4);
 
-    // 5	ddr0_cal_timeout_err        recoverable         mask
+    // 5	ddr0_cal_timeout_err        recoverable         mask (until after draminit_mc)
     l_ecmd_rc |= l_mbacalfir_action0.clearBit(5);            
     l_ecmd_rc |= l_mbacalfir_action1.setBit(5);
     l_ecmd_rc |= l_mbacalfir_mask_or.setBit(5);
 
-    // 6	ddr1_cal_timeout_err        recoverable         mask
+    // 6	ddr1_cal_timeout_err        recoverable         mask (until after draminit_mc)
     l_ecmd_rc |= l_mbacalfir_action0.clearBit(6);            
     l_ecmd_rc |= l_mbacalfir_action1.setBit(6);
     l_ecmd_rc |= l_mbacalfir_mask_or.setBit(6);
@@ -842,79 +1355,114 @@ fapi::ReturnCode mss_unmask_draminit_errors( const fapi::Target & i_target,
     l_ecmd_rc |= l_mbacalfir_mask_or.setBit(7);
 
 
-    // 8	mbx to mba par error        channel checkstop   mask
+    // 8	mbx to mba par error        channel checkstop   mask (until after draminit_training_adv)
     l_ecmd_rc |= l_mbacalfir_action0.clearBit(8);            
     l_ecmd_rc |= l_mbacalfir_action1.clearBit(8);
     l_ecmd_rc |= l_mbacalfir_mask_or.setBit(8);
 
-    // 9	mba_wrd ue                  recoverable         mask
+    // 9	mba_wrd ue                  recoverable         mask (until mainline traffic)
     l_ecmd_rc |= l_mbacalfir_action0.clearBit(9);            
     l_ecmd_rc |= l_mbacalfir_action1.setBit(9);
     l_ecmd_rc |= l_mbacalfir_mask_or.setBit(9);
 
-    // 10	mba_wrd ce                  recoverable         mask
+    // 10	mba_wrd ce                  recoverable         mask (until mainline traffic)
     l_ecmd_rc |= l_mbacalfir_action0.clearBit(10);            
     l_ecmd_rc |= l_mbacalfir_action1.setBit(10);
     l_ecmd_rc |= l_mbacalfir_mask_or.setBit(10);
 
-    // 11	mba_maint ue                recoverable         mask
+    // 11	mba_maint ue                recoverable         mask (until after draminit_training_adv)
     l_ecmd_rc |= l_mbacalfir_action0.clearBit(11);            
     l_ecmd_rc |= l_mbacalfir_action1.setBit(11);
     l_ecmd_rc |= l_mbacalfir_mask_or.setBit(11);
 
-    // 12	mba_maint ce                recoverable         mask
+    // 12	mba_maint ce                recoverable         mask (until after draminit_training_adv)
     l_ecmd_rc |= l_mbacalfir_action0.clearBit(12);            
     l_ecmd_rc |= l_mbacalfir_action1.setBit(12);
     l_ecmd_rc |= l_mbacalfir_mask_or.setBit(12);
 
-    // 13	ddr_cal_reset_timeout       channel checkstop   mask
-    // TODO: Leaving masked until I find proper spot to unmask this
+    // 13	ddr_cal_reset_timeout       channel checkstop   unmask
     l_ecmd_rc |= l_mbacalfir_action0.clearBit(13);            
     l_ecmd_rc |= l_mbacalfir_action1.clearBit(13);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(13);
+    l_ecmd_rc |= l_mbacalfir_mask_and.clearBit(13);
 
-    // 14	wrq_data_ce                 recoverable         mask
+    // 14	wrq_data_ce                 recoverable         mask (until mainline traffic)
     l_ecmd_rc |= l_mbacalfir_action0.clearBit(14);            
     l_ecmd_rc |= l_mbacalfir_action1.setBit(14);
     l_ecmd_rc |= l_mbacalfir_mask_or.setBit(14);
 
-    // 15	wrq_data_ue                 recoverable         mask
+    // 15	wrq_data_ue                 recoverable         mask (until mainline traffic)
     l_ecmd_rc |= l_mbacalfir_action0.clearBit(15);            
     l_ecmd_rc |= l_mbacalfir_action1.setBit(15);
     l_ecmd_rc |= l_mbacalfir_mask_or.setBit(15);
 
-    // 16	wrq_data_sue                recoverable         mask
+    // 16	wrq_data_sue                recoverable         mask (forever)
     l_ecmd_rc |= l_mbacalfir_action0.clearBit(16);            
     l_ecmd_rc |= l_mbacalfir_action1.setBit(16);
     l_ecmd_rc |= l_mbacalfir_mask_or.setBit(16);
 
-    // 17	wrq_rrq_hang_err            recoverable         mask
+    // 17	wrq_rrq_hang_err            recoverable         mask (until after draminit_training_adv)
     l_ecmd_rc |= l_mbacalfir_action0.clearBit(17);            
     l_ecmd_rc |= l_mbacalfir_action1.setBit(17);
     l_ecmd_rc |= l_mbacalfir_mask_or.setBit(17);
 
-    // 18	sm_1hot_err                 recoverable         unmask
+    // 18	sm_1hot_err                 channel checkstop   unmask
     l_ecmd_rc |= l_mbacalfir_action0.clearBit(18);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(18);
+    l_ecmd_rc |= l_mbacalfir_action1.clearBit(18);
     l_ecmd_rc |= l_mbacalfir_mask_and.clearBit(18);
 
-    // 19	wrd_scom_error              recoverable         mask (tbd)
+    // 19	wrd_scom_error              recoverable         unmask
     l_ecmd_rc |= l_mbacalfir_action0.clearBit(19);            
     l_ecmd_rc |= l_mbacalfir_action1.setBit(19);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(19);
-
-    // 20	internal_scom_error         recoverable         mask (tbd)
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(20);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(20);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(20);
+    l_ecmd_rc |= l_mbacalfir_mask_and.clearBit(19);
 
-    // 21	internal_scom_error_copy    recoverable         mask (tbd)
-    l_ecmd_rc |= l_mbacalfir_action0.clearBit(21);            
-    l_ecmd_rc |= l_mbacalfir_action1.setBit(21);
-    l_ecmd_rc |= l_mbacalfir_mask_or.setBit(21);
+    if (l_dd2_fir_bit_defn_changes)
+    {
+        // 20	rhmr_prim_reached_max       recoverable         mask (forever)
+        l_ecmd_rc |= l_mbacalfir_action0.clearBit(20);            
+        l_ecmd_rc |= l_mbacalfir_action1.setBit(20);
+        l_ecmd_rc |= l_mbacalfir_mask_or.setBit(20);
+        
+        // 21	rhmr_sec_reached_max        recoverable         mask (forever)
+        l_ecmd_rc |= l_mbacalfir_action0.clearBit(21);            
+        l_ecmd_rc |= l_mbacalfir_action1.setBit(21);
+        l_ecmd_rc |= l_mbacalfir_mask_or.setBit(21);
+        
+        // 22	rhmr_sec_already_full       recoverable         mask (forever)
+        l_ecmd_rc |= l_mbacalfir_action0.clearBit(22);            
+        l_ecmd_rc |= l_mbacalfir_action1.setBit(22);
+        l_ecmd_rc |= l_mbacalfir_mask_or.setBit(22);
+
+        // 23	Reserved                    recoverable         mask (forever)
+        l_ecmd_rc |= l_mbacalfir_action0.clearBit(23);            
+        l_ecmd_rc |= l_mbacalfir_action1.setBit(23);
+        l_ecmd_rc |= l_mbacalfir_mask_or.setBit(23);
+
+        // 24	internal_scom_error         recoverable         unmask
+        l_ecmd_rc |= l_mbacalfir_action0.clearBit(24);            
+        l_ecmd_rc |= l_mbacalfir_action1.setBit(24);
+        l_ecmd_rc |= l_mbacalfir_mask_and.clearBit(24);
+
+        // 25	internal_scom_error_copy    recoverable         unmask
+        l_ecmd_rc |= l_mbacalfir_action0.clearBit(25);            
+        l_ecmd_rc |= l_mbacalfir_action1.setBit(25);
+        l_ecmd_rc |= l_mbacalfir_mask_and.clearBit(25);
+
+        // 26-63	Reserved            not implemented, so won't touch these          
+    }
+    else
+    {
+        // 20	internal_scom_error         recoverable         unmask
+        l_ecmd_rc |= l_mbacalfir_action0.clearBit(20);            
+        l_ecmd_rc |= l_mbacalfir_action1.setBit(20);
+        l_ecmd_rc |= l_mbacalfir_mask_and.clearBit(20);
 
-    // 22-63	Reserved            not implemented, so won't touch these          
+        // 21	internal_scom_error_copy    recoverable         unmask
+        l_ecmd_rc |= l_mbacalfir_action0.clearBit(21);            
+        l_ecmd_rc |= l_mbacalfir_action1.setBit(21);
+        l_ecmd_rc |= l_mbacalfir_mask_and.clearBit(21);
 
+        // 22-63	Reserved            not implemented, so won't touch these          
+    }
 
     if(l_ecmd_rc)
     {
@@ -1297,9 +1845,9 @@ fapi::ReturnCode mss_unmask_draminit_training_advanced_errors(
     l_ecmd_rc |= l_mbsfir_mask_or.flushTo0();
     l_ecmd_rc |= l_mbsfir_mask_and.flushTo1();
 
-    // 0	scom_par_errors             recoverable         unmask
+    // 0	scom_par_errors             channel checkstop   unmask
     l_ecmd_rc |= l_mbsfir_action0.clearBit(0);            
-    l_ecmd_rc |= l_mbsfir_action1.setBit(0);
+    l_ecmd_rc |= l_mbsfir_action1.clearBit(0);
     l_ecmd_rc |= l_mbsfir_mask_and.clearBit(0);
 
     // 1	mbx_par_errors              channel checkstop   unmask
@@ -1307,20 +1855,37 @@ fapi::ReturnCode mss_unmask_draminit_training_advanced_errors(
     l_ecmd_rc |= l_mbsfir_action1.clearBit(1);
     l_ecmd_rc |= l_mbsfir_mask_and.clearBit(1);
 
+    // 2    DD1: reserved               recoverable         mask (forever)
+    // 2    DD2: dram_eventn_bit0       recoverable         mask (forever)
+    l_ecmd_rc |= l_mbsfir_action0.clearBit(2);            
+    l_ecmd_rc |= l_mbsfir_action1.setBit(2);
+    l_ecmd_rc |= l_mbsfir_mask_or.setBit(2);
+
+    // 3    DD1: reserved               recoverable         mask (forever)
+    // 3    DD2: dram_eventn_bit1       recoverable         mask (forever)
+    l_ecmd_rc |= l_mbsfir_action0.clearBit(3);            
+    l_ecmd_rc |= l_mbsfir_action1.setBit(3);
+    l_ecmd_rc |= l_mbsfir_mask_or.setBit(3);
+
+    // 4:14	RESERVED                    recoverable         mask (forever)
+    l_ecmd_rc |= l_mbsfir_action0.clearBit(4,11);            
+    l_ecmd_rc |= l_mbsfir_action1.setBit(4,11);
+    l_ecmd_rc |= l_mbsfir_mask_or.setBit(4,11);
+
     // 2:14	RESERVED                    recoverable         mask (forever)
     l_ecmd_rc |= l_mbsfir_action0.clearBit(2,13);            
     l_ecmd_rc |= l_mbsfir_action1.setBit(2,13);
     l_ecmd_rc |= l_mbsfir_mask_or.setBit(2,13);
 
-    // 15	internal scom error         recoverable         mask (tbd)
+    // 15	internal scom error         recoverable         unmask
     l_ecmd_rc |= l_mbsfir_action0.clearBit(15);            
     l_ecmd_rc |= l_mbsfir_action1.setBit(15);
-    l_ecmd_rc |= l_mbsfir_mask_or.setBit(15);
+    l_ecmd_rc |= l_mbsfir_mask_and.clearBit(15);
 
-    // 16	internal scom error clone   recoverable         mask (tbd)
+    // 16	internal scom error clone   recoverable         unmask
     l_ecmd_rc |= l_mbsfir_action0.clearBit(16);            
     l_ecmd_rc |= l_mbsfir_action1.setBit(16);
-    l_ecmd_rc |= l_mbsfir_mask_or.setBit(16);
+    l_ecmd_rc |= l_mbsfir_mask_and.clearBit(16);
 
     // 17:63 RESERVED           not implemented, so won't touch these
     
@@ -1654,7 +2219,7 @@ fapi::ReturnCode mss_unmask_maint_errors(const fapi::Target & i_target,
         l_ecmd_rc |= l_mbafir_mask_and.clearBit(2);
 
 
-        // 7	wrd_caw2_data_ce_ue_err     recoverable         unmask
+        // 7	wrd_caw2_data_ce_ue_err     channel checkstop   unmask
         l_ecmd_rc |= l_mbafir_mask_and.clearBit(7);
 
         if(l_ecmd_rc)
@@ -1974,25 +2539,25 @@ fapi::ReturnCode mss_unmask_maint_errors(const fapi::Target & i_target,
         l_ecmd_rc |= l_mbeccfir_action1.clearBit(47);
         l_ecmd_rc |= l_mbeccfir_mask_and.clearBit(47);
 
-        // 48	Maskable reg parity error   recoverable         mask (forever)
+        // 48	Maskable reg parity error   recoverable         unmask
         l_ecmd_rc |= l_mbeccfir_action0.clearBit(48);            
         l_ecmd_rc |= l_mbeccfir_action1.setBit(48);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(48);
+        l_ecmd_rc |= l_mbeccfir_mask_and.clearBit(48);
 
         // 49	ecc datapath parity error   channel checkstop   unmask
         l_ecmd_rc |= l_mbeccfir_action0.clearBit(49);            
         l_ecmd_rc |= l_mbeccfir_action1.clearBit(49);
         l_ecmd_rc |= l_mbeccfir_mask_and.clearBit(49);
 
-        // 50	internal scom error         recovereble         mask
+        // 50	internal scom error         recovereble         unmask
         l_ecmd_rc |= l_mbeccfir_action0.clearBit(50);            
         l_ecmd_rc |= l_mbeccfir_action1.setBit(50);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(50);
+        l_ecmd_rc |= l_mbeccfir_mask_and.clearBit(50);
 
-        // 51	internal scom error clone   recovereble         mask
+        // 51	internal scom error clone   recovereble         unmask
         l_ecmd_rc |= l_mbeccfir_action0.clearBit(51);            
         l_ecmd_rc |= l_mbeccfir_action1.setBit(51);
-        l_ecmd_rc |= l_mbeccfir_mask_or.setBit(51);
+        l_ecmd_rc |= l_mbeccfir_mask_and.clearBit(51);
 
         // 52:63	Reserved    not implemented, so won't touch these
 
@@ -2294,15 +2859,15 @@ fapi::ReturnCode mss_unmask_fetch_errors(const fapi::Target & i_target,
     l_ecmd_rc |= l_scac_lfir_action1.setBit(34);
     l_ecmd_rc |= l_scac_lfir_mask_or.setBit(34);
 
-    // 35	internal_scom_error         recoverable         masked (tbd)
+    // 35	internal_scom_error         recoverable         unmask
     l_ecmd_rc |= l_scac_lfir_action0.clearBit(35);            
     l_ecmd_rc |= l_scac_lfir_action1.setBit(35);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(35);
+    l_ecmd_rc |= l_scac_lfir_mask_and.clearBit(35);
 
-    // 36	internal_scom_error_clone   recoverable         masked (tbd)
+    // 36	internal_scom_error_clone   recoverable         unmask
     l_ecmd_rc |= l_scac_lfir_action0.clearBit(36);            
     l_ecmd_rc |= l_scac_lfir_action1.setBit(36);
-    l_ecmd_rc |= l_scac_lfir_mask_or.setBit(36);
+    l_ecmd_rc |= l_scac_lfir_mask_and.clearBit(36);
 
     // 37:63	Reserved
     // Can we write to these bits?
@@ -2402,9 +2967,10 @@ fapi::ReturnCode mss_unmask_fetch_errors(const fapi::Target & i_target,
     
 
     ecmdDataBufferBase l_mbs_fir_mask(64);
-    ecmdDataBufferBase l_mbs_fir_mask_and(64);
-    
+    ecmdDataBufferBase l_mbs_fir_mask_and(64);    
     uint8_t l_dd2_fir_bit_defn_changes = 0;
+  	std::vector<fapi::Target> l_L4_vector;
+    bool l_L4_functional = false;
 
     l_rc = FAPI_ATTR_GET(ATTR_CENTAUR_EC_DD2_FIR_BIT_DEFN_CHANGES, &i_target, l_dd2_fir_bit_defn_changes);
     if(l_rc)
@@ -2414,7 +2980,19 @@ fapi::ReturnCode mss_unmask_fetch_errors(const fapi::Target & i_target,
         if (i_bad_rc) fapiLogError(i_bad_rc);                
         return l_rc;
     }    
-    
+        
+	// Check if L4 is functional
+	l_rc = fapiGetChildChiplets(i_target, fapi::TARGET_TYPE_L4, l_L4_vector, fapi::TARGET_STATE_FUNCTIONAL);
+	if (l_rc)
+	{
+		FAPI_ERR("Error from fapiGetChildChiplets getting L4 target");
+		return l_rc;
+	}
+	if (l_L4_vector.size() > 0)
+	{
+        l_L4_functional = true;
+	}
+
     // Read mask 
     l_rc = fapiGetScom_w_retry(i_target, MBS_FIR_MASK_REG_0x02011403, l_mbs_fir_mask); 
     if(l_rc)
@@ -2439,39 +3017,43 @@ fapi::ReturnCode mss_unmask_fetch_errors(const fapi::Target & i_target,
     // 4    internal_timeout        channel checkstop   unmask
     l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(4);
 
-    // 9    cache_srw_ce            recoverable         unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(9);
 
-    // 10    cache_srw_ue           recoverable         unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(10);
+    if (l_L4_functional)
+    {
+        // 9    cache_srw_ce            recoverable         unmask
+        l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(9);
 
-    // 12    cache_co_ce            recoverable         unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(12);
+        // 10    cache_srw_ue           recoverable         unmask
+        l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(10);
 
-    // 13    cache_co_ue            recoverable         unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(13);
+        // 12    cache_co_ce            recoverable         unmask
+        l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(12);
 
-    // 15    dir_ce          
-    if (l_dd2_fir_bit_defn_changes)
-    {
-        // NOTE: SW248520: Known DD1 problem - higher temp causes
-        // L4 Dir CEs. Want to ignore. Unmask for DD2 only
-        
-        //                          recoverable         unmask        
-        l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(15);
-    }
-    
-    // 16    dir_ue                 channel checkstop   unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(16);
+        // 13    cache_co_ue            recoverable         unmask
+        l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(13);
+
+        // 15    dir_ce          
+        if (l_dd2_fir_bit_defn_changes)
+        {
+            // NOTE: SW248520: Known DD1 problem - higher temp causes
+            // L4 Dir CEs. Want to ignore. Unmask for DD2 only
+            
+            //                          recoverable         unmask        
+            l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(15);
+        }
 
-    // 18    dir_all_members_deleted channel checkstop  unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(18);
+        // 16    dir_ue                 channel checkstop   unmask
+        l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(16);
 
-    // 19    lru_error               recoverable        unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(19);
+        // 18    dir_all_members_deleted channel checkstop  unmask
+        l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(18);
 
-    // 20    eDRAM error             channel checkstop  unmask
-    l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(20);
+        // 19    lru_error               recoverable        unmask
+        l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(19);
+
+        // 20    eDRAM error             channel checkstop  unmask
+        l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(20);
+    }
 
     // 26    srb_buffer_ce           recoverable        unmask
     l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(26);
@@ -2479,6 +3061,12 @@ fapi::ReturnCode mss_unmask_fetch_errors(const fapi::Target & i_target,
     // 27    srb_buffer_ue           recoverable        unmask
     l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(27);
     
+    if (l_dd2_fir_bit_defn_changes && l_L4_functional)
+    {
+	    // 30    proximal_ce_ue      channel checkstop  unmask    
+        l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(30);
+    }
+    
     if(l_ecmd_rc)
     {
         // Log passed in error before returning with new error