summaryrefslogtreecommitdiffstats
path: root/src/usr/diag/prdf/plat
diff options
context:
space:
mode:
Diffstat (limited to 'src/usr/diag/prdf/plat')
-rwxr-xr-xsrc/usr/diag/prdf/plat/mem/prdfMemIplCeStats.C6
-rw-r--r--src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C12
-rw-r--r--src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_rt.C14
-rw-r--r--src/usr/diag/prdf/plat/mem/prdfMemTps_ipl.C3
-rw-r--r--src/usr/diag/prdf/plat/mem/prdfMemTps_rt.C3
5 files changed, 15 insertions, 23 deletions
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemIplCeStats.C b/src/usr/diag/prdf/plat/mem/prdfMemIplCeStats.C
index 12517c857..0ae5cec80 100755
--- a/src/usr/diag/prdf/plat/mem/prdfMemIplCeStats.C
+++ b/src/usr/diag/prdf/plat/mem/prdfMemIplCeStats.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2013,2017 */
+/* Contributors Listed Below - COPYRIGHT 2013,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -156,10 +156,6 @@ int32_t MemIplCeStats<T>::collectStats( const MemRank & i_stopRank )
} while (0);
- // We have to clear all stats before giving control back to MDIA..
- // This is done by setting up MBSTRQ[53] bit
- // We are doing cleanup in TdController code,
- // So not clearing up stats here.
return o_rc;
#undef PRDF_FUNC
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C b/src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C
index 3b6700922..38cbcc8bd 100644
--- a/src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C
+++ b/src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C
@@ -173,7 +173,7 @@ uint32_t clearEccCounters<TYPE_MBA>( ExtensibleChip * i_chip )
ExtensibleChip * membChip = getConnectedParent( i_chip, TYPE_MEMBUF );
- const char * reg = (0 == i_chip->getPos()) ? "MBA0_MBSTR" : "MBA1_MBSTR";
+ const char * reg = (0 == i_chip->getPos()) ? "MBSTR_0" : "MBSTR_1";
return __clearEccCounters<TYPE_MEMBUF>( membChip, reg, 53 );
}
@@ -239,8 +239,8 @@ uint32_t clearEccFirs<TYPE_MBA>( ExtensibleChip * i_chip )
{
ExtensibleChip * membChip = getConnectedParent( i_chip, TYPE_MEMBUF );
- const char * reg = (0 == i_chip->getPos()) ? "MBA0_MBSECCFIR_AND"
- : "MBA1_MBSECCFIR_AND";
+ const char * reg = (0 == i_chip->getPos()) ? "MBSECCFIR_0_AND"
+ : "MBSECCFIR_1_AND";
// Clear MBSECCFIR[20:27,36:41]
o_rc = __clearFir<TYPE_MEMBUF>( membChip, reg, 0xfffff00ff03fffffull );
@@ -337,8 +337,7 @@ uint32_t checkEccFirs<TYPE_MBA>( ExtensibleChip * i_chip,
ExtensibleChip * membChip = getConnectedParent( i_chip, TYPE_MEMBUF );
- const char * reg = (0 == i_chip->getPos()) ? "MBA0_MBSECCFIR"
- : "MBA1_MBSECCFIR";
+ const char * reg = (0 == i_chip->getPos()) ? "MBSECCFIR_0" : "MBSECCFIR_1";
SCAN_COMM_REGISTER_CLASS * mbseccfir = membChip->getRegister( reg );
SCAN_COMM_REGISTER_CLASS * mbspa = i_chip->getRegister( "MBASPA" );
@@ -490,8 +489,7 @@ uint32_t setBgScrubThresholds<TYPE_MBA>( ExtensibleChip * i_chip,
do
{
ExtensibleChip * membChip = getConnectedParent( i_chip, TYPE_MEMBUF );
- const char * reg_str = (0 == i_chip->getPos()) ? "MBA0_MBSTR"
- : "MBA1_MBSTR";
+ const char * reg_str = (0 == i_chip->getPos()) ? "MBSTR_0" : "MBSTR_1";
SCAN_COMM_REGISTER_CLASS * mbstr = membChip->getRegister( reg_str );
o_rc = mbstr->Read();
if ( SUCCESS != o_rc )
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_rt.C b/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_rt.C
index d64335d37..af4acc15b 100644
--- a/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_rt.C
+++ b/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_rt.C
@@ -117,13 +117,13 @@ void __recaptureRegs<TYPE_MBA>( STEP_CODE_DATA_STRUCT & io_sc,
const char * membRegs[2][15] =
{
- { "MBA0_MBSECCFIR", "MBA0_MBSECCERRPT_0","MBA0_MBSECCERRPT_1",
- "MBA0_MBSEC0", "MBA0_MBSEC1", "MBA0_MBSTR",
+ { "MBSECCFIR_0", "MBA0_MBSECCERRPT_0","MBA0_MBSECCERRPT_1",
+ "MBA0_MBSEC0", "MBA0_MBSEC1", "MBSTR_0",
"MBA0_MBSSYMEC0", "MBA0_MBSSYMEC1", "MBA0_MBSSYMEC2",
"MBA0_MBSSYMEC3", "MBA0_MBSSYMEC4", "MBA0_MBSSYMEC5",
"MBA0_MBSSYMEC6", "MBA0_MBSSYMEC7", "MBA0_MBSSYMEC8", },
- { "MBA1_MBSECCFIR", "MBA1_MBSECCERRPT_0","MBA1_MBSECCERRPT_1",
- "MBA1_MBSEC0", "MBA1_MBSEC1", "MBA1_MBSTR",
+ { "MBSECCFIR_1", "MBA1_MBSECCERRPT_0","MBA1_MBSECCERRPT_1",
+ "MBA1_MBSEC0", "MBA1_MBSEC1", "MBSTR_1",
"MBA1_MBSSYMEC0", "MBA1_MBSSYMEC1", "MBA1_MBSSYMEC2",
"MBA1_MBSSYMEC3", "MBA1_MBSSYMEC4", "MBA1_MBSSYMEC5",
"MBA1_MBSSYMEC6", "MBA1_MBSSYMEC7", "MBA1_MBSSYMEC8", },
@@ -831,7 +831,7 @@ uint32_t MemTdCtlr<TYPE_MBA>::maskEccAttns()
// mask them.
const char * reg_str = (0 == iv_chip->getPos())
- ? "MBA0_MBSECCFIR_MASK_OR" : "MBA1_MBSECCFIR_MASK_OR";
+ ? "MBSECCFIR_0_MASK_OR" : "MBSECCFIR_1_MASK_OR";
ExtensibleChip * membChip = getConnectedParent( iv_chip, TYPE_MEMBUF );
@@ -874,9 +874,9 @@ uint32_t MemTdCtlr<TYPE_MBA>::unmaskEccAttns()
// thresholded so clear and unmask them as well.
const char * fir_str = (0 == iv_chip->getPos())
- ? "MBA0_MBSECCFIR_AND" : "MBA1_MBSECCFIR_AND";
+ ? "MBSECCFIR_0_AND" : "MBSECCFIR_1_AND";
const char * msk_str = (0 == iv_chip->getPos())
- ? "MBA0_MBSECCFIR_MASK_AND" : "MBA1_MBSECCFIR_MASK_AND";
+ ? "MBSECCFIR_0_MASK_AND" : "MBSECCFIR_1_MASK_AND";
ExtensibleChip * membChip = getConnectedParent( iv_chip, TYPE_MEMBUF );
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemTps_ipl.C b/src/usr/diag/prdf/plat/mem/prdfMemTps_ipl.C
index 085381965..dcb4e703d 100644
--- a/src/usr/diag/prdf/plat/mem/prdfMemTps_ipl.C
+++ b/src/usr/diag/prdf/plat/mem/prdfMemTps_ipl.C
@@ -363,8 +363,7 @@ uint32_t TpsEvent<TYPE_MBA>::startCmd()
do
{
ExtensibleChip * membChip = getConnectedParent( iv_chip, TYPE_MEMBUF );
- const char * reg_str = (0 == iv_chip->getPos()) ? "MBA0_MBSTR"
- : "MBA1_MBSTR";
+ const char * reg_str = (0 == iv_chip->getPos()) ? "MBSTR_0" : "MBSTR_1";
SCAN_COMM_REGISTER_CLASS * mbstr = membChip->getRegister( reg_str );
o_rc = mbstr->Read();
if ( SUCCESS != o_rc )
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemTps_rt.C b/src/usr/diag/prdf/plat/mem/prdfMemTps_rt.C
index 5d5c65c4b..f3e13c6f8 100644
--- a/src/usr/diag/prdf/plat/mem/prdfMemTps_rt.C
+++ b/src/usr/diag/prdf/plat/mem/prdfMemTps_rt.C
@@ -1328,8 +1328,7 @@ uint32_t TpsEvent<TYPE_MBA>::startCmd()
do
{
ExtensibleChip * membChip = getConnectedParent( iv_chip, TYPE_MEMBUF );
- const char * reg_str = (0 == iv_chip->getPos()) ? "MBA0_MBSTR"
- : "MBA1_MBSTR";
+ const char * reg_str = (0 == iv_chip->getPos()) ? "MBSTR_0" : "MBSTR_1";
SCAN_COMM_REGISTER_CLASS * mbstr = membChip->getRegister( reg_str );
o_rc = mbstr->Read();
if ( SUCCESS != o_rc )
OpenPOWER on IntegriCloud