Enabling FSI to remote Centaurs (SW107421 is fixed)

Change-Id: I2eaef856d94a4d84db729e1f9d1e9b5b0f8d0845
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/496
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

4 files changed, 74 insertions, 71 deletions

diff --git a/src/build/citest/etc/workarounds.presimsetup b/src/build/citest/etc/workarounds.presimsetup
index 4dd47b267..e35dbf2f3 100755
--- a/src/build/citest/etc/workarounds.presimsetup
+++ b/src/build/citest/etc/workarounds.presimsetup
@@ -33,6 +33,8 @@ cp --update $BACKING_BUILD/src/simu/configs/P8_SALERNO.config $sb/simu/configs
 sed -i -e's/SETENV GFW_P8_SALERNO_L3_MB_SIZE.*/SETENV GFW_P8_SALERNO_L3_MB_SIZE 8/' $sb/simu/configs/P8_SALERNO.config
 # Backing build already contains 910431.  Leave this workaround here for future scomdef files
 #sed -i -e's/SETENV GFW_P8_SALERNO_MODEL_EC.*/SETENV GFW_P8_SALERNO_MODEL_EC 910431/' $sb/simu/configs/P8_SALERNO.config
+echo "SETENV GFW_SIMICS_ENV_TEST_MODE             no" >> $sb/simu/configs/P8_SALERNO.config
+echo "SETENV GFW_P8_SALERNO_ENABLE_P8_PROC         no" >> $sb/simu/configs/P8_SALERNO.config
 
 echo "+++ Copy desired VENICE config file to sandbox and modify L3 to 8MB."
 mkdir -p $sb/simu/configs
@@ -40,6 +42,9 @@ cp --update $BACKING_BUILD/src/simu/configs/P8_VENICE.config $sb/simu/configs
 sed -i -e's/SETENV GFW_P8_VENICE_L3_MB_SIZE.*/SETENV GFW_P8_VENICE_L3_MB_SIZE 8/' $sb/simu/configs/P8_VENICE.config
 # Backing build already contains 910431.  Leave this workaround here for future scomdef files
 #sed -i -e's/SETENV GFW_P8_VENICE_MODEL_EC.*/SETENV GFW_P8_VENICE_MODEL_EC 910431/' $sb/simu/configs/P8_VENICE.config
+echo "SETENV GFW_SIMICS_ENV_TEST_MODE             no" >> $sb/simu/configs/P8_VENICE.config
+echo "SETENV GFW_P8_VENICE_ENABLE_P8_PROC         no" >> $sb/simu/configs/P8_VENICE.config
+
 
 echo "+++ Update Chip EC levels (SW106529)."
 sed -i -e's/SETENV GFW_P8_VENICE_PROC_EC.*/SETENV GFW_P8_VENICE_PROC_EC 10/' $sb/simu/configs/P8_VENICE.config
@@ -52,7 +57,6 @@ cp --update $BACKING_BUILD/src/simu/data/cec-chip/centaur.chip $sb/simu/data/cec
 grep -v DONE $sb/simu/data/cec-chip/centaur.chip.orig > $sb/simu/data/cec-chip/centaur.chip
 echo "SCOMREGS           # List all scom registers" >> $sb/simu/data/cec-chip/centaur.chip
 echo "  0x00012345    #fake register for testing" >> $sb/simu/data/cec-chip/centaur.chip
-echo "  0x0FFFFFFF    #fake register for testing" >> $sb/simu/data/cec-chip/centaur.chip
 echo "  0x02011672    #MBU.MBS.MCBISTS01.SCOMFIR.MCBCMA1Q" >> $sb/simu/data/cec-chip/centaur.chip
 echo "  0x02011403    #MBU.MBS.MBS_FIR_MASK_REG" >> $sb/simu/data/cec-chip/centaur.chip
 echo "END" >> $sb/simu/data/cec-chip/centaur.chip
@@ -61,7 +65,7 @@ echo "DONE" >> $sb/simu/data/cec-chip/centaur.chip
 echo "+++ Update to new simics build."
 mkdir -p $sb/simu/data
 egrep -v "WSALIAS HOSTBOOT_LEVEL FIPSLEVEL|WSALIAS HOSTBOOT_LEVEL SIMICSLEVEL" $BACKING_BUILD/src/simu/data/simicsInfo > $sb/simu/data/simicsInfo
-echo "WSALIAS HOSTBOOT_LEVEL FIPSLEVEL env/gfwa/simics-4.2.0/simics-4.2.82/fips/fld36/fi111019b700.42" >> $sb/simu/data/simicsInfo
+echo "WSALIAS HOSTBOOT_LEVEL FIPSLEVEL env/gfwa/simics-4.2.0/simics-4.2.82/fips/fld36/fi111110b700.42" >> $sb/simu/data/simicsInfo
 echo "WSALIAS HOSTBOOT_LEVEL SIMICSLEVEL env/vtechb/simics-4.2.0/simics-4.2.82/bin" >> $sb/simu/data/simicsInfo
 
 echo "+++ New simics build (fi111013b700.42) needs some new files."
diff --git a/src/usr/fsi/test/fsiddtest.H b/src/usr/fsi/test/fsiddtest.H
index 49b8de5c4..ebd96cad0 100644
--- a/src/usr/fsi/test/fsiddtest.H
+++ b/src/usr/fsi/test/fsiddtest.H
@@ -207,14 +207,14 @@ class FsiDDTest : public CxxTest::TestSuite
             //** Slave Regs (cheating)
             { PROC0, 0x080000, 0xC0010EA0, false, false }, //Config Table entry for slave0 off MFSI-0 
             { PROC0, 0x081000, 0x12345678, true, false }, //DATA_0 from FSI2PIB off MFSI-0 
-            { PROC0, 0x041028, 0xC6EE9049 /*fixme 0x160E9049*/, false, false }, //CHIPID from SHIFT off cMFSI-0
+            { PROC0, 0x041028, 0x160E9049, false, false }, //CHIPID from SHIFT off cMFSI-0
             { PROC0, 0x103074, 0x91010800, false, false }, //CMFSI MVER from Proc off MFSI-2
 
             //** Slave Regs
             { PROCWRAP, 0x000000, 0xC0010EA0, false, false }, //Config Table entry for slave0 off MFSI-0 
             { PROCWRAP, 0x001000, 0x12345678, false, false }, //DATA_0 from FSI2PIB off MFSI-0 
             { PROCWRAP, 0x001004, 0xA5A5A5A5, true, false }, //DATA_1 from FSI2PIB off MFSI-0
-            //SW106529 { PROCWRAP, 0x001028, 0x120EA049, false, false }, //CHIPID from FSI2PIB off MFSI-0 
+            //@fixme SW106529  { PROCWRAP, 0x001028, 0x120EA049, false, false }, //CHIPID from FSI2PIB off MFSI-0 
 
             //** Slave Regs
             { PROC2, 0x000000, 0xC0010EA0, false, false }, //Config Table entry for slave0 off MFSI-2
@@ -222,13 +222,13 @@ class FsiDDTest : public CxxTest::TestSuite
             { PROC2, 0x001028, 0x120EA049, false, false }, //CHIPID from FSI2PIB off MFSI-2
 
             //** Slave Regs
-            { CENTAUR0, 0x000000, 0xC31CEE9C, false, false }, //Config Table entry for slave0 off cMFSI-0 
-            { CENTAUR0, 0x001028, 0xC6EE9049 /*fixme 0x160E9049*/, false, false }, //CHIPID from FSI2PIB off cMFSI-0
+            { CENTAUR0, 0x000000, 0xC0010E9C, 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
 
             //** Slave Regs
-            { CENTAUR8, 0x001000, 0x33333333, true, false }, //FEL from SHIFT off cMFSI-0 of MFSI-7
-            { CENTAUR8, 0x001028, /*0xC6EE9049*/ 0x160E9049, false, false }, //CHIPID from FSI2PIB off cMFSI-0 of MFSI-7
+            { 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
         };
         const uint64_t NUM_ADDRS = sizeof(test_data)/sizeof(test_data[0]);
 
diff --git a/src/usr/scom/test/scomtest.H b/src/usr/scom/test/scomtest.H
index f08fd7851..c9069acf7 100644
--- a/src/usr/scom/test/scomtest.H
+++ b/src/usr/scom/test/scomtest.H
@@ -96,7 +96,6 @@ public:
           { 0x120F0166, 0xFEDCBA9876543210}, 
           { 0x00040005, 0x0000000000000000}, 
           { 0x02040004, 0xFFFFFFFFFFFFFFFF}, 
-
       };
       const uint64_t NUM_ADDRS = sizeof(test_data)/sizeof(test_data[0]);
 
@@ -160,9 +159,7 @@ public:
    */
   void test_FSISCOMreadWrite_centaur(void)
   {
-
       TRACFCOMP( g_trac_scom, "ScomTest::test_FSISCOMreadWrite_centaur> Start" );
-
       uint64_t fails = 0;
       uint64_t total = 0;
       errlHndl_t l_err = NULL;
@@ -203,10 +200,9 @@ public:
           uint64_t data;
       } test_data[] = {
           { 0x00012345 , 0x1111222233334444 }, 
-          /* Simics is chopping off the upper nibble... SW108655
-          { 0x02011403 , 0x123456789ABCDEF0 }, 
+          //@fixme - should be 0x02011403 but simics is adding parity...
+          { 0x02011402 , 0x123456789ABCDEF0 }, 
           { 0x02011672 , 0x1122334455667788 },
-          */
 
       };
       const uint64_t NUM_ADDRS = sizeof(test_data)/sizeof(test_data[0]);
@@ -268,6 +264,8 @@ public:
 
   //@todo - write tests to verify connection between XSCOM and FSISCOM
 
+  //@todo - write error path testcase for FSI scom using bad address 
+
 };
 
 #endif
diff --git a/src/usr/targeting/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/xmltohb/simics_VENICE.system.xml
index c62f6745f..c21de0b10 100644
--- a/src/usr/targeting/xmltohb/simics_VENICE.system.xml
+++ b/src/usr/targeting/xmltohb/simics_VENICE.system.xml
@@ -851,7 +851,8 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>MFSI</default>
+        <default>NO_MASTER</default>
+        <!-- @fixme : should be MFSI but support for alt-master is under Story 3853 -->
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -3837,7 +3838,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -3921,7 +3922,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4005,7 +4006,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4089,7 +4090,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4173,7 +4174,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4257,7 +4258,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4341,7 +4342,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4425,7 +4426,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4509,7 +4510,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4593,7 +4594,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4677,7 +4678,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4761,7 +4762,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4845,7 +4846,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4929,7 +4930,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5013,7 +5014,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5097,7 +5098,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5181,7 +5182,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5265,7 +5266,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5349,7 +5350,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5433,7 +5434,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5517,7 +5518,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5601,7 +5602,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5685,7 +5686,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5769,7 +5770,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5853,7 +5854,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5937,7 +5938,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6021,7 +6022,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6105,7 +6106,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6189,7 +6190,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6273,7 +6274,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6357,7 +6358,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6441,7 +6442,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6525,7 +6526,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6609,7 +6610,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6693,7 +6694,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6777,7 +6778,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6861,7 +6862,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6945,7 +6946,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7029,7 +7030,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7113,7 +7114,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7197,7 +7198,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7281,7 +7282,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7365,7 +7366,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7449,7 +7450,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7533,7 +7534,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7617,7 +7618,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7701,7 +7702,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7785,7 +7786,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7869,7 +7870,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7953,7 +7954,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -8037,7 +8038,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -8121,7 +8122,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -8205,7 +8206,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -8289,7 +8290,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -8373,7 +8374,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -8457,7 +8458,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>