PRD: Make getDimmSlct/Port generic

Change-Id: I1d96a974664ee1d3fdb59c0596a22bc87bd4a5ed
RTC: 199010
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/67773
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Squashed: Ic2144b589f9a26e269ffd2803393d6be7565a23e
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68274
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>

2 files changed, 9 insertions, 9 deletions

diff --git a/src/usr/diag/prdf/plat/mem/prdfMemDynDealloc.C b/src/usr/diag/prdf/plat/mem/prdfMemDynDealloc.C
index 9da77694a..41b0de3ea 100644
--- a/src/usr/diag/prdf/plat/mem/prdfMemDynDealloc.C
+++ b/src/usr/diag/prdf/plat/mem/prdfMemDynDealloc.C
@@ -1099,7 +1099,7 @@ int32_t __getDimmRange( TargetHandle_t i_dimm,
         }
 
         // Get the DIMM select.
-        uint8_t dimmSlct = getDimmSlct<T>( i_dimm );
+        uint8_t dimmSlct = getDimmSlct( i_dimm );
 
         // Get the address range of i_dimm.
         MemAddr startAddr, endAddr;
@@ -1172,8 +1172,8 @@ bool isDimmPair( TargetHandle_t i_dimm1, TargetHandle_t i_dimm2 )
     bool isDimmPair = false;
     do
     {
-        uint8_t dimm1Slct = getDimmSlct<T>( i_dimm1 );
-        uint8_t dimm2Slct = getDimmSlct<T>( i_dimm2 );
+        uint8_t dimm1Slct = getDimmSlct( i_dimm1 );
+        uint8_t dimm2Slct = getDimmSlct( i_dimm2 );
 
         isDimmPair = ( ( dimm1Slct == dimm2Slct ) &&
                        ( getConnectedParent( i_dimm1, T ) ==
@@ -1191,8 +1191,8 @@ bool compareDimms( TargetHandle_t i_dimm1, TargetHandle_t i_dimm2 )
     bool isSmall = false;
     do
     {
-        uint8_t dimm1Slct = getDimmSlct<T>( i_dimm1 );
-        uint8_t dimm2Slct = getDimmSlct<T>( i_dimm2 );
+        uint8_t dimm1Slct = getDimmSlct( i_dimm1 );
+        uint8_t dimm2Slct = getDimmSlct( i_dimm2 );
 
         TargetHandle_t tgt1 = getConnectedParent( i_dimm1, T );
         TargetHandle_t tgt2 = getConnectedParent( i_dimm2, T );
diff --git a/src/usr/diag/prdf/plat/mem/prdfRestoreDramRepairs.C b/src/usr/diag/prdf/plat/mem/prdfRestoreDramRepairs.C
index 752165051..ef76aca3c 100644
--- a/src/usr/diag/prdf/plat/mem/prdfRestoreDramRepairs.C
+++ b/src/usr/diag/prdf/plat/mem/prdfRestoreDramRepairs.C
@@ -121,7 +121,7 @@ void __calloutDimm( errlHndl_t & io_errl, TargetHandle_t i_portTrgt,
     // the repairs will need to be rediscovered.
 
     std::vector<MemRank> ranks;
-    getMasterRanks<T>( i_portTrgt, ranks, getDimmSlct<T>(i_dimmTrgt) );
+    getMasterRanks<T>( i_portTrgt, ranks, getDimmSlct(i_dimmTrgt) );
 
     uint8_t data[D][DQ_BITMAP::BITMAP_SIZE];
     memset( data, 0x00, sizeof(data) );
@@ -422,7 +422,7 @@ bool processBadDimms<TYPE_MCA>( TargetHandle_t i_trgt, uint8_t i_badDimmMask )
         // DIMM had more bad bits than could be repaired. Note: the value is
         // actually a 4-bit field for use with Centaur, but we only use the
         // first 2 bits of that field here.
-        uint8_t mask = 0x80 >> getDimmSlct<TYPE_MCA>(dimm);
+        uint8_t mask = 0x80 >> getDimmSlct(dimm);
 
         if ( 0 != (i_badDimmMask & mask) )
         {
@@ -470,8 +470,8 @@ bool processBadDimms<TYPE_MBA>( TargetHandle_t i_trgt, uint8_t i_badDimmMask )
     TargetHandleList dimms = getConnected( i_trgt, TYPE_DIMM );
     for ( auto & dimm : dimms )
     {
-        uint8_t portSlct = getDimmPort<TYPE_MBA>( dimm );
-        uint8_t dimmSlct = getDimmSlct<TYPE_MBA>( dimm );
+        uint8_t portSlct = getDimmPort( dimm );
+        uint8_t dimmSlct = getDimmSlct( dimm );
 
         // The 4 bits of i_badDimmMask is defined as p0d0, p0d1, p1d0, and p1d1.
         uint8_t mask = 0x8 >> (portSlct * MBA_DIMMS_PER_RANK + dimmSlct);