1 files changed, 88 insertions, 7 deletions

diff --git a/src/usr/diag/prdf/common/plat/mem/prdfMemCaptureData.C b/src/usr/diag/prdf/common/plat/mem/prdfMemCaptureData.C
index ebef7ae29..4d55c7c50 100644
--- a/src/usr/diag/prdf/common/plat/mem/prdfMemCaptureData.C
+++ b/src/usr/diag/prdf/common/plat/mem/prdfMemCaptureData.C
@@ -39,6 +39,7 @@
 #include <prdfCenMbaDataBundle.H>
 #include <prdfPlatServices.H>
 #include <prdfP9McaDataBundle.H>
+#include <prdfOcmbDataBundle.H>
 #include <prdfMemRowRepair.H>
 
 
@@ -65,8 +66,16 @@ void addExtMemMruData( const MemoryMru & i_memMru, errlHndl_t io_errl )
     {
         TargetHandle_t trgt = i_memMru.getTrgt();
 
-        // Get the DRAM width.
-        extMemMru.isX4Dram = isDramWidthX4( trgt ) ? 1 : 0;
+        if ( TYPE_OCMB_CHIP == getTargetType(trgt) )
+        {
+            TargetHandle_t dimm = getConnectedDimm( trgt, i_memMru.getRank() );
+            extMemMru.isX4Dram = isDramWidthX4( dimm ) ? 1 : 0;
+        }
+        else
+        {
+            // Get the DRAM width.
+            extMemMru.isX4Dram = isDramWidthX4( trgt ) ? 1 : 0;
+        }
 
         // Get the DIMM type.
         if ( TYPE_MBA == getTargetType(trgt) )
@@ -97,9 +106,9 @@ void addExtMemMruData( const MemoryMru & i_memMru, errlHndl_t io_errl )
                 {
                     getDimmDqAttr<TYPE_DIMM>(partList[0], extMemMru.dqMapping);
                 }
-                else if ( TYPE_MEM_PORT == getTargetType(trgt) )
+                else if ( TYPE_OCMB_CHIP == getTargetType(trgt) )
                 {
-                    getDimmDqAttr<TYPE_MEM_PORT>( trgt, extMemMru.dqMapping );
+                    getDimmDqAttr<TYPE_OCMB_CHIP>( trgt, extMemMru.dqMapping );
                 }
                 else
                 {
@@ -172,7 +181,6 @@ void captureDramRepairsData( TARGETING::TargetHandle_t i_trgt,
         if( CEN_VPD_DIMM_SPARE_NO_SPARE != spareConfig )
             data.header.isSpareDram = true;
 
-
         // Iterate all ranks to get DRAM repair data
         for ( auto & rank : masterRanks )
         {
@@ -220,8 +228,11 @@ void captureDramRepairsData( TARGETING::TargetHandle_t i_trgt,
         if ( data.rankDataList.size() > 0 )
         {
             data.header.rankCount = data.rankDataList.size();
-            data.header.isEccSp  = ( isDramWidthX4( i_trgt ) &&
-                                     (TYPE_MBA == getTargetType(i_trgt)) );
+            data.header.isEccSp   = false;
+            if ( TYPE_MBA == getTargetType(i_trgt) )
+            {
+                data.header.isEccSp = isDramWidthX4( i_trgt );
+            }
             UtilMem dramStream;
             dramStream << data;
 
@@ -459,6 +470,33 @@ void captureIueCounts<McaDataBundle*>( TARGETING::TargetHandle_t i_trgt,
 //------------------------------------------------------------------------------
 
 template<>
+void captureIueCounts<OcmbDataBundle*>( TARGETING::TargetHandle_t i_trgt,
+                                        OcmbDataBundle * i_db,
+                                        CaptureData & io_cd )
+{
+    #ifdef __HOSTBOOT_MODULE
+
+    uint8_t sz_capData = i_db->iv_iueTh.size()*2;
+    uint8_t capData[sz_capData] = {};
+    uint8_t idx = 0;
+
+    for ( auto & th_pair : i_db->iv_iueTh )
+    {
+        capData[idx]   = th_pair.first;
+        capData[idx+1] = th_pair.second.getCount();
+        idx += 2;
+    }
+
+    // Add data to capture data.
+    BitString bs ( sz_capData*8, (CPU_WORD *) &capData );
+    io_cd.Add( i_trgt, Util::hashString("IUE_COUNTS"), bs );
+
+    #endif
+}
+
+//------------------------------------------------------------------------------
+
+template<>
 void addEccData<TYPE_MCA>( ExtensibleChip * i_chip,
                            STEP_CODE_DATA_STRUCT & io_sc )
 {
@@ -497,6 +535,33 @@ void addEccData<TYPE_MCBIST>( ExtensibleChip * i_chip,
 }
 
 template<>
+void addEccData<TYPE_OCMB_CHIP>( ExtensibleChip * i_chip,
+                                 STEP_CODE_DATA_STRUCT & io_sc )
+{
+    PRDF_ASSERT( TYPE_OCMB_CHIP == i_chip->getType() );
+
+    CaptureData & cd = io_sc.service_data->GetCaptureData();
+    OcmbDataBundle * db = getOcmbDataBundle( i_chip );
+
+    TargetHandle_t ocmbTrgt = i_chip->getTrgt();
+
+    // Add DRAM repairs data from hardware.
+    captureDramRepairsData<TYPE_OCMB_CHIP>( ocmbTrgt, cd );
+
+    // Add DRAM repairs data from VPD.
+    captureDramRepairsVpd<TYPE_OCMB_CHIP>( ocmbTrgt, cd );
+
+    // Add IUE counts to capture data.
+    captureIueCounts<OcmbDataBundle*>( ocmbTrgt, db, cd );
+
+    // Add CE table to capture data.
+    db->iv_ceTable.addCapData( cd );
+
+    // Add UE table to capture data.
+    db->iv_ueTable.addCapData( cd );
+}
+
+template<>
 void addEccData<TYPE_MBA>( ExtensibleChip * i_chip,
                            STEP_CODE_DATA_STRUCT & io_sc )
 {
@@ -558,6 +623,22 @@ void addEccData<TYPE_MBA>( TargetHandle_t i_trgt, errlHndl_t io_errl )
     ErrDataService::AddCapData( cd, io_errl );
 }
 
+template<>
+void addEccData<TYPE_OCMB_CHIP>( TargetHandle_t i_trgt,
+                                 errlHndl_t io_errl )
+{
+    PRDF_ASSERT( TYPE_OCMB_CHIP == getTargetType(i_trgt) );
+
+    CaptureData cd;
+
+    // Add DRAM repairs data from hardware.
+    captureDramRepairsData<TYPE_OCMB_CHIP>( i_trgt, cd );
+
+    // Add DRAM repairs data from VPD.
+    captureDramRepairsVpd<TYPE_OCMB_CHIP>( i_trgt, cd );
+
+    ErrDataService::AddCapData( cd, io_errl );
+}
 
 //------------------------------------------------------------------------------