PRD: clarified getTargetPosition() vs getMemChnl() for MEMBUF

Change-Id: I0fb785867f40db5376a8e1dfda3116cf5c9a9fd7 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41571 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com> Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com> Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41765 Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
open-power · Jun 14, 2017 · 8ca7748 · 8ca7748
1 parent b438477
commit 8ca7748
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/usr/diag/prdf/common/plat/mem/prdfMemoryMru.C b/src/usr/diag/prdf/common/plat/mem/prdfMemoryMru.C
@@ -296,7 +296,7 @@ void MemoryMru::getCommonVars()
         TargetHandle_t membuf = getConnectedParent( iv_target, TYPE_MEMBUF );
 
         iv_memMruMeld.s.isMca   = 0;
-        iv_memMruMeld.s.chnlPos = getTargetPosition( membuf );
+        iv_memMruMeld.s.chnlPos = getMemChnl( membuf );
         iv_memMruMeld.s.mbaPos  = getTargetPosition( iv_target );
     }
     // If our target is an MCA, then chnlPos will specify the MCA position

diff --git a/src/usr/diag/prdf/common/plat/prdfTargetServices.C b/src/usr/diag/prdf/common/plat/prdfTargetServices.C
@@ -757,7 +757,7 @@ TargetHandle_t getConnectedChild( TargetHandle_t i_target, TYPE i_connType,
             // position number for MCS->MEMBUF connections only.
             itr = std::find_if( list.begin(), list.end(),
                                 [&](const TargetHandle_t & t)
-                                { return trgtPos == getTargetPosition(t); } );
+                                { return trgtPos == getMemChnl(t); } );
         }
         else if ( TYPE_MCA == trgtType && TYPE_DIMM == i_connType )
         {
@@ -1047,11 +1047,8 @@ uint32_t getTargetPosition( TargetHandle_t i_trgt )
                 case TYPE_OSC:
                 case TYPE_OSCPCICLK:
                 case TYPE_OSCREFCLK:
-                    o_pos = i_trgt->getAttr<ATTR_POSITION>();
-                    break;
-
                 case TYPE_MEMBUF:
-                    o_pos = getMemChnl( i_trgt );
+                    o_pos = i_trgt->getAttr<ATTR_POSITION>();
                     break;
 
                 default:

diff --git a/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C b/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C
@@ -625,7 +625,7 @@ errlHndl_t getHwConfig( HOMER_Data_t & o_data, const HwInitialized_t i_curHw )
                 for ( TargetHandleList::iterator membIt = membList.begin();
                         membIt != membList.end(); ++membIt )
                 {
-                    uint32_t membPos = getTargetPosition(*membIt);
+                    uint32_t membPos = getMemChnl(*membIt); // relative to proc
                     PRDF_ASSERT( membPos < MAX_MEMB_PER_PROC );
 
                     o_data.membMasks[procPos] |= 0x80 >> membPos;