Revert "Revert "PRD: Nimbus symbol mark performance workaround""

This reverts commit 603a666. Change-Id: I3b3d91ed8918b03eb172f8d746caaca0f9f9cade Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/76008 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Paul Greenwood <paul.greenwood@ibm.com> Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
open-power · Apr 16, 2019 · 5b0de29 · 5b0de29
1 parent 78ccbc7
commit 5b0de29
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/src/usr/diag/prdf/common/plat/mem/prdfMemMark.C b/src/usr/diag/prdf/common/plat/mem/prdfMemMark.C
@@ -286,6 +286,24 @@ uint32_t writeSymbolMark<TYPE_MCA>( ExtensibleChip * i_chip,
                   msName, i_chip->getHuid() );
     }
 
+    // Nimbus symbol mark performance workaround
+    // When a symbol mark is placed at runtime
+    #ifdef __HOSTBOOT_RUNTIME
+
+    // Trigger WAT logic to 'disable bypass'
+    // Get the ECC Debug/WAT Control register
+    SCAN_COMM_REGISTER_CLASS * dbgr = i_chip->getRegister( "DBGR" );
+
+    // Set DBGR[8] = 0b1
+    dbgr->SetBit( 8 );
+    o_rc = dbgr->Write();
+    if ( SUCCESS != o_rc )
+    {
+        PRDF_ERR( PRDF_FUNC "Write() failed on DBGR: mca=0x%08x",
+                  i_chip->getHuid() );
+    }
+    #endif
+
     return o_rc;
 
     #undef PRDF_FUNC

diff --git a/src/usr/diag/prdf/common/plat/p9/p9_mca_regs.rule b/src/usr/diag/prdf/common/plat/p9/p9_mca_regs.rule
@@ -242,3 +242,14 @@
         capture     group default;
     };
 
+    ############################################################################
+    # ECC Debug/WAT Control Register
+    ############################################################################
+
+    register DBGR
+    {
+        name        "ECC Debug/WAT Control Register";
+        scomaddr    0x07010A0B;
+        capture     group default;
+    };
+