Fix support for multiple chips in standalone murano config

Modified FSI path for proc1 due to Simics model changes
Fix FSI testcase that was using outdated version reg
Enhance standalone script to start SBE on all procs

Change-Id: I2758912914b778a2c430124678546175e6223e30
RTC: 51465
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4357
Tested-by: Jenkins Server
Reviewed-by: Van H. Lee <vanlee@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 81 insertions, 50 deletions

diff --git a/src/build/simics/standalone.simics b/src/build/simics/standalone.simics
index c4978afd4..4130025c7 100755
--- a/src/build/simics/standalone.simics
+++ b/src/build/simics/standalone.simics
@@ -12,17 +12,25 @@ try {
     ($hb_pnor).sfc_master_mem.load-file ./syscvpd.dat 0x3E8A000
 } except { echo "ERROR: Failed to preload VPD into PNOR." }
 
-#Trigger a power on to cec-chip
-@mp="%s.proc_chip"%simenv.hb_masterproc
-@SIM_get_interface(SIM_get_object(mp),"signal").signal_raise(SIM_get_object(mp))
-
 #Write the PNOR MMIO addr into Scratch 2, 0x283A 
-#Then trigger the flush, load, and SBE start 
 ($hb_masterproc).proc_lbus_map.write 0x28e8 0xFFEF0000  #HB PNOR addr
-($hb_masterproc).proc_lbus_map.write 0x28e0 0x0000FBFF  #NonFunc EX (only 5 is good)
-($hb_masterproc).proc_lbus_map.write 0x2848 0x00000FFF  #GP3 0x2812 (flush) 
-($hb_masterproc).proc_lbus_map.write 0x2870 0x10000000  #SBE Vital 0x281C (load) 
-($hb_masterproc).proc_lbus_map.write 0x2870 0x90000000  #SBE Vital 0x281C (start)
+
+# Loop through every processor chip
+foreach $cc in (get-object-list p8_proc) {
+    echo $cc
+
+    #Trigger a power on to cec-chip
+    echo "-Trigger power on"
+    @mp="%s.proc_chip"%simenv.cc
+    @SIM_get_interface(SIM_get_object(mp),"signal").signal_raise(SIM_get_object(mp))
+
+    #Trigger the flush, load, and SBE start 
+    echo "-Trigger SBE"
+    ($cc).proc_lbus_map.write 0x28E0 0x0000F3FF  #NonFunc EX (only 4,5 is good)
+    ($cc).proc_lbus_map.write 0x2848 0x00000FFF  #GP3 0x2812 (flush) 
+    ($cc).proc_lbus_map.write 0x2870 0x10000000  #SBE Vital 0x281C (load) 
+    ($cc).proc_lbus_map.write 0x2870 0x90000000  #SBE Vital 0x281C (start)
+}
 
 ###################################
 #Configure SFC (mimmic FSP Setup)
diff --git a/src/usr/fsi/test/fsiddtest.H b/src/usr/fsi/test/fsiddtest.H
index c43cc9841..b1b103190 100644
--- a/src/usr/fsi/test/fsiddtest.H
+++ b/src/usr/fsi/test/fsiddtest.H
@@ -186,32 +186,46 @@ class FsiDDTest : public CxxTest::TestSuite
         } test_data[] = {
             //** Master Control Space
             // version number
-            { PROC0, 0x003074, 0x92010800, false, true }, //CMFSI MVER
-            { PROC0, 0x003474, 0x92010800, false, true }, //MFSI MVER
+            //CMFSI MVER
+            { PROC0, 0x003074, 0x92010800, false, true },
+            //MFSI MVER
+            { PROC0, 0x003474, 0x92010800, false, true },
 
             //** Slave Regs (via absolute address)
-            { PROC0, 0x081000, 0x12345678, true, false }, //DATA_0 from FSI2PIB off MFSI-0 
-            { PROC0, 0x041028, 0x160E9049, false, false }, //CHIPID from SHIFT off cMFSI-0
-            { PROC0, 0x103074, 0x91010800, false, false }, //CMFSI MVER from Proc off MFSI-2
+            //DATA_0 from FSI2PIB off MFSI-0
+            { PROC0, 0x081000, 0x12345678, true, false }, 
+            //CHIPID from SHIFT off cMFSI-0
+            { PROC0, 0x041028, 0x160E9049, false, false },
+            //CMFSI MVER from Proc off MFSI-2
+            { PROC0, 0x103074, 0x92010800, false, false },
 
             //** Slave Regs
-            { PROCWRAP, 0x001000, 0x12345678, false, false }, //DATA_0 from FSI2PIB off MFSI-0 
-            { PROCWRAP, 0x001004, 0xA5A5A5A5, true, false }, //DATA_1 from FSI2PIB off MFSI-0
+            //DATA_0 from FSI2PIB off MFSI-0
+            { PROCWRAP, 0x001000, 0x12345678, false, false },
+            //DATA_1 from FSI2PIB off MFSI-0
+            { PROCWRAP, 0x001004, 0xA5A5A5A5, true, false },
 
             //** Slave Regs
-            { PROC1, 0x001000, 0x88776655, true, false }, //FEL from SHIFT off MFSI-1
+            //FEL from SHIFT off MFSI-1
+            { PROC1, 0x001000, 0x88776655, true, false },
 
             //** Slave Regs
-            { PROC2, 0x001000, 0x12345678, true, false }, //FEL from SHIFT off MFSI-2
+            //FEL from SHIFT off MFSI-2
+            { PROC2, 0x001000, 0x12345678, true, false }, 
 
             //** Slave Regs
-            { CENTAUR0, 0x000000, 0xC0010E95, false, false }, //Config Table entry for slave0 off cMFSI-0
-            { CENTAUR0, 0x001028, 0x160E9049, false, false }, //CHIPID from FSI2PIB off cMFSI-0
-            { CENTAUR0, 0x000C08, 0x12344321, true, false }, //FEL from SHIFT off cMFSI-0
+            //Config Table entry for slave0 off cMFSI-0
+            { CENTAUR0, 0x000000, 0xC0010E95, false, false },
+            //CHIPID from FSI2PIB off cMFSI-0
+            { CENTAUR0, 0x001028, 0x160E9049, false, false },
+            //FEL from SHIFT off cMFSI-0
+            { CENTAUR0, 0x000C08, 0x12344321, true, false },
 
             //** Slave Regs
-            { CENTAUR8, 0x001000, 0x33333333, true, false }, //FEL from SHIFT off cMFSI-0 of MFSI-1
-            { CENTAUR8, 0x001028, 0x160E9049, false, false }, //CHIPID from FSI2PIB off cMFSI-0 of MFSI-1
+            //FEL from SHIFT off cMFSI-0 of MFSI-1
+            { CENTAUR8, 0x001000, 0x33333333, true, false },
+            //CHIPID from FSI2PIB off cMFSI-0 of MFSI-1
+            { CENTAUR8, 0x001028, 0x160E9049, false, false },
         };
         const uint64_t NUM_ADDRS = sizeof(test_data)/sizeof(test_data[0]);
 
@@ -229,26 +243,30 @@ class FsiDDTest : public CxxTest::TestSuite
             {
                 if( ((0xFF0000 & test_data[x].addr) == 0x080000)
                     && (fsi_targets[PROCWRAP] != NULL)
-                    && (fsi_targets[PROCWRAP]->getAttr<TARGETING::ATTR_HWAS_STATE>().functional))
+                    && (fsi_targets[PROCWRAP]->
+                        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))
+                         && (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]->getAttr<TARGETING::ATTR_HWAS_STATE>().functional))
+                         && (fsi_targets[PROC2]->
+                             getAttr<TARGETING::ATTR_HWAS_STATE>().functional))
                 {
                     test_data[x].present = true;
                 }
             }
             // otherwise only talk to chips that we see
             else if (( fsi_targets[test_data[x].fsitarget] != NULL)   &&
-                     (fsi_targets[test_data[x].fsitarget]->getAttr<TARGETING::ATTR_HWAS_STATE>().functional))
+                     (fsi_targets[test_data[x].fsitarget]->
+                      getAttr<TARGETING::ATTR_HWAS_STATE>().functional))
             {
                 test_data[x].present = true;
             }
@@ -273,10 +291,11 @@ class FsiDDTest : public CxxTest::TestSuite
 
             total++;
             op_size = sizeof(uint32_t);
-            l_err = DeviceFW::deviceRead( fsi_targets[test_data[x].fsitarget], 
-                                          &(read_data[x]),
-                                          op_size,
-                                          DEVICE_FSI_ADDRESS(test_data[x].addr) );
+            l_err = DeviceFW::deviceRead(
+                              fsi_targets[test_data[x].fsitarget],
+                              &(read_data[x]),
+                              op_size,
+                              DEVICE_FSI_ADDRESS(test_data[x].addr) );
             if( l_err )
             {
                 TRACFCOMP(g_trac_fsi, "FsiDDTest::test_readWrite> Error from device : [%d] addr=0x%X, RC=%X", x, test_data[x].addr, l_err->reasonCode() );
@@ -300,10 +319,11 @@ class FsiDDTest : public CxxTest::TestSuite
             {
                 total++;
                 op_size = sizeof(uint32_t);
-                l_err = DeviceFW::deviceWrite( fsi_targets[test_data[x].fsitarget], 
-                                               &(test_data[x].data),
-                                               op_size,
-                                               DEVICE_FSI_ADDRESS(test_data[x].addr) );
+                l_err = DeviceFW::deviceWrite(
+                                  fsi_targets[test_data[x].fsitarget],
+                                  &(test_data[x].data),
+                                  op_size,
+                                  DEVICE_FSI_ADDRESS(test_data[x].addr) );
                 if( l_err )
                 {
                     TRACFCOMP(g_trac_fsi, "FsiDDTest::test_readWrite> Error from device : [%d] addr=0x%X, RC=%X", x, test_data[x].addr, l_err->reasonCode() );
@@ -324,10 +344,11 @@ class FsiDDTest : public CxxTest::TestSuite
 
             total++;
             op_size = sizeof(uint32_t);
-            l_err = DeviceFW::deviceRead( fsi_targets[test_data[x].fsitarget], 
-                                          &(read_data[x]),
-                                          op_size,
-                                          DEVICE_FSI_ADDRESS(test_data[x].addr) );
+            l_err = DeviceFW::deviceRead(
+                              fsi_targets[test_data[x].fsitarget],
+                              &(read_data[x]),
+                              op_size,
+                              DEVICE_FSI_ADDRESS(test_data[x].addr) );
             if( l_err )
             {
                 TRACFCOMP(g_trac_fsi, "FsiDDTest::test_readWrite> Error from device : [%d] addr=0x%X, RC=%X", x, test_data[x].addr, l_err->reasonCode() );
@@ -363,10 +384,11 @@ class FsiDDTest : public CxxTest::TestSuite
             if( test_data[x].writeable )
             {
                 total++;
-                l_err = DeviceFW::deviceWrite( fsi_targets[test_data[x].fsitarget], 
-                                               &(test_data[x].data),
-                                               op_size,
-                                               DEVICE_FSI_ADDRESS(test_data[x].addr) );
+                l_err = DeviceFW::deviceWrite(
+                                  fsi_targets[test_data[x].fsitarget],
+                                  &(test_data[x].data),
+                                  op_size,
+                                  DEVICE_FSI_ADDRESS(test_data[x].addr) );
                 if( l_err )
                 {
                     TRACFCOMP(g_trac_fsi, "FsiDDTest::test_readWrite> Error from device : addr=0x%X, RC=%X", test_data[x].addr, l_err->reasonCode() );
@@ -397,10 +419,11 @@ class FsiDDTest : public CxxTest::TestSuite
         // master sentinel should fail
         total++;
         size_t op_size = sizeof(uint32_t);       
-        l_err = DeviceFW::deviceRead( TARGETING::MASTER_PROCESSOR_CHIP_TARGET_SENTINEL, 
-                                      &regdata,
-                                      op_size,
-                                      DEVICE_FSI_ADDRESS(0x111111) );
+        l_err = DeviceFW::deviceRead(
+                          TARGETING::MASTER_PROCESSOR_CHIP_TARGET_SENTINEL,
+                          &regdata,
+                          op_size,
+                          DEVICE_FSI_ADDRESS(0x111111) );
         if( l_err && (l_err->reasonCode() == FSI::RC_MASTER_TARGET) )
         {
             delete l_err;
diff --git a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
index 35e50e241..c55653ff9 100644
--- a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
@@ -901,7 +901,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
-        <default>0</default>
+        <default>1</default>
     </attribute>
     <attribute>
         <id>FSI_SLAVE_CASCADE</id>
@@ -1570,7 +1570,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
-        <default>1</default>
+        <default>2</default>
     </attribute>
     <attribute>
         <id>FSI_SLAVE_CASCADE</id>
@@ -2237,7 +2237,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
-        <default>2</default>
+        <default>3</default>
     </attribute>
     <attribute>
         <id>FSI_SLAVE_CASCADE</id>