PRD: Axone MemoryMru Updates

Change-Id: I925e06e59ecab97d4f951ea4eafca6d27238312d
RTC: 199037
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/82156
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Benjamen G Tyner <ben.tyner@ibm.com>
Reviewed-by: Paul Greenwood <paul.greenwood@ibm.com>
Reviewed-by: Zane C Shelley <zshelle@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/82565
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>

5 files changed, 115 insertions, 35 deletions

diff --git a/src/usr/diag/prdf/common/plat/mem/prdfMemCaptureData.C b/src/usr/diag/prdf/common/plat/mem/prdfMemCaptureData.C
index 548f47f56..4d55c7c50 100644
--- a/src/usr/diag/prdf/common/plat/mem/prdfMemCaptureData.C
+++ b/src/usr/diag/prdf/common/plat/mem/prdfMemCaptureData.C
@@ -66,7 +66,7 @@ void addExtMemMruData( const MemoryMru & i_memMru, errlHndl_t io_errl )
     {
         TargetHandle_t trgt = i_memMru.getTrgt();
 
-        if ( TYPE_MEM_PORT == getTargetType(trgt) )
+        if ( TYPE_OCMB_CHIP == getTargetType(trgt) )
         {
             TargetHandle_t dimm = getConnectedDimm( trgt, i_memMru.getRank() );
             extMemMru.isX4Dram = isDramWidthX4( dimm ) ? 1 : 0;
@@ -106,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
                 {
diff --git a/src/usr/diag/prdf/common/plat/mem/prdfMemoryMru.C b/src/usr/diag/prdf/common/plat/mem/prdfMemoryMru.C
index bb911847e..4cd596514 100755
--- a/src/usr/diag/prdf/common/plat/mem/prdfMemoryMru.C
+++ b/src/usr/diag/prdf/common/plat/mem/prdfMemoryMru.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2018                        */
+/* Contributors Listed Below - COPYRIGHT 2013,2019                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -70,42 +70,78 @@ MemoryMru::MemoryMru( uint32_t i_memMru ) :
         PRDF_ASSERT( false );
     }
 
-    // If our target is MBA, get the chnlPos from the membuf
-    if ( 0 == iv_memMruMeld.s.isMca )
+    // If our target is MCA
+    if ( 1 == iv_memMruMeld.s.isMca )
     {
-        TargetHandle_t membuf = getConnectedChild( proc, TYPE_MEMBUF,
+        iv_target = getConnectedChild( proc, TYPE_MCA,
                 iv_memMruMeld.s.chnlPos );
-        if ( NULL == membuf )
+        if ( NULL == iv_target )
         {
-            PRDF_ERR( PRDF_FUNC "Could not find functional membuf "
+            PRDF_ERR( PRDF_FUNC "Could not find functional mca "
                     "attached to proc 0x%08X at pos: %u", getHuid( proc ),
                     iv_memMruMeld.s.chnlPos );
             PRDF_ASSERT( false );
         }
+    }
+    // If our target is OCMB
+    else if ( 1 == iv_memMruMeld.s.isOcmb )
+    {
+        // chnlPos specifies the position of the MCC relative to the proc
+        TargetHandle_t mcc = getConnectedChild( proc, TYPE_MCC,
+                                                iv_memMruMeld.s.chnlPos );
+        if ( nullptr == mcc )
+        {
+            PRDF_ERR( PRDF_FUNC "Could not find functional mcc attached to "
+                      "proc 0x%08x at pos: %u", getHuid(proc),
+                      iv_memMruMeld.s.chnlPos );
+            PRDF_ASSERT( false );
+        }
 
-        iv_target = getConnectedChild( membuf, TYPE_MBA,
-                iv_memMruMeld.s.mbaPos );
-        if ( NULL == iv_target )
+        // mbaPos specifies the position of the OMI relative to the MCC
+        TargetHandle_t omi = getConnectedChild( mcc, TYPE_OMI,
+                                                iv_memMruMeld.s.mbaPos );
+        if ( nullptr == omi )
         {
-            PRDF_ERR( PRDF_FUNC "Could not find functional mba attached "
-                    "to 0x%08X at pos: %u", getHuid( membuf ),
-                    iv_memMruMeld.s.mbaPos );
+            PRDF_ERR( PRDF_FUNC "Could not find functional omi attached to "
+                      "mcc 0x%08x at pos: %u", getHuid(mcc),
+                      iv_memMruMeld.s.mbaPos );
+            PRDF_ASSERT( false );
+        }
+
+        // There is only one OCMB attached per OMI
+        iv_target = getConnectedChild( omi, TYPE_OCMB_CHIP, 0 );
+        if ( nullptr == iv_target )
+        {
+            PRDF_ERR( PRDF_FUNC "Could not find functional ocmb attached to "
+                      "omi 0x%08x", getHuid(mcc) );
             PRDF_ASSERT( false );
         }
+
+
     }
+    // If our target is MBA, get the chnlPos from the membuf
     else
     {
-        iv_target = getConnectedChild( proc, TYPE_MCA,
+        TargetHandle_t membuf = getConnectedChild( proc, TYPE_MEMBUF,
                 iv_memMruMeld.s.chnlPos );
-        if ( NULL == iv_target )
+        if ( nullptr == membuf )
         {
-            PRDF_ERR( PRDF_FUNC "Could not find functional mca "
+            PRDF_ERR( PRDF_FUNC "Could not find functional membuf "
                     "attached to proc 0x%08X at pos: %u", getHuid( proc ),
                     iv_memMruMeld.s.chnlPos );
             PRDF_ASSERT( false );
         }
-    }
 
+        iv_target = getConnectedChild( membuf, TYPE_MBA,
+                iv_memMruMeld.s.mbaPos );
+        if ( nullptr == iv_target )
+        {
+            PRDF_ERR( PRDF_FUNC "Could not find functional mba attached "
+                    "to 0x%08X at pos: %u", getHuid( membuf ),
+                    iv_memMruMeld.s.mbaPos );
+            PRDF_ASSERT( false );
+        }
+    }
 
     // Get the rank
     iv_rank = MemRank( iv_memMruMeld.s.mrank, iv_memMruMeld.s.srank );
@@ -247,7 +283,8 @@ TargetHandleList MemoryMru::getCalloutList() const
                 }
             }
         }
-        else if ( TARGETING::TYPE_MCA == getTargetType(iv_target) )
+        else if ( TARGETING::TYPE_MCA == getTargetType(iv_target) ||
+                  TARGETING::TYPE_OCMB_CHIP == getTargetType(iv_target) )
         {
             if ( CALLOUT_ALL_MEM == iv_special )
             {
@@ -304,6 +341,11 @@ void MemoryMru::getCommonVars()
     {
         proc = getConnectedParent( iv_target, TYPE_PROC );
     }
+    else if ( TYPE_OCMB_CHIP == trgtType )
+    {
+        TargetHandle_t mcc = getConnectedParent( iv_target, TYPE_MCC );
+        proc = getConnectedParent( mcc, TYPE_PROC );
+    }
     else
     {
         PRDF_ERR( PRDF_FUNC "Invalid target type" );
@@ -323,11 +365,27 @@ void MemoryMru::getCommonVars()
     }
     // If our target is an MCA, then chnlPos will specify the MCA position
     // and mbaPos will be an unused field
-    else
+    else if ( TYPE_MCA == getTargetType(iv_target) )
     {
         iv_memMruMeld.s.isMca   = 1;
         iv_memMruMeld.s.chnlPos = getTargetPosition( iv_target );
     }
+    // If our target is an OCMB, then chnlPos will specify the MCC position and
+    // mbaPos will specify the OMI position.
+    else if ( TYPE_OCMB_CHIP == getTargetType(iv_target) )
+    {
+        TargetHandle_t omi = getConnectedParent( iv_target, TYPE_OMI );
+        TargetHandle_t mcc = getConnectedParent( omi, TYPE_MCC );
+
+        iv_memMruMeld.s.isOcmb  = 1;
+        iv_memMruMeld.s.chnlPos = getTargetPosition(mcc) % MAX_MCC_PER_PROC;
+        iv_memMruMeld.s.mbaPos  = getTargetPosition(omi) % MAX_OMI_PER_MCC;
+    }
+    else
+    {
+        PRDF_ERR( PRDF_FUNC "Invalid target type" );
+        PRDF_ASSERT(false);
+    }
 
     iv_memMruMeld.s.nodePos    = getTargetPosition( node );
     iv_memMruMeld.s.procPos    = getTargetPosition( proc );
diff --git a/src/usr/diag/prdf/common/plat/prdfPlatServices_common.C b/src/usr/diag/prdf/common/plat/prdfPlatServices_common.C
index 9a2f1961a..74d52ed3a 100644
--- a/src/usr/diag/prdf/common/plat/prdfPlatServices_common.C
+++ b/src/usr/diag/prdf/common/plat/prdfPlatServices_common.C
@@ -880,6 +880,17 @@ void getDimmDqAttr<TYPE_MEM_PORT>( TargetHandle_t i_target,
 } // end function getDimmDqAttr
 
 template<>
+void getDimmDqAttr<TYPE_OCMB_CHIP>( TargetHandle_t i_target,
+                                    uint8_t (&o_dqMapPtr)[DQS_PER_DIMM] )
+{
+    PRDF_ASSERT( TYPE_OCMB_CHIP == getTargetType(i_target) );
+
+    // TODO RTC 210072 - Support for multiple ports per OCMB
+    TargetHandle_t memPort = getConnectedChild( i_target, TYPE_MEM_PORT, 0 );
+    getDimmDqAttr<TYPE_MEM_PORT>( memPort, o_dqMapPtr );
+}
+
+template<>
 void getDimmDqAttr<TYPE_DIMM>( TargetHandle_t i_target,
                                uint8_t (&o_dqMapPtr)[DQS_PER_DIMM] )
 {
diff --git a/src/usr/diag/prdf/common/plugins/prdfMemLogParse.C b/src/usr/diag/prdf/common/plugins/prdfMemLogParse.C
index 390178f6e..1518319d1 100644
--- a/src/usr/diag/prdf/common/plugins/prdfMemLogParse.C
+++ b/src/usr/diag/prdf/common/plugins/prdfMemLogParse.C
@@ -2848,17 +2848,22 @@ void initMemMruStrings( MemoryMruData::MemMruMeld i_mm, bool & o_addDramSite,
     memset( o_header, '\0', HEADER_SIZE );
     memset( o_data,   '\0', DATA_SIZE   );
 
-    // Get the position info (default MCA).
-    const char * compStr = "mca";
+    // Get the position info (default MBA).
+
+    const char * compStr = "mba";
     uint8_t      nodePos = i_mm.s.nodePos;
-    uint8_t      chipPos = i_mm.s.procPos;
-    uint8_t      compPos = i_mm.s.chnlPos;
+    uint8_t      chipPos = (i_mm.s.procPos << 3) | i_mm.s.chnlPos;
+    uint8_t      compPos = i_mm.s.mbaPos;
 
-    if ( !i_mm.s.isMca ) // MBA
+    if ( i_mm.s.isMca ) // MCA
+    {
+        compStr = "mca";
+        chipPos = i_mm.s.procPos;
+        compPos = i_mm.s.chnlPos;
+    }
+    else if ( i_mm.s.isOcmb ) // OCMB
     {
-        compStr = "mba";
-        chipPos = (i_mm.s.procPos << 3) | i_mm.s.chnlPos;
-        compPos =  i_mm.s.mbaPos;
+        compStr = "ocmb";
     }
 
     // Build the header string.
@@ -2953,13 +2958,13 @@ void addDramSiteString( const MemoryMruData::ExtendedData & i_extMemMru,
             }
         }
     }
-    else // IS DIMMs
+    else // Dram site locations not supported
     {
         // Add DQ info.
         char tmp[DATA_SIZE] = { '\0' };
         strcat( io_data, "DQ:" );
 
-        if ( mm.s.isMca ) // MCA
+        if ( mm.s.isMca || mm.s.isOcmb ) // MCA, OCMB
         {
             // There is only one DQ per symbol.
             snprintf( tmp, DATA_SIZE, "%d", i_extMemMru.dqMapping[dqIdx] );
diff --git a/src/usr/diag/prdf/common/plugins/prdfMemoryMruData.H b/src/usr/diag/prdf/common/plugins/prdfMemoryMruData.H
index a9a4498d3..f2fdaff26 100644
--- a/src/usr/diag/prdf/common/plugins/prdfMemoryMruData.H
+++ b/src/usr/diag/prdf/common/plugins/prdfMemoryMruData.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2013,2019                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -88,6 +88,10 @@ union MemMruMeld
         //       version field so that the error log parser know which format to
         //       used.
 
+        // NOTE: For OCMBs, specified by the isOcmb field, chnlPos will specify
+        //       the MCC position within the proc and mbaPos will specify the
+        //       OMI position within the channel.
+
 #if !( __BYTE_ORDER == __LITTLE_ENDIAN )
 
         uint32_t valid      : 1; ///< Used to indicate nothing failed while
@@ -106,13 +110,15 @@ union MemMruMeld
         uint32_t eccSpared  : 1; ///< True if symbol is on ECC DRAM
         uint32_t srank      : 3; ///< Slave rank (0-7)
         // If isMca is specified, then chnlPos above will specify the MCA pos
-        // and the mbaPos field will be unused
+        // and the mbaPos field will be unused. See above note for OCMB usage.
         uint32_t isMca      : 1; ///< True if MCA is used as opposed to MBA
-        uint32_t unused     : 3; ///< 3 Bits currently unused
+        uint32_t isOcmb     : 1; ///< True if OCMB is used
+        uint32_t unused     : 2; ///< 2 Bits currently unused
 #else
         // Need to reverse this to make the uint32_t look right in the
         // simulator.
-        uint32_t unused     : 3;
+        uint32_t unused     : 2;
+        uint32_t isOcmb     : 1;
         uint32_t isMca      : 1;
         uint32_t srank      : 3;
         uint32_t eccSpared  : 1;