PRD: Axone UE/CE threshold for background scrub

Change-Id: I2872ee94a385d84b10a6e0aaf7f3c0a95c496aa0
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/84551
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Benjamen G Tyner <ben.tyner@ibm.com>
Reviewed-by: Brian J Stegmiller <bjs@us.ibm.com>
Reviewed-by: Zane C Shelley <zshelle@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/84781
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>

1 files changed, 46 insertions, 14 deletions

diff --git a/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_rt.C b/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_rt.C
index 817a345f3..da18cea81 100644
--- a/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_rt.C
+++ b/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_rt.C
@@ -1693,21 +1693,53 @@ uint32_t MemTdCtlr<TYPE_OCMB_CHIP>::canResumeBgScrub( bool & o_canResume )
     // can use the stop conditions, which should be unique for background scrub,
     // to determine if it has been configured.
 
-    SCAN_COMM_REGISTER_CLASS * reg = iv_chip->getRegister( "MBSTR" );
-    o_rc = reg->Read();
-    if ( SUCCESS != o_rc )
-    {
-        PRDF_ERR( PRDF_FUNC "Read() failed on MBSTR: iv_chip=0x%08x",
-                  iv_chip->getHuid() );
-    }
-    else if ( 0xf != reg->GetBitFieldJustified(0,4) && // NCE int TH
-              0xf != reg->GetBitFieldJustified(4,4) && // NCE soft TH
-              0xf != reg->GetBitFieldJustified(8,4) && // NCE hard TH
-              reg->IsBitSet(34)                     && // pause on MPE
-              reg->IsBitSet(35)                     )  // pause on UE
+    do
     {
-        o_canResume = true;
-    }
+        SCAN_COMM_REGISTER_CLASS * reg = iv_chip->getRegister( "MBSTR" );
+        o_rc = reg->Read();
+        if ( SUCCESS != o_rc )
+        {
+            PRDF_ERR( PRDF_FUNC "Read() failed on MBSTR: iv_chip=0x%08x",
+                    iv_chip->getHuid() );
+            break;
+        }
+        // Note: The stop conditions for background scrubbing can now be
+        // variable depending on whether we have hit threshold for the number
+        // of UEs or CEs that we have stopped on on a rank.
+
+        // If we haven't hit CE or UE threshold, check the CE stop conditions
+        if ( !getOcmbDataBundle(iv_chip)->iv_ceScrubStopCounter.atTh() &&
+             !getOcmbDataBundle(iv_chip)->iv_ueScrubStopCounter.atTh() )
+        {
+            // If the stop conditions aren't set, just break out.
+            if ( !(0xf != reg->GetBitFieldJustified(0,4) && // NCE int TH
+                   0xf != reg->GetBitFieldJustified(4,4) && // NCE soft TH
+                   0xf != reg->GetBitFieldJustified(8,4)) ) // NCE hard TH
+            {
+                break;
+            }
+
+        }
+
+        // If we haven't hit UE threshold yet, check the UE stop condition
+        if ( !getOcmbDataBundle(iv_chip)->iv_ueScrubStopCounter.atTh() )
+        {
+            // If the stop condition isn't set, just break out
+            if ( !reg->IsBitSet(35) ) // pause on UE
+            {
+                break;
+            }
+        }
+
+        // Need to check the stop on mpe stop condition regardless of whether
+        // we hit the UE or CE threshold.
+        if ( reg->IsBitSet(34) ) // pause on MPE
+        {
+            // If we reach here, all the stop conditions are set for background
+            // scrub, so we can resume.
+            o_canResume = true;
+        }
+    }while(0);
 
     return o_rc;