PRD: Uncomment Axone HWP code

Change-Id: I1d60cd40e93974a9a71bee35d27b2a2b7f3be510
RTC: 207273
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/86516
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/88206
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, 50 insertions, 8 deletions

diff --git a/src/usr/diag/prdf/plat/mem/prdfMemDsd_ipl.C b/src/usr/diag/prdf/plat/mem/prdfMemDsd_ipl.C
index 7abab6368..9dbaeeb3c 100644
--- a/src/usr/diag/prdf/plat/mem/prdfMemDsd_ipl.C
+++ b/src/usr/diag/prdf/plat/mem/prdfMemDsd_ipl.C
@@ -30,6 +30,8 @@
 #include <prdfMemDqBitmap.H>
 #include <prdfMemDsd.H>
 
+#include <hwp_wrappers.H>
+
 using namespace TARGETING;
 
 namespace PRDF
@@ -231,7 +233,9 @@ uint32_t DsdEvent<TYPE_OCMB_CHIP>::startCmd()
 
     uint32_t o_rc = SUCCESS;
 
-    mss::mcbist::stop_conditions<> stopCond;
+    #ifdef CONFIG_AXONE
+
+    mss::mcbist::stop_conditions<mss::mc_type::EXPLORER> stopCond;
 
     switch ( iv_phase )
     {
@@ -260,6 +264,8 @@ uint32_t DsdEvent<TYPE_OCMB_CHIP>::startCmd()
         default: PRDF_ASSERT( false ); // invalid phase
     }
 
+    #endif
+
     return o_rc;
 
     #undef PRDF_FUNC
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemDsd_rt.C b/src/usr/diag/prdf/plat/mem/prdfMemDsd_rt.C
index e85e04720..1478a666d 100644
--- a/src/usr/diag/prdf/plat/mem/prdfMemDsd_rt.C
+++ b/src/usr/diag/prdf/plat/mem/prdfMemDsd_rt.C
@@ -29,6 +29,8 @@
 #include <prdfCenMbaExtraSig.H>
 #include <prdfMemDsd.H>
 
+#include <hwp_wrappers.H>
+
 using namespace TARGETING;
 
 namespace PRDF
@@ -224,7 +226,9 @@ uint32_t DsdEvent<TYPE_OCMB_CHIP>::startCmd()
 
     uint32_t o_rc = SUCCESS;
 
-    mss::mcbist::stop_conditions<> stopCond;
+    #ifdef CONFIG_AXONE
+
+    mss::mcbist::stop_conditions<mss::mc_type::EXPLORER> stopCond;
 
     stopCond.set_pause_on_ue(mss::ON);
 
@@ -237,6 +241,8 @@ uint32_t DsdEvent<TYPE_OCMB_CHIP>::startCmd()
                   iv_chip->getHuid(), getKey() );
     }
 
+    #endif
+
     return o_rc;
 
     #undef PRDF_FUNC
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemTps_ipl.C b/src/usr/diag/prdf/plat/mem/prdfMemTps_ipl.C
index d9ebc24a5..64eb74648 100644
--- a/src/usr/diag/prdf/plat/mem/prdfMemTps_ipl.C
+++ b/src/usr/diag/prdf/plat/mem/prdfMemTps_ipl.C
@@ -36,6 +36,8 @@
 #include <prdfP9McaExtraSig.H>
 #include <prdfPlatServices.H>
 
+#include <hwp_wrappers.H>
+
 using namespace TARGETING;
 
 namespace PRDF
@@ -258,13 +260,15 @@ uint32_t TpsEvent<TYPE_MCA>::startCmd()
 
     uint32_t o_rc = SUCCESS;
 
+    #ifndef CONFIG_AXONE
+
     // We don't need to set any stop-on-error conditions or thresholds for
     // soft/inter/hard CEs during Memory Diagnostics. The design is to let the
     // command continue to the end of the rank and we do diagnostics on the
     // CE counts found in the per-symbol counters. Therefore, all we need to do
     // is tell the hardware which CE types to count.
 
-    mss::mcbist::stop_conditions<> stopCond;
+    mss::mcbist::stop_conditions<mss::mc_type::NIMBUS> stopCond;
 
     switch ( iv_phase )
     {
@@ -290,6 +294,8 @@ uint32_t TpsEvent<TYPE_MCA>::startCmd()
                   iv_chip->getHuid(), getKey() );
     }
 
+    #endif
+
     return o_rc;
 
     #undef PRDF_FUNC
@@ -381,13 +387,15 @@ uint32_t TpsEvent<TYPE_OCMB_CHIP>::startCmd()
 
     uint32_t o_rc = SUCCESS;
 
+    #ifdef CONFIG_AXONE
+
     // We don't need to set any stop-on-error conditions or thresholds for
     // soft/inter/hard CEs during Memory Diagnostics. The design is to let the
     // command continue to the end of the rank and we do diagnostics on the
     // CE counts found in the per-symbol counters. Therefore, all we need to do
     // is tell the hardware which CE types to count.
 
-    mss::mcbist::stop_conditions<> stopCond;
+    mss::mcbist::stop_conditions<mss::mc_type::EXPLORER> stopCond;
 
     switch ( iv_phase )
     {
@@ -413,6 +421,8 @@ uint32_t TpsEvent<TYPE_OCMB_CHIP>::startCmd()
                   iv_chip->getHuid(), getKey() );
     }
 
+    #endif
+
     return o_rc;
 
     #undef PRDF_FUNC
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemTps_rt.C b/src/usr/diag/prdf/plat/mem/prdfMemTps_rt.C
index f7023c07e..8b3b220c6 100644
--- a/src/usr/diag/prdf/plat/mem/prdfMemTps_rt.C
+++ b/src/usr/diag/prdf/plat/mem/prdfMemTps_rt.C
@@ -37,6 +37,8 @@
 #include <prdfP9McaExtraSig.H>
 #include <prdfTargetServices.H>
 
+#include <hwp_wrappers.H>
+
 using namespace TARGETING;
 
 namespace PRDF
@@ -1330,13 +1332,15 @@ uint32_t TpsEvent<TYPE_MCA>::startCmd()
 
     uint32_t o_rc = SUCCESS;
 
+    #ifndef CONFIG_AXONE
+
     // We don't need to set any stop-on-error conditions or thresholds for
     // soft/inter/hard CEs at runtime. The design is to let the command continue
     // to the end of the rank and we do diagnostics on the CE counts found in
     // the per-symbol counters. Therefore, all we need to do is tell the
     // hardware which CE types to count.
 
-    mss::mcbist::stop_conditions<> stopCond;
+    mss::mcbist::stop_conditions<mss::mc_type::NIMBUS> stopCond;
 
     switch ( iv_phase )
     {
@@ -1364,6 +1368,8 @@ uint32_t TpsEvent<TYPE_MCA>::startCmd()
                   iv_chip->getHuid(), getKey() );
     }
 
+    #endif
+
     return o_rc;
 
     #undef PRDF_FUNC
@@ -1382,13 +1388,15 @@ uint32_t TpsEvent<TYPE_OCMB_CHIP>::startCmd()
 
     uint32_t o_rc = SUCCESS;
 
+    #ifdef CONFIG_AXONE
+
     // We don't need to set any stop-on-error conditions or thresholds for
     // soft/inter/hard CEs at runtime. The design is to let the command continue
     // to the end of the rank and we do diagnostics on the CE counts found in
     // the per-symbol counters. Therefore, all we need to do is tell the
     // hardware which CE types to count.
 
-    mss::mcbist::stop_conditions<> stopCond;
+    mss::mcbist::stop_conditions<mss::mc_type::EXPLORER> stopCond;
 
     switch ( iv_phase )
     {
@@ -1416,6 +1424,8 @@ uint32_t TpsEvent<TYPE_OCMB_CHIP>::startCmd()
                   iv_chip->getHuid(), getKey() );
     }
 
+    #endif
+
     return o_rc;
 
     #undef PRDF_FUNC
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemVcm.C b/src/usr/diag/prdf/plat/mem/prdfMemVcm.C
index 74ec3dfed..784306baf 100644
--- a/src/usr/diag/prdf/plat/mem/prdfMemVcm.C
+++ b/src/usr/diag/prdf/plat/mem/prdfMemVcm.C
@@ -30,6 +30,8 @@
 // Platform includes
 #include <prdfCenMbaExtraSig.H>
 
+#include <hwp_wrappers.H>
+
 using namespace TARGETING;
 
 namespace PRDF
@@ -98,8 +100,10 @@ uint32_t VcmEvent<TYPE_MCA>::startCmd()
 
     uint32_t o_rc = SUCCESS;
 
+    #ifndef CONFIG_AXONE
+
     // No stop conditions.
-    mss::mcbist::stop_conditions<> stopCond;
+    mss::mcbist::stop_conditions<mss::mc_type::NIMBUS> stopCond;
 
     // Start the time based scrub procedure on this master rank.
     o_rc = startTdScrub<TYPE_MCA>( iv_chip, iv_rank, MASTER_RANK, stopCond );
@@ -109,6 +113,8 @@ uint32_t VcmEvent<TYPE_MCA>::startCmd()
                   iv_chip->getHuid(), getKey() );
     }
 
+    #endif
+
     return o_rc;
 
     #undef PRDF_FUNC
@@ -475,8 +481,10 @@ uint32_t VcmEvent<TYPE_OCMB_CHIP>::startCmd()
 
     uint32_t o_rc = SUCCESS;
 
+    #ifdef CONFIG_AXONE
+
     // No stop conditions.
-    mss::mcbist::stop_conditions<> stopCond;
+    mss::mcbist::stop_conditions<mss::mc_type::EXPLORER> stopCond;
 
     // Start the time based scrub procedure on this master rank.
     o_rc = startTdScrub<TYPE_OCMB_CHIP>( iv_chip, iv_rank, MASTER_RANK,
@@ -487,6 +495,8 @@ uint32_t VcmEvent<TYPE_OCMB_CHIP>::startCmd()
                   iv_chip->getHuid(), getKey() );
     }
 
+    #endif
+
     return o_rc;
 
     #undef PRDF_FUNC