PRD: Axone more MEM_PORT cleanup and misc updates

Change-Id: I486f5b93d742f8c448c148da641c64152c050a68
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/81926
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Benjamen G Tyner <ben.tyner@ibm.com>
Reviewed-by: Zane C Shelley <zshelle@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/81987
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>

8 files changed, 19 insertions, 60 deletions

diff --git a/src/usr/diag/prdf/common/plat/mem/prdfMemEccAnalysis.C b/src/usr/diag/prdf/common/plat/mem/prdfMemEccAnalysis.C
index e097114bb..e58e50e5c 100644
--- a/src/usr/diag/prdf/common/plat/mem/prdfMemEccAnalysis.C
+++ b/src/usr/diag/prdf/common/plat/mem/prdfMemEccAnalysis.C
@@ -149,7 +149,6 @@ uint32_t handleMemUe<TYPE_OCMB_CHIP>( ExtensibleChip * i_chip,
 
     uint32_t o_rc = SUCCESS;
 
-    PRDF_ERR( PRDF_FUNC "Function not supported yet" );
     do
     {
         // First check to see if this is a side-effect UE.
diff --git a/src/usr/diag/prdf/common/plat/mem/prdfMemMark.C b/src/usr/diag/prdf/common/plat/mem/prdfMemMark.C
index 529d15181..e43d844c4 100644
--- a/src/usr/diag/prdf/common/plat/mem/prdfMemMark.C
+++ b/src/usr/diag/prdf/common/plat/mem/prdfMemMark.C
@@ -1468,17 +1468,8 @@ uint32_t chipMarkCleanup( ExtensibleChip * i_chip, const MemRank & i_rank,
         // Set the chip mark in the DRAM Repairs VPD.
         if ( !areDramRepairsDisabled() )
         {
-            if ( TYPE_OCMB_CHIP == i_chip->getType() )
-            {
-                TargetHandle_t memPort = getConnectedChild( i_chip->getTrgt(),
-                    TYPE_MEM_PORT, chipMark.getSymbol().getPortSlct() );
-                o_rc = setDramInVpd( memPort, i_rank, chipMark.getSymbol() );
-            }
-            else
-            {
-                o_rc = setDramInVpd( i_chip->getTrgt(), i_rank,
-                                     chipMark.getSymbol() );
-            }
+            o_rc = setDramInVpd( i_chip->getTrgt(), i_rank,
+                                 chipMark.getSymbol() );
             if ( SUCCESS != o_rc )
             {
                 PRDF_ERR( PRDF_FUNC "setDramInVpd(0x%08x,0x%02x) failed",
diff --git a/src/usr/diag/prdf/common/plat/mem/prdfMemSymbol.C b/src/usr/diag/prdf/common/plat/mem/prdfMemSymbol.C
index fc4fa3a92..d58d6a177 100755
--- a/src/usr/diag/prdf/common/plat/mem/prdfMemSymbol.C
+++ b/src/usr/diag/prdf/common/plat/mem/prdfMemSymbol.C
@@ -205,7 +205,7 @@ uint8_t MemSymbol::getDramRelCenDqs() const
     const uint8_t X8_DRAM_SPARE = 9;
 
     bool isX4 = true;
-    if ( TYPE_MEM_PORT == getTargetType(iv_trgt) )
+    if ( TYPE_OCMB_CHIP == getTargetType(iv_trgt) )
     {
         TargetHandle_t dimm = getConnectedDimm(iv_trgt, iv_rank, getPortSlct());
         isX4 = isDramWidthX4( dimm );
@@ -246,7 +246,7 @@ uint8_t MemSymbol::getDramPins() const
 {
     TYPE trgtType = getTargetType( iv_trgt );
     bool isX4 = true;
-    if ( TYPE_MEM_PORT == getTargetType(iv_trgt) )
+    if ( TYPE_OCMB_CHIP == trgtType )
     {
         TargetHandle_t dimm = getConnectedDimm(iv_trgt, iv_rank, getPortSlct());
         isX4 = isDramWidthX4( dimm );
@@ -285,7 +285,7 @@ uint8_t MemSymbol::getDramSymbol() const
     uint8_t dramSymbol = SYMBOLS_PER_RANK;
     TYPE trgtType = getTargetType( iv_trgt );
     bool isX4 = true;
-    if ( TYPE_MEM_PORT == getTargetType(iv_trgt) )
+    if ( TYPE_OCMB_CHIP == trgtType )
     {
         TargetHandle_t dimm = getConnectedDimm(iv_trgt, iv_rank, getPortSlct());
         isX4 = isDramWidthX4( dimm );
diff --git a/src/usr/diag/prdf/common/plat/mem/prdfMemSymbol.H b/src/usr/diag/prdf/common/plat/mem/prdfMemSymbol.H
index 80b101ab1..00b0c7cfd 100755
--- a/src/usr/diag/prdf/common/plat/mem/prdfMemSymbol.H
+++ b/src/usr/diag/prdf/common/plat/mem/prdfMemSymbol.H
@@ -79,7 +79,7 @@ class MemSymbol
 
     /**
      * @brief  Creates a MemSymbol from a symbol.
-     * @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_symbol The input symbol.
      * @param  i_pins   See enum DqMask.
@@ -218,7 +218,7 @@ class MemSymbol
 
 /**
  * @brief  Reads the memory NCE/TCE vector trap register from hardware.
- * @param  i_chip   MCA, MBA, or MEM_PORT.
+ * @param  i_chip   MCA, MBA, or OCMB_CHIP.
  * @param  i_rank   The rank this symbol is on.
  * @param  o_sym1   The first symbol. Should always be valid for both NCE/TCE.
  * @param  o_sym2   The second symbol. Only valid for TCEs.
diff --git a/src/usr/diag/prdf/common/plat/mem/prdfMemThresholds.C b/src/usr/diag/prdf/common/plat/mem/prdfMemThresholds.C
index 6ad8a724a..f9c73b739 100755
--- a/src/usr/diag/prdf/common/plat/mem/prdfMemThresholds.C
+++ b/src/usr/diag/prdf/common/plat/mem/prdfMemThresholds.C
@@ -237,14 +237,8 @@ uint32_t getScrubCeThreshold( ExtensibleChip * i_chip, const MemRank & i_rank )
 
 // need these templates to avoid linker errors
 template
-uint32_t getScrubCeThreshold<TYPE_MCA>( ExtensibleChip * i_chip,
-                                        const MemRank & i_rank );
-template
 uint32_t getScrubCeThreshold<TYPE_MBA>( ExtensibleChip * i_chip,
                                         const MemRank & i_rank );
-template
-uint32_t getScrubCeThreshold<TYPE_MEM_PORT>( ExtensibleChip * i_chip,
-                                             const MemRank & i_rank );
 
 } // end namespace PRDF
 
diff --git a/src/usr/diag/prdf/common/plat/prdfPlatServices_common.C b/src/usr/diag/prdf/common/plat/prdfPlatServices_common.C
index d7bd5b46b..9a2f1961a 100644
--- a/src/usr/diag/prdf/common/plat/prdfPlatServices_common.C
+++ b/src/usr/diag/prdf/common/plat/prdfPlatServices_common.C
@@ -971,7 +971,7 @@ int32_t mssGetSteerMux<TYPE_OCMB_CHIP>( TargetHandle_t i_ocmb,
 
     uint8_t port0Spare, port1Spare, eccSpare;
 
-    fapi2::Target<fapi2::TARGET_TYPE_MEM_PORT> fapiPort(i_memPort);
+    fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP> fapiPort(i_ocmb);
     FAPI_INVOKE_HWP( errl, mss_check_steering, fapiPort,
             i_rank.getMaster(), port0Spare, port1Spare, eccSpare );
 
@@ -979,15 +979,15 @@ int32_t mssGetSteerMux<TYPE_OCMB_CHIP>( TargetHandle_t i_ocmb,
     {
         PRDF_ERR( "[PlatServices::mssGetSteerMux] mss_check_steering() "
                   "failed. HUID: 0x%08x rank: %d",
-                  getHuid(i_memPort), i_rank.getMaster() );
+                  getHuid(i_ocmb), i_rank.getMaster() );
         PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT );
         o_rc = FAIL;
     }
     else
     {
-        o_port0Spare = MemSymbol::fromSymbol( i_memPort, i_rank, port0Spare );
-        o_port1Spare = MemSymbol::fromSymbol( i_memPort, i_rank, port1Spare );
-        o_eccSpare   = MemSymbol::fromSymbol( i_memPort, i_rank, eccSpare   );
+        o_port0Spare = MemSymbol::fromSymbol( i_ocmb, i_rank, port0Spare );
+        o_port1Spare = MemSymbol::fromSymbol( i_ocmb, i_rank, port1Spare );
+        o_eccSpare   = MemSymbol::fromSymbol( i_ocmb, i_rank, eccSpare   );
     }
 #endif
     */
diff --git a/src/usr/diag/prdf/common/plat/prdfTargetServices.C b/src/usr/diag/prdf/common/plat/prdfTargetServices.C
index ad73ba49a..e881865ce 100755
--- a/src/usr/diag/prdf/common/plat/prdfTargetServices.C
+++ b/src/usr/diag/prdf/common/plat/prdfTargetServices.C
@@ -1683,14 +1683,6 @@ void getMasterRanks<TYPE_MBA>( TargetHandle_t i_trgt,
 }
 
 template<>
-void getMasterRanks<TYPE_MEM_PORT>( TargetHandle_t i_trgt,
-                                    std::vector<MemRank> & o_ranks,
-                                    uint8_t i_ds )
-{
-    __getMasterRanks<TYPE_MEM_PORT>( i_trgt, o_ranks, 0, i_ds );
-}
-
-template<>
 void getMasterRanks<TYPE_OCMB_CHIP>( TargetHandle_t i_trgt,
                                      std::vector<MemRank> & o_ranks,
                                      uint8_t i_ds )
@@ -1767,11 +1759,7 @@ void getSlaveRanks<TYPE_OCMB_CHIP>( TargetHandle_t i_trgt,
                                     std::vector<MemRank> & o_ranks,
                                     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 );
-    __getSlaveRanks<TYPE_MEM_PORT>( memPort, o_ranks, i_ds );
+    __getSlaveRanks<TYPE_OCMB_CHIP>( i_trgt, o_ranks, i_ds );
 }
 
 //------------------------------------------------------------------------------
@@ -1868,13 +1856,6 @@ uint8_t getNumMasterRanksPerDimm<TYPE_MBA>( TargetHandle_t i_trgt,
 }
 
 template<>
-uint8_t getNumMasterRanksPerDimm<TYPE_MEM_PORT>( TargetHandle_t i_trgt,
-                                                 uint8_t i_ds )
-{
-    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 )
 {
@@ -1882,7 +1863,7 @@ uint8_t getNumMasterRanksPerDimm<TYPE_OCMB_CHIP>( TargetHandle_t i_trgt,
     // 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 );
+    return __getNumMasterRanksPerDimm<TYPE_MEM_PORT>( memPort, 0, i_ds );
 }
 //------------------------------------------------------------------------------
 
@@ -1973,19 +1954,13 @@ uint8_t getNumRanksPerDimm<TYPE_MBA>( TargetHandle_t i_trgt, uint8_t i_ds )
 }
 
 template<>
-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 );
+    return __getNumRanksPerDimm<TYPE_MEM_PORT>( memPort, 0, i_ds );
 }
 
 //##############################################################################
diff --git a/src/usr/diag/prdf/common/plat/prdfTargetServices.H b/src/usr/diag/prdf/common/plat/prdfTargetServices.H
index cead140df..34af865d7 100755
--- a/src/usr/diag/prdf/common/plat/prdfTargetServices.H
+++ b/src/usr/diag/prdf/common/plat/prdfTargetServices.H
@@ -452,7 +452,7 @@ uint8_t getColNumConfig( TARGETING::TargetHandle_t i_trgt );
 
 /**
  * @brief  Returns a sorted list of configured master ranks for an MCA or MBA.
- * @param  i_trgt  MCA, MBA, or MEM_PORT target.
+ * @param  i_trgt  MCA, MBA, or OCMB_CHIP target.
  * @param  o_ranks The returned list.
  * @param  i_ds    When used, this function will only return the list of ranks
  *                 for the target DIMM select. Otherwise, the default is to
@@ -468,7 +468,7 @@ void getMasterRanks( TARGETING::TargetHandle_t i_trgt,
 
 /**
  * @brief  Returns a sorted list of configured slave ranks for an MCA or MBA.
- * @param  i_trgt  MCA, MBA, or MEM_PORT target.
+ * @param  i_trgt  MCA, MBA, or OCMB_CHIP target.
  * @param  o_ranks The returned list.
  * @param  i_ds    When used, this function will only return the list of ranks
  *                 for the target DIMM select. Otherwise, the default is to
@@ -484,7 +484,7 @@ void getSlaveRanks( TARGETING::TargetHandle_t i_trgt,
 
 /**
  * @brief  Obtains the number of master ranks per DIMM select.
- * @param  i_trgt MCA, MBA, or MEM_PORT target.
+ * @param  i_trgt MCA, MBA, or OCMB_CHIP target.
  * @param  i_ds   DIMM select.
  * @return Total number of master ranks configured per DIMM select.
  */
@@ -495,7 +495,7 @@ uint8_t getNumMasterRanksPerDimm( TARGETING::TargetHandle_t i_trgt,
 /**
  * @brief  Obtains the total number of ranks (including slave ranks) per DIMM
  *         select.
- * @param  i_trgt MCA, MBA, or MEM_PORT target.
+ * @param  i_trgt MCA, MBA, or OCMB_CHIP target.
  * @param  i_ds   DIMM select.
  * @return Total number of ranks configured per DIMM select.
  */