PRD: Axone misc updates for moving ecc/maint logic to OCMB

Change-Id: Ieb27008dd7aed89e938603120a0111bdef1ffc3f
RTC: 207388
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77154
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Paul Greenwood <paul.greenwood@ibm.com>
Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/78324
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>

11 files changed, 115 insertions, 79 deletions

diff --git a/src/usr/diag/prdf/common/plat/mem/prdfMemCeTable.C b/src/usr/diag/prdf/common/plat/mem/prdfMemCeTable.C
index 16645586b..799e32e67 100644
--- a/src/usr/diag/prdf/common/plat/mem/prdfMemCeTable.C
+++ b/src/usr/diag/prdf/common/plat/mem/prdfMemCeTable.C
@@ -281,7 +281,7 @@ void MemCeTable<T>::addCapData( CaptureData & io_cd )
 // Avoid linker errors with the template.
 template class MemCeTable<TYPE_MCA>;
 template class MemCeTable<TYPE_MBA>;
-template class MemCeTable<TYPE_MEM_PORT>;
+template class MemCeTable<TYPE_OCMB_CHIP>;
 
 //------------------------------------------------------------------------------
 
diff --git a/src/usr/diag/prdf/common/plat/mem/prdfMemSymbol.C b/src/usr/diag/prdf/common/plat/mem/prdfMemSymbol.C
index 561c11dda..fe237c027 100755
--- a/src/usr/diag/prdf/common/plat/mem/prdfMemSymbol.C
+++ b/src/usr/diag/prdf/common/plat/mem/prdfMemSymbol.C
@@ -53,7 +53,7 @@ MemSymbol::MemSymbol( TARGETING::TargetHandle_t i_trgt, const MemRank & i_rank,
     PRDF_ASSERT( nullptr != i_trgt );
     PRDF_ASSERT( TYPE_MBA == getTargetType(i_trgt) ||
                  TYPE_MCA == getTargetType(i_trgt) ||
-                 TYPE_MEM_PORT == getTargetType(i_trgt) );
+                 TYPE_OCMB_CHIP == getTargetType(i_trgt) );
     // Allowing an invalid symbol. Use isValid() to check validity.
     PRDF_ASSERT( i_pins <= CEN_SYMBOL::BOTH_SYMBOL_DQS );
 }
@@ -83,9 +83,9 @@ MemSymbol MemSymbol::fromGalois( TargetHandle_t i_trgt, const MemRank & i_rank,
         if ( 0 != (i_mask & 0xaa) ) pins |= EVEN_SYMBOL_DQ;
         if ( 0 != (i_mask & 0x55) ) pins |= ODD_SYMBOL_DQ;
     }
-    else if ( TYPE_MCA == trgtType || TYPE_MEM_PORT == trgtType )
+    else if ( TYPE_MCA == trgtType || TYPE_OCMB_CHIP == trgtType )
     {
-        // 1 pin for MCA/MEM_PORT.
+        // 1 pin for MCA/TYPE_OCMB_CHIP.
         if ( 0 != (i_mask & 0xff) ) pins |= ODD_SYMBOL_DQ;
     }
     else
@@ -112,9 +112,9 @@ uint8_t MemSymbol::getDq() const
     {
         dq = symbol2Dq<TYPE_MCA>( iv_symbol );
     }
-    else if ( TYPE_MEM_PORT == trgtType )
+    else if ( TYPE_OCMB_CHIP == trgtType )
     {
-        dq = symbol2Dq<TYPE_MEM_PORT>( iv_symbol );
+        dq = symbol2Dq<TYPE_OCMB_CHIP>( iv_symbol );
     }
     else
     {
@@ -140,9 +140,9 @@ uint8_t MemSymbol::getPortSlct() const
     {
         portSlct = symbol2PortSlct<TYPE_MCA>( iv_symbol );
     }
-    else if ( TYPE_MEM_PORT == trgtType )
+    else if ( TYPE_OCMB_CHIP == trgtType )
     {
-        portSlct = symbol2PortSlct<TYPE_MEM_PORT>( iv_symbol );
+        portSlct = symbol2PortSlct<TYPE_OCMB_CHIP>( iv_symbol );
     }
     else
     {
@@ -171,10 +171,10 @@ uint8_t MemSymbol::getDram() const
         dram = isX4 ? symbol2Nibble<TYPE_MCA>( iv_symbol )
                     : symbol2Byte  <TYPE_MCA>( iv_symbol );
     }
-    else if ( TYPE_MEM_PORT == trgtType )
+    else if ( TYPE_OCMB_CHIP == trgtType )
     {
-        dram = isX4 ? symbol2Nibble<TYPE_MEM_PORT>( iv_symbol )
-                    : symbol2Byte  <TYPE_MEM_PORT>( iv_symbol );
+        dram = isX4 ? symbol2Nibble<TYPE_OCMB_CHIP>( iv_symbol )
+                    : symbol2Byte  <TYPE_OCMB_CHIP>( iv_symbol );
     }
     else
     {
@@ -241,7 +241,7 @@ uint8_t MemSymbol::getDramPins() const
         dps = MBA_DQS_PER_SYMBOL;
         spd = isX4 ? MBA_SYMBOLS_PER_NIBBLE : MBA_SYMBOLS_PER_BYTE;
     }
-    else if ( TYPE_MCA == trgtType || TYPE_MEM_PORT == trgtType )
+    else if ( TYPE_MCA == trgtType || TYPE_OCMB_CHIP == trgtType )
     {
         dps = MEM_DQS_PER_SYMBOL;
         spd = isX4 ? MEM_SYMBOLS_PER_NIBBLE : MEM_SYMBOLS_PER_BYTE;
@@ -274,10 +274,10 @@ uint8_t MemSymbol::getDramSymbol() const
         dramSymbol = isX4 ? nibble2Symbol<TYPE_MCA>( dram )
                           : byte2Symbol  <TYPE_MCA>( dram );
     }
-    else if ( TYPE_MEM_PORT == trgtType )
+    else if ( TYPE_OCMB_CHIP == trgtType )
     {
-        dramSymbol = isX4 ? nibble2Symbol<TYPE_MEM_PORT>( dram )
-                          : byte2Symbol  <TYPE_MEM_PORT>( dram );
+        dramSymbol = isX4 ? nibble2Symbol<TYPE_OCMB_CHIP>( dram )
+                          : byte2Symbol  <TYPE_OCMB_CHIP>( dram );
     }
     else
     {
@@ -435,16 +435,16 @@ uint32_t getMemReadSymbol<TYPE_MBA>( ExtensibleChip * i_chip,
 //------------------------------------------------------------------------------
 
 template<>
-uint32_t getMemReadSymbol<TYPE_MEM_PORT>( ExtensibleChip * i_chip,
-                                          const MemRank & i_rank,
-                                          MemSymbol & o_sym1,
-                                          MemSymbol & o_sym2 )
+uint32_t getMemReadSymbol<TYPE_OCMB_CHIP>( ExtensibleChip * i_chip,
+                                           const MemRank & i_rank,
+                                           MemSymbol & o_sym1,
+                                           MemSymbol & o_sym2 )
 {
-    #define PRDF_FUNC "[getMemReadSymbol<TYPE_MEM_PORT>] "
+    #define PRDF_FUNC "[getMemReadSymbol<TYPE_OCMB_CHIP>] "
 
     // Check parameters
     PRDF_ASSERT( nullptr != i_chip );
-    PRDF_ASSERT( TYPE_MEM_PORT == i_chip->getType() );
+    PRDF_ASSERT( TYPE_OCMB_CHIP == i_chip->getType() );
 
     uint32_t o_rc = SUCCESS;
 
@@ -453,14 +453,12 @@ uint32_t getMemReadSymbol<TYPE_MEM_PORT>( ExtensibleChip * i_chip,
     do
     {
         // Get the NCE/TCE galois and mask from hardware.
-        ExtensibleChip * ocmbChip = getConnectedParent(i_chip, TYPE_OCMB_CHIP);
-
-        SCAN_COMM_REGISTER_CLASS * reg = ocmbChip->getRegister("MBSEVR0");
+        SCAN_COMM_REGISTER_CLASS * reg = i_chip->getRegister("MBSEVR0");
         o_rc = reg->Read();
         if ( SUCCESS != o_rc )
         {
             PRDF_ERR( PRDF_FUNC "Read() failed on MBSEVR0: "
-                      "ocmbChip=0x%08x", ocmbChip->getHuid() );
+                      "i_chip=0x%08x", i_chip->getHuid() );
             break;
         }
 
@@ -480,8 +478,8 @@ uint32_t getMemReadSymbol<TYPE_MEM_PORT>( ExtensibleChip * i_chip,
                                         tceGalois, tceMask );
 
         MemSymbol sp0, sp1, ecc;
-        o_rc = mssGetSteerMux<TYPE_MEM_PORT>( i_chip->getTrgt(), i_rank,
-                                              sp0, sp1, ecc );
+        o_rc = mssGetSteerMux<TYPE_OCMB_CHIP>( i_chip->getTrgt(), i_rank,
+                                               sp0, sp1, ecc );
         if ( SUCCESS != o_rc )
         {
             PRDF_ERR( PRDF_FUNC "mssGetSteerMux() failed. HUID: 0x%08x "
diff --git a/src/usr/diag/prdf/common/plat/mem/prdfMemSymbol.H b/src/usr/diag/prdf/common/plat/mem/prdfMemSymbol.H
index c16972fd8..80b101ab1 100755
--- a/src/usr/diag/prdf/common/plat/mem/prdfMemSymbol.H
+++ b/src/usr/diag/prdf/common/plat/mem/prdfMemSymbol.H
@@ -95,7 +95,7 @@ class MemSymbol
 
     /**
      * @brief  Creates a MemSymbol from a Galois field.
-     * @param  i_trgt   MBA, MCA, or MEM_PORT target.
+     * @param  i_trgt   MBA, MCA, or OCMB_CHIP target.
      * @param  i_rank   The rank this symbol is on.
      * @param  i_galois The Galois field.
      * @param  i_mask   The bit mask.
@@ -122,7 +122,7 @@ class MemSymbol
     MemRank getRank() const { return iv_rank; };
 
     /** @return The port select for this symbol. Only relevant on MBA. Will
-     *          always return 0 for MCA and MEM_PORT. */
+     *          always return 0 for MCA and OCMB. */
     uint8_t getPortSlct() const;
 
     /** @return The DRAM index for this symbol. */
diff --git a/src/usr/diag/prdf/common/plat/mem/prdfMemThresholds.C b/src/usr/diag/prdf/common/plat/mem/prdfMemThresholds.C
index f6403f219..c59fa3657 100755
--- a/src/usr/diag/prdf/common/plat/mem/prdfMemThresholds.C
+++ b/src/usr/diag/prdf/common/plat/mem/prdfMemThresholds.C
@@ -209,7 +209,7 @@ void getMnfgMemCeTh<TYPE_MBA>( ExtensibleChip * i_chip, const MemRank & i_rank,
                                uint32_t & o_cePerDimm );
 
 template
-void getMnfgMemCeTh<TYPE_MEM_PORT>( ExtensibleChip * i_chip,
+void getMnfgMemCeTh<TYPE_OCMB_CHIP>( ExtensibleChip * i_chip,
     const MemRank & i_rank, uint32_t & o_cePerDram, uint32_t & o_cePerRank,
     uint32_t & o_cePerDimm );
 
diff --git a/src/usr/diag/prdf/common/plat/mem/prdfMemUtils.C b/src/usr/diag/prdf/common/plat/mem/prdfMemUtils.C
index 744e55e69..0cee436f5 100755
--- a/src/usr/diag/prdf/common/plat/mem/prdfMemUtils.C
+++ b/src/usr/diag/prdf/common/plat/mem/prdfMemUtils.C
@@ -224,12 +224,12 @@ int32_t collectCeStats<TYPE_MCA>( ExtensibleChip * i_chip,
 
 //------------------------------------------------------------------------------
 template<>
-int32_t collectCeStats<TYPE_MEM_PORT>( ExtensibleChip * i_chip,
-                                       const MemRank & i_rank,
-                                       MaintSymbols & o_maintStats,
-                                       MemSymbol & o_chipMark, uint8_t i_thr )
+int32_t collectCeStats<TYPE_OCMB_CHIP>( ExtensibleChip * i_chip,
+                                        const MemRank & i_rank,
+                                        MaintSymbols & o_maintStats,
+                                        MemSymbol & o_chipMark, uint8_t i_thr )
 {
-    #define PRDF_FUNC "[MemUtils::collectCeStats<TYPE_MEM_PORT>] "
+    #define PRDF_FUNC "[MemUtils::collectCeStats<TYPE_OCMB_CHIP>] "
 
     int32_t o_rc = SUCCESS;
     o_chipMark = MemSymbol(); // Initially invalid.
@@ -238,10 +238,9 @@ int32_t collectCeStats<TYPE_MEM_PORT>( ExtensibleChip * i_chip,
     {
         PRDF_ASSERT( 0 != i_thr );
 
-        TargetHandle_t memPortTrgt = i_chip->getTrgt();
-        ExtensibleChip * ocmbChip = getConnectedParent(i_chip, TYPE_OCMB_CHIP);
+        TargetHandle_t ocmbTrgt = i_chip->getTrgt();
 
-        const bool isX4 = isDramWidthX4(memPortTrgt);
+        const bool isX4 = isDramWidthX4(ocmbTrgt);
 
         // Use this map to keep track of the total counts per DRAM.
         DramCountMap dramCounts;
@@ -252,7 +251,7 @@ int32_t collectCeStats<TYPE_MEM_PORT>( ExtensibleChip * i_chip,
         for ( uint8_t regIdx = 0; regIdx < CE_REGS_PER_PORT; regIdx++ )
         {
             reg_str = ocmbCeStatReg[regIdx];
-            reg     = ocmbChip->getRegister( reg_str );
+            reg     = i_chip->getRegister( reg_str );
 
             o_rc = reg->Read();
             if ( SUCCESS != o_rc )
@@ -272,8 +271,8 @@ int32_t collectCeStats<TYPE_MEM_PORT>( ExtensibleChip * i_chip,
                 uint8_t sym  = baseSymbol + i;
                 PRDF_ASSERT( sym < SYMBOLS_PER_RANK );
 
-                uint8_t dram = isX4 ? symbol2Nibble<TYPE_MEM_PORT>( sym )
-                                    : symbol2Byte  <TYPE_MEM_PORT>( sym );
+                uint8_t dram = isX4 ? symbol2Nibble<TYPE_OCMB_CHIP>( sym )
+                                    : symbol2Byte  <TYPE_OCMB_CHIP>( sym );
 
                 // Keep track of the total DRAM counts.
                 dramCounts[dram].totalCount += count;
@@ -286,7 +285,7 @@ int32_t collectCeStats<TYPE_MEM_PORT>( ExtensibleChip * i_chip,
                     dramCounts[dram].symbolCount++;
 
                     SymbolData symData;
-                    symData.symbol = MemSymbol::fromSymbol( memPortTrgt, i_rank,
+                    symData.symbol = MemSymbol::fromSymbol( ocmbTrgt, i_rank,
                         sym, CEN_SYMBOL::ODD_SYMBOL_DQ );
                     if ( !symData.symbol.isValid() )
                     {
@@ -329,11 +328,11 @@ int32_t collectCeStats<TYPE_MEM_PORT>( ExtensibleChip * i_chip,
 
         if ( 0 != highestCount )
         {
-            uint8_t sym = isX4 ? nibble2Symbol<TYPE_MEM_PORT>( highestDram )
-                               : byte2Symbol  <TYPE_MEM_PORT>( highestDram );
+            uint8_t sym = isX4 ? nibble2Symbol<TYPE_OCMB_CHIP>( highestDram )
+                               : byte2Symbol  <TYPE_OCMB_CHIP>( highestDram );
             PRDF_ASSERT( sym < SYMBOLS_PER_RANK );
 
-            o_chipMark  = MemSymbol::fromSymbol( memPortTrgt, i_rank, sym );
+            o_chipMark  = MemSymbol::fromSymbol( ocmbTrgt, i_rank, sym );
         }
 
     } while(0);
@@ -601,6 +600,25 @@ uint8_t getDramSize<TYPE_MEM_PORT>(ExtensibleChip *i_chip, uint8_t i_dimmSlct)
     #undef PRDF_FUNC
 }
 
+template<>
+uint8_t getDramSize<TYPE_OCMB_CHIP>(ExtensibleChip * i_chip, uint8_t i_dimmSlct)
+{
+    #define PRDF_FUNC "[MemUtils::getDramSize] "
+
+    PRDF_ASSERT( TYPE_OCMB_CHIP == i_chip->getType() );
+    PRDF_ASSERT( i_dimmSlct < DIMM_SLCT_PER_PORT );
+
+    // TODO RTC 210072 - Explorer only has one port, however, multiple ports
+    // will be supported in the future. Updates will need to be made here so we
+    // can get the relevant port.
+
+    ExtensibleChip * memPort = getConnectedChild( i_chip, TYPE_MEM_PORT, 0 );
+
+    return getDramSize<TYPE_MEM_PORT>( memPort, i_dimmSlct );
+
+    #undef PRDF_FUNC
+}
+
 //------------------------------------------------------------------------------
 
 template<>
diff --git a/src/usr/diag/prdf/common/plat/prdfPlatServices_common.C b/src/usr/diag/prdf/common/plat/prdfPlatServices_common.C
index f99427d61..1b10aa4a0 100644
--- a/src/usr/diag/prdf/common/plat/prdfPlatServices_common.C
+++ b/src/usr/diag/prdf/common/plat/prdfPlatServices_common.C
@@ -947,11 +947,11 @@ int32_t mssGetSteerMux<TYPE_MBA>( TargetHandle_t i_mba, const MemRank & i_rank,
 }
 
 template<>
-int32_t mssGetSteerMux<TYPE_MEM_PORT>( TargetHandle_t i_memPort,
-                                       const MemRank & i_rank,
-                                       MemSymbol & o_port0Spare,
-                                       MemSymbol & o_port1Spare,
-                                       MemSymbol & o_eccSpare )
+int32_t mssGetSteerMux<TYPE_OCMB_CHIP>( TargetHandle_t i_ocmb,
+                                        const MemRank & i_rank,
+                                        MemSymbol & o_port0Spare,
+                                        MemSymbol & o_port1Spare,
+                                        MemSymbol & o_eccSpare )
 {
     int32_t o_rc = SUCCESS;
 
diff --git a/src/usr/diag/prdf/common/plat/prdfTargetServices.C b/src/usr/diag/prdf/common/plat/prdfTargetServices.C
index 915426ea9..ba4a79bc6 100755
--- a/src/usr/diag/prdf/common/plat/prdfTargetServices.C
+++ b/src/usr/diag/prdf/common/plat/prdfTargetServices.C
@@ -1794,6 +1794,16 @@ uint8_t getNumMasterRanksPerDimm<TYPE_MEM_PORT>( TargetHandle_t i_trgt,
     return __getNumMasterRanksPerDimm<TYPE_MEM_PORT>( i_trgt, 0, i_ds );
 }
 
+template<>
+uint8_t getNumMasterRanksPerDimm<TYPE_OCMB_CHIP>( TargetHandle_t i_trgt,
+                                                  uint8_t i_ds )
+{
+    // TODO RTC 210072 - Explorer only has one port, however, multiple ports
+    // will be supported in the future. Updates will need to be made here so we
+    // can get the relevant port.
+    TargetHandle_t memPort = getConnectedChild( i_trgt, TYPE_MEM_PORT, 0 );
+    return getNumMasterRanksPerDimm<TYPE_MEM_PORT>( memPort, i_ds );
+}
 //------------------------------------------------------------------------------
 
 template<TARGETING::TYPE T>
@@ -1888,6 +1898,16 @@ uint8_t getNumRanksPerDimm<TYPE_MEM_PORT>( TargetHandle_t i_trgt, uint8_t i_ds )
     return __getNumRanksPerDimm<TYPE_MEM_PORT>( i_trgt, 0, i_ds );
 }
 
+template<>
+uint8_t getNumRanksPerDimm<TYPE_OCMB_CHIP>(TargetHandle_t i_trgt, uint8_t i_ds)
+{
+    // TODO RTC 210072 - Explorer only has one port, however, multiple ports
+    // will be supported in the future. Updates will need to be made here so we
+    // can get the relevant port.
+    TargetHandle_t memPort = getConnectedChild( i_trgt, TYPE_MEM_PORT, 0 );
+    return getNumRanksPerDimm<TYPE_MEM_PORT>( memPort, i_ds );
+}
+
 //##############################################################################
 //##
 //##                        Clock specific functions
diff --git a/src/usr/diag/prdf/common/plugins/prdfParserUtils.C b/src/usr/diag/prdf/common/plugins/prdfParserUtils.C
index 9d2233e75..2409295c1 100644
--- a/src/usr/diag/prdf/common/plugins/prdfParserUtils.C
+++ b/src/usr/diag/prdf/common/plugins/prdfParserUtils.C
@@ -87,9 +87,9 @@ uint8_t symbol2Dq<TARGETING::TYPE_MCA>( uint8_t i_symbol )
 //------------------------------------------------------------------------------
 
 template<>
-uint8_t symbol2Dq<TARGETING::TYPE_MEM_PORT>( uint8_t i_symbol )
+uint8_t symbol2Dq<TARGETING::TYPE_OCMB_CHIP>( uint8_t i_symbol )
 {
-    // MEM_PORT case is identical to MCA
+    // OCMB_CHIP case is identical to MCA
     return symbol2Dq<TARGETING::TYPE_MCA>(i_symbol);
 }
 
@@ -122,10 +122,12 @@ uint8_t symbol2PortSlct<TARGETING::TYPE_MCA>( uint8_t i_symbol )
 //------------------------------------------------------------------------------
 
 template<>
-uint8_t symbol2PortSlct<TARGETING::TYPE_MEM_PORT>( uint8_t i_symbol )
+uint8_t symbol2PortSlct<TARGETING::TYPE_OCMB_CHIP>( uint8_t i_symbol )
 {
-    // Port select does not exist on MEM_PORT. Always return 0 so that code will
-    // continue to work.
+    // TODO RTC 210072 - Explorer only has one port, as such we can just
+    // return 0. However, multiple ports will be supported in the future,
+    // We'll need to figure out how to convert the symbol to a port select for
+    // OCMB at that time.
     return 0;
 }
 
@@ -218,9 +220,9 @@ uint8_t nibble2Symbol<TARGETING::TYPE_MCA>( uint8_t i_x4Dram )
 //------------------------------------------------------------------------------
 
 template<>
-uint8_t nibble2Symbol<TARGETING::TYPE_MEM_PORT>( uint8_t i_x4Dram )
+uint8_t nibble2Symbol<TARGETING::TYPE_OCMB_CHIP>( uint8_t i_x4Dram )
 {
-    // MEM_PORT case is identical to MCA
+    // OCMB_CHIP case is identical to MCA
     return nibble2Symbol<TARGETING::TYPE_MCA>(i_x4Dram);
 }
 
@@ -258,9 +260,9 @@ uint8_t byte2Symbol<TARGETING::TYPE_MCA>( uint8_t i_x8Dram )
 //------------------------------------------------------------------------------
 
 template<>
-uint8_t byte2Symbol<TARGETING::TYPE_MEM_PORT>( uint8_t i_x8Dram )
+uint8_t byte2Symbol<TARGETING::TYPE_OCMB_CHIP>( uint8_t i_x8Dram )
 {
-    // MEM_PORT case is identical to MCA
+    // OCMB_CHIP case is identical to MCA
     return byte2Symbol<TARGETING::TYPE_MCA>(i_x8Dram);
 }
 
@@ -286,9 +288,9 @@ uint8_t symbol2Nibble<TARGETING::TYPE_MCA>( uint8_t i_symbol )
 //------------------------------------------------------------------------------
 
 template<>
-uint8_t symbol2Nibble<TARGETING::TYPE_MEM_PORT>( uint8_t i_symbol )
+uint8_t symbol2Nibble<TARGETING::TYPE_OCMB_CHIP>( uint8_t i_symbol )
 {
-    // MEM_PORT case is identical to MCA
+    // OCMB_CHIP case is identical to MCA
     return symbol2Nibble<TARGETING::TYPE_MCA>(i_symbol);
 }
 
@@ -314,9 +316,9 @@ uint8_t symbol2Byte<TARGETING::TYPE_MCA>( uint8_t i_symbol )
 //------------------------------------------------------------------------------
 
 template<>
-uint8_t symbol2Byte<TARGETING::TYPE_MEM_PORT>( uint8_t i_symbol )
+uint8_t symbol2Byte<TARGETING::TYPE_OCMB_CHIP>( uint8_t i_symbol )
 {
-    // MEM_PORT case is identical to MCA
+    // OCMB_CHIP case is identical to MCA
     return symbol2Byte<TARGETING::TYPE_MCA>(i_symbol);
 }
 
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemIplCeStats.C b/src/usr/diag/prdf/plat/mem/prdfMemIplCeStats.C
index 869aa92e8..b257d0874 100755
--- a/src/usr/diag/prdf/plat/mem/prdfMemIplCeStats.C
+++ b/src/usr/diag/prdf/plat/mem/prdfMemIplCeStats.C
@@ -83,8 +83,8 @@ void MemIplCeStats<TYPE_MCA>::banAnalysis( uint8_t i_dimmSlct,
 //------------------------------------------------------------------------------
 
 template<>
-void MemIplCeStats<TYPE_MEM_PORT>::banAnalysis( uint8_t i_dimmSlct,
-                                                uint8_t i_portSlct )
+void MemIplCeStats<TYPE_OCMB_CHIP>::banAnalysis( uint8_t i_dimmSlct,
+                                                 uint8_t i_portSlct )
 {
     PRDF_ASSERT( i_dimmSlct < MAX_DIMM_PER_PORT );
     PRDF_ASSERT( 0 == i_portSlct );
@@ -117,9 +117,9 @@ void MemIplCeStats<TYPE_MCA>::banAnalysis( uint8_t i_dimmSlct )
 //------------------------------------------------------------------------------
 
 template<>
-void MemIplCeStats<TYPE_MEM_PORT>::banAnalysis( uint8_t i_dimmSlct )
+void MemIplCeStats<TYPE_OCMB_CHIP>::banAnalysis( uint8_t i_dimmSlct )
 {
-    // Only one DIMM per DIMM select on MEM_PORT.
+    // Only one DIMM per DIMM select on OCMB_CHIP.
     banAnalysis( i_dimmSlct, 0 );
 }
 
@@ -481,6 +481,6 @@ void MemIplCeStats<T>::addMruAndCommitErrl( const MemoryMru & i_memmru,
 // need these templates to avoid linker errors
 template class MemIplCeStats<TYPE_MCA>;
 template class MemIplCeStats<TYPE_MBA>;
-template class MemIplCeStats<TYPE_MEM_PORT>;
+template class MemIplCeStats<TYPE_OCMB_CHIP>;
 
 } // end namespace PRDF
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C b/src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C
index 5351b842a..24dfc3813 100644
--- a/src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C
+++ b/src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C
@@ -409,8 +409,8 @@ uint32_t checkEccFirs<TYPE_MCA>( ExtensibleChip * i_chip,
 //------------------------------------------------------------------------------
 
 template<>
-uint32_t checkEccFirs<TYPE_MEM_PORT>( ExtensibleChip * i_chip,
-                                      uint32_t & o_eccAttns )
+uint32_t checkEccFirs<TYPE_OCMB_CHIP>( ExtensibleChip * i_chip,
+                                       uint32_t & o_eccAttns )
 {
     #define PRDF_FUNC "[checkEccFirs<TYPE_MEM_PORT>] "
 
@@ -421,10 +421,8 @@ uint32_t checkEccFirs<TYPE_MEM_PORT>( ExtensibleChip * i_chip,
     PRDF_ASSERT( nullptr != i_chip );
     PRDF_ASSERT( TYPE_MEM_PORT == i_chip->getType() );
 
-    ExtensibleChip * ocmbChip = getConnectedParent( i_chip, TYPE_OCMB_CHIP );
-
-    SCAN_COMM_REGISTER_CLASS * rdffir    = ocmbChip->getRegister( "RDFFIR" );
-    SCAN_COMM_REGISTER_CLASS * mcbistfir = ocmbChip->getRegister( "MCBISTFIR" );
+    SCAN_COMM_REGISTER_CLASS * rdffir    = i_chip->getRegister( "RDFFIR" );
+    SCAN_COMM_REGISTER_CLASS * mcbistfir = i_chip->getRegister( "MCBISTFIR" );
 
     do
     {
@@ -453,7 +451,7 @@ uint32_t checkEccFirs<TYPE_MEM_PORT>( ExtensibleChip * i_chip,
         if ( SUCCESS != o_rc )
         {
             PRDF_ERR( PRDF_FUNC "Read() failed on MCBISTFIR: mcbChip=0x%08x",
-                      ocmbChip->getHuid() );
+                      i_chip->getHuid() );
             break;
         }
 
diff --git a/src/usr/diag/prdf/plat/prdfPlatServices.C b/src/usr/diag/prdf/plat/prdfPlatServices.C
index b2ee8566e..42fcd2324 100644
--- a/src/usr/diag/prdf/plat/prdfPlatServices.C
+++ b/src/usr/diag/prdf/plat/prdfPlatServices.C
@@ -696,13 +696,13 @@ bool isRowRepairEnabled<TYPE_MCA>( ExtensibleChip * i_chip,
 }
 
 template<>
-bool isRowRepairEnabled<TYPE_MEM_PORT>( ExtensibleChip * i_chip,
-                                        const MemRank & i_rank )
+bool isRowRepairEnabled<TYPE_OCMB_CHIP>( ExtensibleChip * i_chip,
+                                         const MemRank & i_rank )
 {
-    #define PRDF_FUNC "[PlatServices::isRowRepairEnabled<TYPE_MEM_PORT>] "
+    #define PRDF_FUNC "[PlatServices::isRowRepairEnabled<TYPE_OCMB_CHIP>] "
 
     PRDF_ASSERT( nullptr != i_chip );
-    PRDF_ASSERT( TYPE_MEM_PORT == i_chip->getType() );
+    PRDF_ASSERT( TYPE_OCMB_CHIP == i_chip->getType() );
 
     bool o_isEnabled = false;