summaryrefslogtreecommitdiffstats
path: root/src/usr/diag/prdf/common/plat/mem
diff options
context:
space:
mode:
Diffstat (limited to 'src/usr/diag/prdf/common/plat/mem')
-rw-r--r--src/usr/diag/prdf/common/plat/mem/prdfMemCaptureData.C20
-rw-r--r--src/usr/diag/prdf/common/plat/mem/prdfMemCeTable.C8
2 files changed, 4 insertions, 24 deletions
diff --git a/src/usr/diag/prdf/common/plat/mem/prdfMemCaptureData.C b/src/usr/diag/prdf/common/plat/mem/prdfMemCaptureData.C
index 985c3dcd6..14ee4a4ca 100644
--- a/src/usr/diag/prdf/common/plat/mem/prdfMemCaptureData.C
+++ b/src/usr/diag/prdf/common/plat/mem/prdfMemCaptureData.C
@@ -68,27 +68,13 @@ void addExtMemMruData( const MemoryMru & i_memMru, errlHndl_t io_errl )
extMemMru.isX4Dram = isDramWidthX4( trgt ) ? 1 : 0;
// Get the DIMM type.
- bool isBufDimm = false;
if ( TYPE_MBA == getTargetType(trgt) )
{
- isBufDimm = isMembufOnDimm<TYPE_MBA>( trgt );
+ extMemMru.isBufDimm = isMembufOnDimm<TYPE_MBA>( trgt ) ? 1 : 0;
+ extMemMru.cardType = getMemBufRawCardType<TYPE_MBA>( trgt );
}
- extMemMru.isBufDimm = isBufDimm ? 1 : 0;
- if ( isBufDimm )
- {
- // Get the raw card type (Centaur DIMMs only).
- CEN_SYMBOL::WiringType cardType = CEN_SYMBOL::WIRING_INVALID;
- int32_t l_rc = getMemBufRawCardType( trgt, cardType );
- if ( SUCCESS != l_rc )
- {
- PRDF_ERR( PRDF_FUNC "getMemBufRawCardType() failed. MBA:0x%08x",
- getHuid(trgt) );
- break;
- }
- extMemMru.cardType = cardType;
- }
- else
+ if ( 0 == extMemMru.isBufDimm )
{
// Get the 80-byte DQ map (ISDIMMs only). This is only needed if the
// MemoryMru contains a single DIMM callout with a valid symbol.
diff --git a/src/usr/diag/prdf/common/plat/mem/prdfMemCeTable.C b/src/usr/diag/prdf/common/plat/mem/prdfMemCeTable.C
index aae97e989..07d2dff96 100644
--- a/src/usr/diag/prdf/common/plat/mem/prdfMemCeTable.C
+++ b/src/usr/diag/prdf/common/plat/mem/prdfMemCeTable.C
@@ -210,13 +210,7 @@ void MemCeTable<T>::addCapData( CaptureData & io_cd )
{
isMba = 1;
mbaPos = getTargetPosition( iv_chip->getTrgt() );
-
- if ( SUCCESS != getMemBufRawCardType(iv_chip->getTrgt(), rcType) )
- {
- PRDF_ERR( "addCapData: getMemBufRawCardType(0x%08x) failed",
- iv_chip->getHuid() );
- rcType = CEN_SYMBOL::WIRING_INVALID; // Just in case.
- }
+ rcType = getMemBufRawCardType<TYPE_MBA>( iv_chip->getTrgt() );
}
// Fill in the header info.
OpenPOWER on IntegriCloud