Re-enabling test cases that were turned off during bringup

Change-Id: I1129f5fadb3fd73bf426c888fadbf8e33f615194
RTC:190805
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/58947
Reviewed-by: Richard Ward <rward15@us.ibm.com>
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: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

3 files changed, 50 insertions, 61 deletions

diff --git a/src/usr/diag/prdf/test/prdfTest_NimbusTpLFir.H b/src/usr/diag/prdf/test/prdfTest_NimbusTpLFir.H
index 4fb80b7a3..4fb7ce3af 100755
--- a/src/usr/diag/prdf/test/prdfTest_NimbusTpLFir.H
+++ b/src/usr/diag/prdf/test/prdfTest_NimbusTpLFir.H
@@ -47,81 +47,71 @@ class NTPLFIR:public CxxTest::TestSuite
 
         void TestNimPll(void)
         {
-            // @todo RTC 178802 Enable test cases turned off during bring up
-            if ( TARGETING::MODEL_CUMULUS != PRDF::PlatServices::getChipModel(
-                    PRDF::PlatServices::getMasterProc() ) )
-            {
-                PRDS_BEGIN("Nimbus PLL test");
+            PRDS_BEGIN("Nimbus PLL test");
 
-                PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
+            PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
 
-                PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0x00ed0000 );
+            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0x00ed0000 );
 
-                //GLOBAL_RE_FIR
-                PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x4000000000000000);
+            //GLOBAL_RE_FIR
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x4000000000000000);
 
-                //TP_CHIPLET_RE_FIR
-                PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040001, 0x4000000000000000);
+            //TP_CHIPLET_RE_FIR
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040001, 0x4000000000000000);
 
-                //TP_LFIR  -- bit 21 on P9
-                PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x0104000a, 0x0000040000000000);
+            //TP_LFIR  -- bit 21 on P9
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x0104000a, 0x0000040000000000);
 
-                //TP_LFIR_ACT1
-                PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040011, 0xFFFFFFFFFFFFFFFF);
+            //TP_LFIR_ACT1
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040011, 0xFFFFFFFFFFFFFFFF);
 
-                //XBUS_ERROR_REG
-                PRDS_SCR_WRITE("NODE{0}:PROC{0}:XBUS{1}", 0x060F001F,
+            //XBUS_ERROR_REG
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:XBUS{1}", 0x060F001F,
                                 0x0000004000000000);
 
-                //TP_ERROR_REG
-                PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x010F001F, 0x0000004000000000);
+            //TP_ERROR_REG
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x010F001F, 0x0000004000000000);
 
-                PRDS_START_SIM();
+            PRDS_START_SIM();
 
-                if(!(PRDS_END()))
-                {
-                    TS_FAIL("Expected Signature Failed Nimbus PLL test");
-                }
+            if(!(PRDS_END()))
+            {
+                TS_FAIL("Expected Signature Failed Nimbus PLL test");
             }
         }
 
         void TestNimPllAtThreshold(void)
         {
-            // @todo RTC 178802 Enable test cases turned off during bring up
-            if ( TARGETING::MODEL_CUMULUS != PRDF::PlatServices::getChipModel(
-                    PRDF::PlatServices::getMasterProc() ) )
-            {
-                PRDS_BEGIN("Nimbus PLL test At Threshold");
+            PRDS_BEGIN("Nimbus PLL test At Threshold");
 
-                PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
+            PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
 
-                PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}",  0x00ed0000 );
+            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}",  0x00ed0000 );
 
-                //GLOBAL_RE_FIR
-                PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x4000000000000000);
+            //GLOBAL_RE_FIR
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x4000000000000000);
 
-                //TP_CHIPLET_RE_FIR
-                PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040001, 0x4000000000000000);
+            //TP_CHIPLET_RE_FIR
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040001, 0x4000000000000000);
 
-                //TP_LFIR  -- bit 21 on P9
-                PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x0104000a, 0x0000040000000000);
+            //TP_LFIR  -- bit 21 on P9
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x0104000a, 0x0000040000000000);
 
-                //TP_LFIR_ACT1
-                PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040011, 0xFFFFFFFFFFFFFFFF);
+            //TP_LFIR_ACT1
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040011, 0xFFFFFFFFFFFFFFFF);
 
-                //XBUS_ERROR_REG
-                PRDS_SCR_WRITE("NODE{0}:PROC{0}:XBUS{1}", 0x060F001F,
-                                0x0000004000000000);
+            //XBUS_ERROR_REG
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:XBUS{1}", 0x060F001F,
+                            0x0000004000000000);
 
-                //TP_ERROR_REG
-                PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x010F001F, 0x0000004000000000);
+            //TP_ERROR_REG
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x010F001F, 0x0000004000000000);
 
-                PRDS_START_SIM();
+            PRDS_START_SIM();
 
-                if(!(PRDS_END()))
-                {
-                    TS_FAIL("Nimbus PLL test At Threshold");
-                }
+            if(!(PRDS_END()))
+            {
+                TS_FAIL("Nimbus PLL test At Threshold");
             }
         }
 
diff --git a/src/usr/diag/prdf/test/prdfsimUtil.C b/src/usr/diag/prdf/test/prdfsimUtil.C
index ed6381abb..a7b80d351 100755
--- a/src/usr/diag/prdf/test/prdfsimUtil.C
+++ b/src/usr/diag/prdf/test/prdfsimUtil.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -104,16 +104,16 @@ const epath_array EPATH_ARRAY_MAP[] =
     {"CORE{21}",{TYPE_CORE,21}},
     {"CORE{22}",{TYPE_CORE,22}},
     {"CORE{23}",{TYPE_CORE,23}},
-//@TODO RTC:178802
-//    {"MCBIST{0}", {TYPE_MCBIST, 0}},
-//    {"MCBIST{1}", {TYPE_MCBIST, 1}},
-//    {"MCBIST{2}", {TYPE_MCBIST, 2}},
-//    {"MCBIST{3}", {TYPE_MCBIST, 3}},
-//
-//    {"MCS{0}", {TYPE_MCS, 0}},
-//    {"MCS{1}", {TYPE_MCS, 1}},
-//    {"MCS{2}", {TYPE_MCS, 2}},
-//    {"MCS{3}", {TYPE_MCS, 3}},
+
+    {"MCBIST{0}", {TYPE_MCBIST, 0}},
+    {"MCBIST{1}", {TYPE_MCBIST, 1}},
+    {"MCBIST{2}", {TYPE_MCBIST, 2}},
+    {"MCBIST{3}", {TYPE_MCBIST, 3}},
+
+    {"MCS{0}", {TYPE_MCS, 0}},
+    {"MCS{1}", {TYPE_MCS, 1}},
+    {"MCS{2}", {TYPE_MCS, 2}},
+    {"MCS{3}", {TYPE_MCS, 3}},
 
     {"MEMBUF{0}", {TYPE_MEMBUF, 0}},
     {"MEMBUF{1}", {TYPE_MEMBUF, 1}},
diff --git a/src/usr/isteps/istep14/call_mss_memdiag.C b/src/usr/isteps/istep14/call_mss_memdiag.C
index bde3f8227..80b76ff86 100644
--- a/src/usr/isteps/istep14/call_mss_memdiag.C
+++ b/src/usr/isteps/istep14/call_mss_memdiag.C
@@ -150,7 +150,6 @@ void* call_mss_memdiag (void* io_pArgs)
         {
             TargetHandleList trgtList; getAllChiplets( trgtList, TYPE_MBA );
 
-            // @todo RTC 178802 Enable test cases turned off during bring up
             if ( Util::isSimicsRunning() == false )
             {
                 // Start Memory Diagnostics