Enable fsidd testcases for Cumulus model

Change-Id: I3ad1335d734ec04e7cc68833662bf228302b838f
RTC:178802
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/54037
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>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 28 insertions, 42 deletions

diff --git a/src/usr/fsi/test/fsiddtest.H b/src/usr/fsi/test/fsiddtest.H
index 0b3a40baf..47dbab0af 100644
--- a/src/usr/fsi/test/fsiddtest.H
+++ b/src/usr/fsi/test/fsiddtest.H
@@ -66,9 +66,8 @@ class FsiDDTest : public CxxTest::TestSuite
             PROCWRAP,
             PROC1,
             PROC2,
-            // @todo RTC 178802 Enable test cases turned off during bring up
-            //CENTAUR0,
-            //CENTAUR8,
+            CENTAUR0,
+            CENTAUR8,
             SENTINEL,
             NUM_TARGETS
         };
@@ -100,14 +99,13 @@ class FsiDDTest : public CxxTest::TestSuite
         fsi_target = TARGETING::targetService().toTarget(epath);
         fsi_targets[PROC1] = fsi_target;
 
-        // @todo RTC 178802 Enable test cases turned off during bring up
-        /*
         // alt-master processor target (physical:sys-0/node-0/proc-2)
         epath.removeLast();
         epath.addLast(TARGETING::TYPE_PROC,2);
         fsi_target = TARGETING::targetService().toTarget(epath);
         fsi_targets[PROC2] = fsi_target;
 
+
         // local centaur target (physical:sys-0/node-0/membuf-0)
         epath.removeLast();
         epath.addLast(TARGETING::TYPE_MEMBUF,0);
@@ -119,7 +117,6 @@ class FsiDDTest : public CxxTest::TestSuite
         epath.addLast(TARGETING::TYPE_MEMBUF,8);
         fsi_target = TARGETING::targetService().toTarget(epath);
         fsi_targets[CENTAUR8] = fsi_target;
-        */
 
         // scratch data to use
         struct {
@@ -140,7 +137,7 @@ class FsiDDTest : public CxxTest::TestSuite
             //DATA_0 from FSI2PIB off MFSI-0
             { PROC0, 0x081000, 0x12345678, true, false },
             //CHIPID from SHIFT off cMFSI-0
-            { PROC0, 0x041028, 0x160E9049, false, false },
+            { PROC0, 0x031028, 0x160E9049, false, false },
             //CMFSI MVER from Proc off MFSI-2
             { PROC0, 0x103074, 0x92010800, false, false },
 
@@ -158,21 +155,19 @@ class FsiDDTest : public CxxTest::TestSuite
             //FEL from SHIFT off MFSI-2
             { PROC2, 0x001000, 0x12345678, true, false },
 
-            // @todo RTC 178802 Enable test cases turned off during bring up
             //** Slave Regs
             //Config Table entry for slave0 off cMFSI-0
-            //{ CENTAUR0, 0x000000, 0xC0010E95, false, false },
+            { CENTAUR0, 0x000000, 0xC0020E95, false, false },
             //CHIPID from FSI2PIB off cMFSI-0
-            //{ CENTAUR0, 0x001028, 0x160E9049, false, false },
+            { CENTAUR0, 0x001028, 0x260E9049, false, false },
             //FEL from SHIFT off cMFSI-0
-            //{ CENTAUR0, 0x000C08, 0x12344321, true, false },
+            { CENTAUR0, 0x000C08, 0x12344321, true, false },
 
-            // @todo RTC 178802 Enable test cases turned off during bring up
             //** Slave Regs
             //FEL from SHIFT off cMFSI-0 of MFSI-1
-            //{ CENTAUR8, 0x001000, 0x33333333, true, false },
+            { CENTAUR8, 0x001000, 0x33333333, true, false },
             //CHIPID from FSI2PIB off cMFSI-0 of MFSI-1
-            //{ CENTAUR8, 0x001028, 0x160E9049, false, false },
+            { CENTAUR8, 0x001028, 0x160E9049, false, false },
         };
         const uint64_t NUM_ADDRS = sizeof(test_data)/sizeof(test_data[0]);
 
@@ -195,14 +190,13 @@ class FsiDDTest : public CxxTest::TestSuite
                 {
                     test_data[x].present = true;
                 }
-                // @todo RTC 178802 Enable test cases turned off during bring up
-                //else if( ((0xFF0000 & test_data[x].addr) == 0x040000)
-                //         && (fsi_targets[CENTAUR0] != NULL)
-                //         && (fsi_targets[CENTAUR0]->
-                //             getAttr<TARGETING::ATTR_HWAS_STATE>().functional))
-                //{
-                //    test_data[x].present = true;
-                //}
+                else if( ((0xFF0000 & test_data[x].addr) == 0x040000)
+                         && (fsi_targets[CENTAUR0] != NULL)
+                         && (fsi_targets[CENTAUR0]->
+                             getAttr<TARGETING::ATTR_HWAS_STATE>().functional))
+                {
+                    test_data[x].present = true;
+                }
                 else if( ((0xFF0000 & test_data[x].addr) == 0x100000)
                          && (fsi_targets[PROC2] != NULL)
                          && (fsi_targets[PROC2]->
@@ -251,8 +245,6 @@ class FsiDDTest : public CxxTest::TestSuite
                 fails++;
                 errlCommit(l_err,FSI_COMP_ID);
             }
-
-            TRACDCOMP( g_trac_fsi, "READ Reg 0x%X = 0x%X", test_data[x].addr, read_data[x] );
         }
 
         // write X=A, Y=B, Z=C
@@ -318,18 +310,21 @@ class FsiDDTest : public CxxTest::TestSuite
             if( read_data[x] != test_data[x].data )
             {
                 TRACFCOMP(g_trac_fsi, "FsiDDTest::test_readWrite> Data mismatch : [%d] addr=0x%X, exp=0x%X, act=0x%X", x,  test_data[x].addr, test_data[x].data, read_data[x] );
-//@TODO RTC:178802
-//                TS_FAIL( "FsiDDTest::test_readWrite> ERROR : Data mismatch" );
-//                fails++;
+                TS_FAIL( "FsiDDTest::test_readWrite> ERROR : Data mismatch" );
+                fails++;
             }
         }
 
-#if 0
         // put the original data back
         for( uint64_t x = 0; x < NUM_ADDRS; x++ )
         {
             op_size = sizeof(uint32_t);
 
+            if( !test_data[x].present )
+            {
+                continue;
+            }
+
             if( test_data[x].writeable )
             {
                 total++;
@@ -347,8 +342,6 @@ class FsiDDTest : public CxxTest::TestSuite
                 }
             }
         }
-#endif
-
 
         TRACFCOMP( g_trac_fsi, "FsiDDTest::test_readWrite> %d/%d fails (patterns=%.16X)", fails, total, patterns_to_run );
     };
@@ -418,8 +411,6 @@ class FsiDDTest : public CxxTest::TestSuite
     {
         TRACFCOMP( g_trac_fsi, "FsiDDTest::test_FFDC> Start" );
 
-        // @todo RTC 178802 Enable test cases turned off during bring up
-        /*
         errlHndl_t l_err = NULL;
 
         // Find any Centaur target
@@ -457,7 +448,6 @@ class FsiDDTest : public CxxTest::TestSuite
             FSI::getFsiFFDC( FSI::FFDC_PIB_FAIL, l_err, fsi_target );
             errlCommit(l_err,CXXTEST_COMP_ID);
         }
-        */
         TRACFCOMP( g_trac_fsi, "FsiDDTest::test_FFDC> Finish" );
     };
 
@@ -471,8 +461,7 @@ class FsiDDTest : public CxxTest::TestSuite
 
         enum {
             PROC0,
-            // @todo RTC 178802 Enable test cases turned off during bring up
-            //CENTAUR4,
+            CENTAUR4,
             NUM_TARGETS
         };
         TARGETING::Target* fsi_targets[NUM_TARGETS];
@@ -491,14 +480,11 @@ class FsiDDTest : public CxxTest::TestSuite
         fsi_target = TARGETING::targetService().toTarget(epath);
         fsi_targets[PROC0] = fsi_target;
 
-        // @todo RTC 178802 Enable test cases turned off during bring up
         // local centaur target (physical:sys-0/node-0/membuf-4)
-        //epath.removeLast();
-        //epath.addLast(TARGETING::TYPE_MEMBUF,4);
-        //fsi_target = TARGETING::targetService().toTarget(epath);
-        //fsi_targets[CENTAUR4] = fsi_target;
-
-
+        epath.removeLast();
+        epath.addLast(TARGETING::TYPE_MEMBUF,4);
+        fsi_target = TARGETING::targetService().toTarget(epath);
+        fsi_targets[CENTAUR4] = fsi_target;
 
         // loop through all of the targets we defined to
         //  check the data