summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/build/citest/autocitest3
-rw-r--r--src/build/citest/etc/bbuild2
-rwxr-xr-xsrc/build/citest/etc/workarounds.postsimsetup30
-rwxr-xr-xsrc/build/citest/etc/workarounds.presimsetup22
-rwxr-xr-xsrc/build/debug/simics-debug-framework.py2
-rwxr-xr-xsrc/build/simics/hb-simdebug.py2
-rwxr-xr-xsrc/build/simics/post_model_hook.simics4
-rw-r--r--src/include/kernel/cpumgr.H2
-rw-r--r--src/usr/hwas/plat/hwasPlat.C10
-rw-r--r--src/usr/scom/test/scomtest.H67
-rw-r--r--src/usr/targeting/common/xmltohb/simics_VENICE.system.xml275
-rw-r--r--src/usr/targeting/test/testtargeting.H2
12 files changed, 243 insertions, 178 deletions
diff --git a/src/build/citest/autocitest b/src/build/citest/autocitest
index bd41cfccd..cc49290ea 100755
--- a/src/build/citest/autocitest
+++ b/src/build/citest/autocitest
@@ -107,6 +107,7 @@ fi
## set up
##
DRIVER="$1" ## backing tree
+export bb=$DRIVER ## simulate a workon
TEST_SANDBOX="$2" ## test sandbox
HBICORE_TEST="$3" ## path to hbicore_test.img
@@ -387,7 +388,7 @@ tracecalls=`cat $SBXHOME/tracecalls.log | xargs echo -n`
echo "====> dump printk buffer..."
-autosim $NOWIN --simcmd "memory_image_ln0.save ${SBXHOME}/testprintk.log 0x$printk_buffer_addr 0x$printk_buffer_size" 1> /dev/null 2> /dev/null
+autosim $NOWIN --simcmd "p8Proc0.l3_cache_image.save ${SBXHOME}/testprintk.log 0x$printk_buffer_addr 0x$printk_buffer_size" 1> /dev/null 2> /dev/null
if [ $? -ne 0 ] ; then
echo "ERROR: Unable to run $?"
stopsim
diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild
index f832afe05..588c3b8b7 100644
--- a/src/build/citest/etc/bbuild
+++ b/src/build/citest/etc/bbuild
@@ -1 +1 @@
-/esw/fips810/Builds/b0419a_1215.810
+/esw/fips810/Builds/b0510a_1219.810
diff --git a/src/build/citest/etc/workarounds.postsimsetup b/src/build/citest/etc/workarounds.postsimsetup
index 9d27730f7..821b936fa 100755
--- a/src/build/citest/etc/workarounds.postsimsetup
+++ b/src/build/citest/etc/workarounds.postsimsetup
@@ -27,7 +27,37 @@
## to setup the sandbox
##
+#####
echo "+++ Point Simics to our base image +++"
#ln -sf $sb/../img/hbicore.bin $sb/../simics/hostboot.bin
mkdir -p $sb/../images/ppc/lab/flash/
ln -sf $sb/../img/hbicore.bin $sb/../images/ppc/lab/flash/hostboot.bin
+#####
+
+#####
+#@fixme - Fix with RTC:41342
+echo "+++ Copy centaur.act"
+mkdir -p $sb/simu/data/cec-chip
+cp $HOSTBOOTROOT/src/build/citest/etc/patches/centaur.act $sb/simu/data/cec-chip/centaur.act
+#####
+
+#####
+#@fixme - Fix with RTC:41342
+echo "+++ Update Model EC."
+mkdir -p $sb/simu/configs/
+
+cp --update $bb/src/simu/configs/P8_MURANO.config $sb/simu/configs/P8_MURANO.config
+sed -i -e's/SETENV GFW_P8_MURANO_PROC_MODEL_EC.*/SETENV GFW_P8_MURANO_PROC_MODEL_EC 910623/' $sb/simu/configs/P8_MURANO.config
+sed -i -e's/SETENV GFW_P8_MURANO_CENTAUR_MODEL_EC.*/SETENV GFW_P8_MURANO_CENTAUR_MODEL_EC 910610/' $sb/simu/configs/P8_MURANO.config
+
+cp --update $bb/src/simu/configs/P8_VENICE.config $sb/simu/configs/P8_VENICE.config
+sed -i -e's/SETENV GFW_P8_VENICE_PROC_MODEL_EC.*/SETENV GFW_P8_VENICE_PROC_MODEL_EC 910623/' $sb/simu/configs/P8_VENICE.config
+#####
+
+#####
+#@fixme - Fix with RTC:41205
+echo "+++ Fix centaur aliases in p8.act (SW141619) +++"
+mkdir -p $sb/simu/data/cec-chip/
+cp --update $bb/src/simu/data/cec-chip/p8.act $sb/simu/data/cec-chip/
+sed -i -e's/mycentaur/mymcPort/' $sb/simu/data/cec-chip/p8.act
+#####
diff --git a/src/build/citest/etc/workarounds.presimsetup b/src/build/citest/etc/workarounds.presimsetup
index 265862240..d8616729f 100755
--- a/src/build/citest/etc/workarounds.presimsetup
+++ b/src/build/citest/etc/workarounds.presimsetup
@@ -27,28 +27,6 @@
## to setup the sandbox
##
-echo "+++ Copy centaur.act"
-mkdir -p $sb/simu/data/cec-chip
-cp $HOSTBOOTROOT/src/build/citest/etc/patches/centaur.act $sb/simu/data/cec-chip/centaur.act
-
-echo "+++ Copy desired config file to sandbox and modify Model EC."
-mkdir -p $sb/simu/configs
-cp --update $BACKING_BUILD/src/simu/configs/P8_MURANO.config $sb/simu/configs
-cp --update $BACKING_BUILD/src/simu/configs/P8_VENICE.config $sb/simu/configs
-sed -i -e's/SETENV GFW_P8_MURANO_PROC_MODEL_EC.*/SETENV GFW_P8_MURANO_PROC_MODEL_EC 910623/' $sb/simu/configs/P8_MURANO.config
-sed -i -e's/SETENV GFW_P8_MURANO_CENTAUR_MODEL_EC.*/SETENV GFW_P8_MURANO_CENTAUR_MODEL_EC 910610/' $sb/simu/configs/P8_MURANO.config
-sed -i -e's/SETENV GFW_P8_VENICE_PROC_MODEL_EC.*/SETENV GFW_P8_VENICE_PROC_MODEL_EC 910623/' $sb/simu/configs/P8_VENICE.config
-
-echo "+++ Enable 8-threads."
-sed -i -e's/SETENV GFW_SIMICS_ENV_THREADS_PER_CORE.*/SETENV GFW_SIMICS_ENV_THREADS_PER_CORE 8/' $sb/simu/configs/P8_VENICE.config
-sed -i -e's/SETENV GFW_SIMICS_ENV_THREADS_PER_CORE.*/SETENV GFW_SIMICS_ENV_THREADS_PER_CORE 8/' $sb/simu/configs/P8_MURANO.config
-
-#Remove with RTC:40975
-echo "+++ Update to new phyp level for XSCOM fixes."
-mkdir -p $sb/simu/data
-cp --update $BACKING_BUILD/src/simu/data/simicsInfo $sb/simu/data/simicsInfo
-sed -i -e's/^WSALIAS DEFAULT PHYPLEVEL.*/WSALIAS DEFAULT PHYPLEVEL env\/phypb\/simics-4.2.0\/simics-4.2.85\/ph120424b700.42/' $sb/simu/data/simicsInfo
-
#### Examples ####
#echo "+++ Some message about why you need to do this."
diff --git a/src/build/debug/simics-debug-framework.py b/src/build/debug/simics-debug-framework.py
index edf5f0bdd..682c8aa56 100755
--- a/src/build/debug/simics-debug-framework.py
+++ b/src/build/debug/simics-debug-framework.py
@@ -399,7 +399,7 @@ def magic_instruction_callback(user_arg, cpu, arg):
# fsp-trace style.
writeLongLong(tracBinaryInfoAddr+8,1)
# Save the tracBinary buffer to a file named tracBINARY in current dir
- saveCommand = "memory_image_ln0.save tracBINARY 0x%x %d"%(pTracBinaryBuffer,cbUsed)
+ saveCommand = "p8Proc0.l3_cache_image.save tracBINARY 0x%x %d"%(pTracBinaryBuffer,cbUsed)
SIM_run_alone(run_command, saveCommand )
# Run fsp-trace on tracBINARY file (implied), append output to tracMERG
os.system( "fsp-trace ./ -s hbotStringFile >>tracMERG 2>/dev/null" )
diff --git a/src/build/simics/hb-simdebug.py b/src/build/simics/hb-simdebug.py
index 9b779dd67..7041bd2e5 100755
--- a/src/build/simics/hb-simdebug.py
+++ b/src/build/simics/hb-simdebug.py
@@ -44,7 +44,7 @@ def dumpL3():
#print t
#dump L3 to hbdump.<timestamp>
- string = "memory_image_ln0.save hbdump.%s 0 0x%x"%(t, L3_SIZE)
+ string = "p8Proc0.l3_cache_image.save hbdump.%s 0 0x%x"%(t, L3_SIZE)
#print string
result = run_command(string)
#print result
diff --git a/src/build/simics/post_model_hook.simics b/src/build/simics/post_model_hook.simics
index f2705f615..656b55b8e 100755
--- a/src/build/simics/post_model_hook.simics
+++ b/src/build/simics/post_model_hook.simics
@@ -49,7 +49,3 @@ venice_cec_chip_cmp0.psi_hb->psihb_xivr_fsi=0x0140000000 #02010917
venice_cec_chip_cmp0.psi_hb->psihb_irsn=0x00030000FFFF0000 #0201091b
p8Proc0.proc_fsi2host_mbox->responder_enable=1
-#@fixme - Remove with RTC:41070
-#Get the OCC scoms to work correctly
-p8Proc0.occ_scom_bridge->occ_pib=p8Proc0.OccComplexSlot.OccSimpleSlot.pcb_space
-p8Proc0.OccComplexSlot.OccSimpleSlot.ocb->trusted_boot=FALSE
diff --git a/src/include/kernel/cpumgr.H b/src/include/kernel/cpumgr.H
index 4374d50a0..589eb385c 100644
--- a/src/include/kernel/cpumgr.H
+++ b/src/include/kernel/cpumgr.H
@@ -34,7 +34,7 @@ class CpuManager
enum
{
MAXCPUS = KERNEL_MAX_SUPPORTED_CPUS,
- CPU_PERIODIC_CHECK_MEMORY = 32,
+ CPU_PERIODIC_CHECK_MEMORY = 16,
CPU_PERIODIC_FLUSH_PAGETABLE = 256,
CPU_PERIODIC_DEFRAG = 949, // TODO Any bigger not currently hit
};
diff --git a/src/usr/hwas/plat/hwasPlat.C b/src/usr/hwas/plat/hwasPlat.C
index 0af9a7ace..365101081 100644
--- a/src/usr/hwas/plat/hwasPlat.C
+++ b/src/usr/hwas/plat/hwasPlat.C
@@ -108,7 +108,7 @@ errlHndl_t platPresenceDetect(TargetHandleList &io_targets)
if (errl != NULL)
{ // errl was set - this is an error condition.
- HWAS_ERR( "pTarget %x (%p) - failed presence detect",
+ HWAS_ERR( "pTarget %.8X (%p) - failed presence detect",
pTarget->getAttr<ATTR_HUID>(), pTarget);
// commit the error but keep going
@@ -116,7 +116,7 @@ errlHndl_t platPresenceDetect(TargetHandleList &io_targets)
// errl is now NULL
// chip not present -- remove from list
- HWAS_DBG( "pTarget %x (%p) - no presence",
+ HWAS_DBG( "pTarget %.8X (%p) - no presence",
pTarget->getAttr<ATTR_HUID>(), pTarget);
// erase this target, and 'increment' to next
@@ -128,15 +128,15 @@ errlHndl_t platPresenceDetect(TargetHandleList &io_targets)
if (present == true)
{
- HWAS_DBG( "pTarget %x (%p) - detected present",
- pTarget->getAttr<ATTR_HUID>(), pTarget);
+ HWAS_DBG( "pTarget %.8X (%p) - detected present",
+ pTarget->getAttr<ATTR_HUID>(), pTarget);
// advance to next entry in the list
pTarget_it++;
}
else
{ // chip not present -- remove from list
- HWAS_DBG( "pTarget %x (%p) - no presence",
+ HWAS_DBG( "pTarget %.8X (%p) - no presence",
pTarget->getAttr<ATTR_HUID>(), pTarget);
// erase this target, and 'increment' to next
diff --git a/src/usr/scom/test/scomtest.H b/src/usr/scom/test/scomtest.H
index 7d92c0a7b..e30770326 100644
--- a/src/usr/scom/test/scomtest.H
+++ b/src/usr/scom/test/scomtest.H
@@ -203,7 +203,15 @@ public:
// Setup some targets to use
enum {
CENTAUR0, //local
+ CENTAUR1, //local
+ CENTAUR2, //local
+ CENTAUR3, //local
+ CENTAUR4, //local
+ CENTAUR5, //local
+ CENTAUR6, //local
+ CENTAUR7, //local
CENTAUR8, //remote (off PROC1)
+ CENTAUR9, //remote (off PROC1)
NUM_TARGETS
};
TARGETING::Target* scom_targets[NUM_TARGETS];
@@ -224,6 +232,31 @@ public:
epath.addLast(TARGETING::TYPE_MEMBUF,8);
scom_targets[CENTAUR8] = TARGETING::targetService().toTarget(epath);
+ epath.removeLast();
+ epath.addLast(TARGETING::TYPE_MEMBUF,1);
+ scom_targets[CENTAUR1] = TARGETING::targetService().toTarget(epath);
+ epath.removeLast();
+ epath.addLast(TARGETING::TYPE_MEMBUF,2);
+ scom_targets[CENTAUR2] = TARGETING::targetService().toTarget(epath);
+ epath.removeLast();
+ epath.addLast(TARGETING::TYPE_MEMBUF,3);
+ scom_targets[CENTAUR3] = TARGETING::targetService().toTarget(epath);
+ epath.removeLast();
+ epath.addLast(TARGETING::TYPE_MEMBUF,4);
+ scom_targets[CENTAUR4] = TARGETING::targetService().toTarget(epath);
+ epath.removeLast();
+ epath.addLast(TARGETING::TYPE_MEMBUF,5);
+ scom_targets[CENTAUR5] = TARGETING::targetService().toTarget(epath);
+ epath.removeLast();
+ epath.addLast(TARGETING::TYPE_MEMBUF,6);
+ scom_targets[CENTAUR6] = TARGETING::targetService().toTarget(epath);
+ epath.removeLast();
+ epath.addLast(TARGETING::TYPE_MEMBUF,7);
+ scom_targets[CENTAUR7] = TARGETING::targetService().toTarget(epath);
+ epath.removeLast();
+ epath.addLast(TARGETING::TYPE_MEMBUF,9);
+ scom_targets[CENTAUR9] = TARGETING::targetService().toTarget(epath);
+
for( uint64_t x = 0; x < NUM_TARGETS; x++ )
{
//only run if the target exists and has FSI enabled.
@@ -261,6 +294,17 @@ public:
{ scom_targets[CENTAUR0], 0x02011403 , 0x1234567800000000 },
{ scom_targets[CENTAUR0], 0x02011672 , 0x1122334455667788 },
{ scom_targets[CENTAUR8], 0x02011672 , 0x9E9E9E9E9E9E9E9E },
+
+ { scom_targets[CENTAUR0], 0x02011404 , 0x00000000f0f0f0f0 },
+ { scom_targets[CENTAUR1], 0x02011404 , 0x1111111100000000 },
+ { scom_targets[CENTAUR2], 0x02011404 , 0x2222222200000000 },
+ { scom_targets[CENTAUR3], 0x02011404 , 0x3333333300000000 },
+ { scom_targets[CENTAUR4], 0x02011404 , 0x4444444400000000 },
+ { scom_targets[CENTAUR5], 0x02011404 , 0x5555555500000000 },
+ { scom_targets[CENTAUR6], 0x02011404 , 0x6666666600000000 },
+ { scom_targets[CENTAUR7], 0x02011404 , 0x7777777700000000 },
+ { scom_targets[CENTAUR8], 0x02011404 , 0x8888888800000000 },
+ { scom_targets[CENTAUR9], 0x02011404 , 0x9999999900000000 },
};
const uint64_t NUM_ADDRS = sizeof(test_data)/sizeof(test_data[0]);
@@ -1165,6 +1209,12 @@ public:
{
continue;
}
+ // check to see if the target is functional.. if not.. skip this target
+ else if (test_data[x].target->getAttr<TARGETING::ATTR_HWAS_STATE>().functional != true)
+ {
+ TRACDCOMP( g_trac_scom, "ScomTest::test_translate_scom_MBA_MBS> Target %d is not functional", x );
+ continue;
+ }
op_size = sizeof(uint64_t);
@@ -1352,6 +1402,12 @@ public:
{
continue;
}
+ // check to see if the target is functional.. if not.. skip this target
+ else if (test_data[x].target->getAttr<TARGETING::ATTR_HWAS_STATE>().functional != true)
+ {
+ TRACDCOMP( g_trac_scom, "ScomTest::test_translate_scom_ABUS> Target %d is not functional", x );
+ continue;
+ }
op_size = sizeof(uint64_t);
@@ -1493,7 +1549,7 @@ public:
{
continue;
}
- // check to see if the target is functional.. if not.. skip this target
+ // check to see if the target is functional.. if not.. skip this target
else if (test_data[x].target->getAttr<TARGETING::ATTR_HWAS_STATE>().functional != true)
{
TRACDCOMP( g_trac_scom, "ScomTest::test_translate_scom_XBUS> Target %d is not functional", x );
@@ -1538,6 +1594,12 @@ public:
{
continue;
}
+ // check to see if the target is functional.. if not.. skip this target
+ else if (test_data[x].target->getAttr<TARGETING::ATTR_HWAS_STATE>().functional != true)
+ {
+ TRACDCOMP( g_trac_scom, "ScomTest::test_translate_scom_XBUS> Target %d is not functional", x );
+ continue;
+ }
op_size = sizeof(uint64_t);
@@ -1572,9 +1634,6 @@ public:
//@todo - write error path testcase for FSI scom using bad address
-
- //@todo - address translation
-
};
#endif
diff --git a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
index 85a236eaa..69d56bc03 100644
--- a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
@@ -36,6 +36,11 @@
* each Centaur membuf chip has 2 MBA chiplets
* each MBA chiplet has 2 ports
* each MBA port connects to 2 dimms
+
+ Note that the logical memory connections are very wacky in their
+ relationship to the FSI ports:
+ cMFSI Port 0-7 = Logical MCS Port 4,5,6,7,0,1,2,3
+
================================================================= -->
<!-- System -->
@@ -3599,7 +3604,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>4</default>
+ <default>7</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -4467,7 +4472,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>5</default>
+ <default>6</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -7040,7 +7045,7 @@
<default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc0:cMFSI-0 -->
+ <!-- FSI is connected via proc0:cMFSI-4 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-0</default>
@@ -7051,7 +7056,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>0</default>
+ <default>4</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -7147,7 +7152,7 @@
<default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc0:cMFSI-1 -->
+ <!-- FSI is connected via proc0:cMFSI-5 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-0</default>
@@ -7158,7 +7163,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>1</default>
+ <default>5</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -7236,7 +7241,7 @@
<default>affinity:sys-0/node-0/proc-0/mcs-2/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc0:cMFSI-2 -->
+ <!-- FSI is connected via proc0:cMFSI-6 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-0</default>
@@ -7247,7 +7252,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>2</default>
+ <default>6</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -7325,7 +7330,7 @@
<default>affinity:sys-0/node-0/proc-0/mcs-3/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc0:cMFSI-3 -->
+ <!-- FSI is connected via proc0:cMFSI-7 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-0</default>
@@ -7336,7 +7341,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>3</default>
+ <default>7</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -7414,7 +7419,7 @@
<default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc0:cMFSI-4 -->
+ <!-- FSI is connected via proc0:cMFSI-0 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-0</default>
@@ -7425,7 +7430,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>4</default>
+ <default>0</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -7503,7 +7508,7 @@
<default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc0:cMFSI-5 -->
+ <!-- FSI is connected via proc0:cMFSI-1 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-0</default>
@@ -7514,7 +7519,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>5</default>
+ <default>1</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -7592,7 +7597,7 @@
<default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc0:cMFSI-6 -->
+ <!-- FSI is connected via proc0:cMFSI-2 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-0</default>
@@ -7603,7 +7608,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>6</default>
+ <default>2</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -7681,7 +7686,7 @@
<default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc0:cMFSI-7 -->
+ <!-- FSI is connected via proc0:cMFSI-3 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-0</default>
@@ -7692,7 +7697,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>7</default>
+ <default>3</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -7770,7 +7775,7 @@
<default>affinity:sys-0/node-0/proc-1/mcs-0/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc1:cMFSI-0 -->
+ <!-- FSI is connected via proc1:cMFSI-4 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-1</default>
@@ -7781,7 +7786,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>0</default>
+ <default>4</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -7859,7 +7864,7 @@
<default>affinity:sys-0/node-0/proc-1/mcs-1/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc1:cMFSI-1 -->
+ <!-- FSI is connected via proc1:cMFSI-5 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-1</default>
@@ -7870,7 +7875,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>1</default>
+ <default>5</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -7948,7 +7953,7 @@
<default>affinity:sys-0/node-0/proc-1/mcs-2/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc1:cMFSI-2 -->
+ <!-- FSI is connected via proc1:cMFSI-6 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-1</default>
@@ -7959,7 +7964,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>2</default>
+ <default>6</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -8037,7 +8042,7 @@
<default>affinity:sys-0/node-0/proc-1/mcs-3/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc1:cMFSI-3 -->
+ <!-- FSI is connected via proc1:cMFSI-7 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-1</default>
@@ -8048,7 +8053,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>3</default>
+ <default>7</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -8126,7 +8131,7 @@
<default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc1:cMFSI-4 -->
+ <!-- FSI is connected via proc1:cMFSI-0 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-1</default>
@@ -8137,7 +8142,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>4</default>
+ <default>0</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -8215,7 +8220,7 @@
<default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc1:cMFSI-5 -->
+ <!-- FSI is connected via proc1:cMFSI-1 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-1</default>
@@ -8226,7 +8231,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>5</default>
+ <default>1</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -8304,7 +8309,7 @@
<default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc1:cMFSI-6 -->
+ <!-- FSI is connected via proc1:cMFSI-2 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-1</default>
@@ -8315,7 +8320,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>6</default>
+ <default>2</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -8393,7 +8398,7 @@
<default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc1:cMFSI-7 -->
+ <!-- FSI is connected via proc1:cMFSI-3 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-1</default>
@@ -8404,7 +8409,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>7</default>
+ <default>3</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -8482,7 +8487,7 @@
<default>affinity:sys-0/node-0/proc-2/mcs-0/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc2:cMFSI-0 -->
+ <!-- FSI is connected via proc2:cMFSI-4 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-2</default>
@@ -8493,7 +8498,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>0</default>
+ <default>4</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -8571,7 +8576,7 @@
<default>affinity:sys-0/node-0/proc-2/mcs-1/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc2:cMFSI-1 -->
+ <!-- FSI is connected via proc2:cMFSI-5 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-2</default>
@@ -8582,7 +8587,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>1</default>
+ <default>5</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -8660,7 +8665,7 @@
<default>affinity:sys-0/node-0/proc-2/mcs-2/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc2:cMFSI-2 -->
+ <!-- FSI is connected via proc2:cMFSI-6 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-2</default>
@@ -8671,7 +8676,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>2</default>
+ <default>6</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -8749,7 +8754,7 @@
<default>affinity:sys-0/node-0/proc-2/mcs-3/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc2:cMFSI-3 -->
+ <!-- FSI is connected via proc2:cMFSI-7 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-2</default>
@@ -8760,7 +8765,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>3</default>
+ <default>7</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -8838,7 +8843,7 @@
<default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc2:cMFSI-4 -->
+ <!-- FSI is connected via proc2:cMFSI-0 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-2</default>
@@ -8849,7 +8854,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>4</default>
+ <default>0</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -8927,7 +8932,7 @@
<default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc2:cMFSI-5 -->
+ <!-- FSI is connected via proc2:cMFSI-1 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-2</default>
@@ -8938,7 +8943,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>5</default>
+ <default>1</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -9016,7 +9021,7 @@
<default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc2:cMFSI-6 -->
+ <!-- FSI is connected via proc2:cMFSI-2 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-2</default>
@@ -9027,7 +9032,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>6</default>
+ <default>2</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -9105,7 +9110,7 @@
<default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc2:cMFSI-7 -->
+ <!-- FSI is connected via proc2:cMFSI-3 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-2</default>
@@ -9116,7 +9121,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>7</default>
+ <default>3</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -9194,7 +9199,7 @@
<default>affinity:sys-0/node-0/proc-3/mcs-0/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc3:cMFSI-0 -->
+ <!-- FSI is connected via proc3:cMFSI-4 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-3</default>
@@ -9205,7 +9210,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>0</default>
+ <default>4</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -9283,7 +9288,7 @@
<default>affinity:sys-0/node-0/proc-3/mcs-1/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc3:cMFSI-1 -->
+ <!-- FSI is connected via proc3:cMFSI-5 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-3</default>
@@ -9294,7 +9299,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>1</default>
+ <default>5</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -9372,7 +9377,7 @@
<default>affinity:sys-0/node-0/proc-3/mcs-2/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc3:cMFSI-2 -->
+ <!-- FSI is connected via proc3:cMFSI-6 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-3</default>
@@ -9383,7 +9388,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>2</default>
+ <default>6</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -9461,7 +9466,7 @@
<default>affinity:sys-0/node-0/proc-3/mcs-3/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc3:cMFSI-3 -->
+ <!-- FSI is connected via proc3:cMFSI-7 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-3</default>
@@ -9472,7 +9477,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>3</default>
+ <default>7</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -9550,7 +9555,7 @@
<default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc3:cMFSI-4 -->
+ <!-- FSI is connected via proc3:cMFSI-0 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-3</default>
@@ -9561,7 +9566,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>4</default>
+ <default>0</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -9639,7 +9644,7 @@
<default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc3:cMFSI-5 -->
+ <!-- FSI is connected via proc3:cMFSI-1 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-3</default>
@@ -9650,7 +9655,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>5</default>
+ <default>1</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -9728,7 +9733,7 @@
<default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc3:cMFSI-6 -->
+ <!-- FSI is connected via proc3:cMFSI-2 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-3</default>
@@ -9739,7 +9744,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>6</default>
+ <default>2</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -9817,7 +9822,7 @@
<default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc3:cMFSI-7 -->
+ <!-- FSI is connected via proc3:cMFSI-3 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-3</default>
@@ -9828,7 +9833,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>7</default>
+ <default>3</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -9906,7 +9911,7 @@
<default>affinity:sys-0/node-0/proc-4/mcs-0/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc4:cMFSI-0 -->
+ <!-- FSI is connected via proc4:cMFSI-4 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-4</default>
@@ -9917,7 +9922,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>0</default>
+ <default>4</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -9995,7 +10000,7 @@
<default>affinity:sys-0/node-0/proc-4/mcs-1/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc4:cMFSI-1 -->
+ <!-- FSI is connected via proc4:cMFSI-5 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-4</default>
@@ -10006,7 +10011,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>1</default>
+ <default>5</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -10084,7 +10089,7 @@
<default>affinity:sys-0/node-0/proc-4/mcs-2/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc4:cMFSI-2 -->
+ <!-- FSI is connected via proc4:cMFSI-6 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-4</default>
@@ -10095,7 +10100,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>2</default>
+ <default>6</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -10173,7 +10178,7 @@
<default>affinity:sys-0/node-0/proc-4/mcs-3/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc4:cMFSI-3 -->
+ <!-- FSI is connected via proc4:cMFSI-7 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-4</default>
@@ -10184,7 +10189,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>3</default>
+ <default>7</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -10262,7 +10267,7 @@
<default>affinity:sys-0/node-0/proc-4/mcs-4/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc4:cMFSI-4 -->
+ <!-- FSI is connected via proc4:cMFSI-0 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-4</default>
@@ -10273,7 +10278,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>4</default>
+ <default>0</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -10351,7 +10356,7 @@
<default>affinity:sys-0/node-0/proc-4/mcs-5/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc4:cMFSI-5 -->
+ <!-- FSI is connected via proc4:cMFSI-1 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-4</default>
@@ -10362,7 +10367,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>5</default>
+ <default>1</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -10440,7 +10445,7 @@
<default>affinity:sys-0/node-0/proc-4/mcs-6/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc4:cMFSI-6 -->
+ <!-- FSI is connected via proc4:cMFSI-2 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-4</default>
@@ -10451,7 +10456,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>6</default>
+ <default>2</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -10529,7 +10534,7 @@
<default>affinity:sys-0/node-0/proc-4/mcs-7/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc4:cMFSI-7 -->
+ <!-- FSI is connected via proc4:cMFSI-3 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-4</default>
@@ -10540,7 +10545,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>7</default>
+ <default>3</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -10618,7 +10623,7 @@
<default>affinity:sys-0/node-0/proc-5/mcs-0/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc5:cMFSI-0 -->
+ <!-- FSI is connected via proc5:cMFSI-4 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-5</default>
@@ -10629,7 +10634,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>0</default>
+ <default>4</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -10707,7 +10712,7 @@
<default>affinity:sys-0/node-0/proc-5/mcs-1/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc5:cMFSI-1 -->
+ <!-- FSI is connected via proc5:cMFSI-5 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-5</default>
@@ -10718,7 +10723,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>1</default>
+ <default>5</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -10796,7 +10801,7 @@
<default>affinity:sys-0/node-0/proc-5/mcs-2/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc5:cMFSI-2 -->
+ <!-- FSI is connected via proc5:cMFSI-6 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-5</default>
@@ -10807,7 +10812,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>2</default>
+ <default>6</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -10885,7 +10890,7 @@
<default>affinity:sys-0/node-0/proc-5/mcs-3/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc5:cMFSI-3 -->
+ <!-- FSI is connected via proc5:cMFSI-7 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-5</default>
@@ -10896,7 +10901,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>3</default>
+ <default>7</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -10974,7 +10979,7 @@
<default>affinity:sys-0/node-0/proc-5/mcs-4/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc5:cMFSI-4 -->
+ <!-- FSI is connected via proc5:cMFSI-0 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-5</default>
@@ -10985,7 +10990,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>4</default>
+ <default>0</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -11063,7 +11068,7 @@
<default>affinity:sys-0/node-0/proc-5/mcs-5/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc5:cMFSI-5 -->
+ <!-- FSI is connected via proc5:cMFSI-1 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-5</default>
@@ -11074,7 +11079,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>5</default>
+ <default>1</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -11152,7 +11157,7 @@
<default>affinity:sys-0/node-0/proc-5/mcs-6/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc5:cMFSI-6 -->
+ <!-- FSI is connected via proc5:cMFSI-2 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-5</default>
@@ -11163,7 +11168,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>6</default>
+ <default>2</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -11241,7 +11246,7 @@
<default>affinity:sys-0/node-0/proc-5/mcs-7/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc5:cMFSI-7 -->
+ <!-- FSI is connected via proc5:cMFSI-3 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-5</default>
@@ -11252,7 +11257,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>7</default>
+ <default>3</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -11330,7 +11335,7 @@
<default>affinity:sys-0/node-0/proc-6/mcs-0/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc6:cMFSI-0 -->
+ <!-- FSI is connected via proc6:cMFSI-4 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-6</default>
@@ -11341,7 +11346,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>0</default>
+ <default>4</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -11419,7 +11424,7 @@
<default>affinity:sys-0/node-0/proc-6/mcs-1/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc6:cMFSI-1 -->
+ <!-- FSI is connected via proc6:cMFSI-5 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-6</default>
@@ -11430,7 +11435,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>1</default>
+ <default>5</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -11508,7 +11513,7 @@
<default>affinity:sys-0/node-0/proc-6/mcs-2/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc6:cMFSI-2 -->
+ <!-- FSI is connected via proc6:cMFSI-6 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-6</default>
@@ -11519,7 +11524,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>2</default>
+ <default>6</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -11597,7 +11602,7 @@
<default>affinity:sys-0/node-0/proc-6/mcs-3/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc6:cMFSI-3 -->
+ <!-- FSI is connected via proc6:cMFSI-7 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-6</default>
@@ -11608,7 +11613,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>3</default>
+ <default>7</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -11686,7 +11691,7 @@
<default>affinity:sys-0/node-0/proc-6/mcs-4/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc6:cMFSI-4 -->
+ <!-- FSI is connected via proc6:cMFSI-0 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-6</default>
@@ -11697,7 +11702,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>4</default>
+ <default>0</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -11775,7 +11780,7 @@
<default>affinity:sys-0/node-0/proc-6/mcs-5/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc6:cMFSI-5 -->
+ <!-- FSI is connected via proc6:cMFSI-1 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-6</default>
@@ -11786,7 +11791,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>5</default>
+ <default>1</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -11864,7 +11869,7 @@
<default>affinity:sys-0/node-0/proc-6/mcs-6/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc6:cMFSI-6 -->
+ <!-- FSI is connected via proc6:cMFSI-2 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-6</default>
@@ -11875,7 +11880,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>6</default>
+ <default>2</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -11953,7 +11958,7 @@
<default>affinity:sys-0/node-0/proc-6/mcs-7/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc6:cMFSI-7 -->
+ <!-- FSI is connected via proc6:cMFSI-3 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-6</default>
@@ -11964,7 +11969,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>7</default>
+ <default>3</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -12042,7 +12047,7 @@
<default>affinity:sys-0/node-0/proc-7/mcs-0/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc7:cMFSI-0 -->
+ <!-- FSI is connected via proc7:cMFSI-4 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-7</default>
@@ -12053,7 +12058,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>0</default>
+ <default>4</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -12131,7 +12136,7 @@
<default>affinity:sys-0/node-0/proc-7/mcs-1/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc7:cMFSI-1 -->
+ <!-- FSI is connected via proc7:cMFSI-5 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-7</default>
@@ -12142,7 +12147,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>1</default>
+ <default>5</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -12220,7 +12225,7 @@
<default>affinity:sys-0/node-0/proc-7/mcs-2/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc7:cMFSI-2 -->
+ <!-- FSI is connected via proc7:cMFSI-6 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-7</default>
@@ -12231,7 +12236,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>2</default>
+ <default>6</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -12309,7 +12314,7 @@
<default>affinity:sys-0/node-0/proc-7/mcs-3/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc7:cMFSI-3 -->
+ <!-- FSI is connected via proc7:cMFSI-7 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-7</default>
@@ -12320,7 +12325,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>3</default>
+ <default>7</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -12398,7 +12403,7 @@
<default>affinity:sys-0/node-0/proc-7/mcs-4/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc7:cMFSI-4 -->
+ <!-- FSI is connected via proc7:cMFSI-0 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-7</default>
@@ -12409,7 +12414,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>4</default>
+ <default>0</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -12487,7 +12492,7 @@
<default>affinity:sys-0/node-0/proc-7/mcs-5/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc7:cMFSI-5 -->
+ <!-- FSI is connected via proc7:cMFSI-1 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-7</default>
@@ -12498,7 +12503,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>5</default>
+ <default>1</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -12576,7 +12581,7 @@
<default>affinity:sys-0/node-0/proc-7/mcs-6/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc7:cMFSI-6 -->
+ <!-- FSI is connected via proc7:cMFSI-2 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-7</default>
@@ -12587,7 +12592,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>6</default>
+ <default>2</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -12665,7 +12670,7 @@
<default>affinity:sys-0/node-0/proc-7/mcs-7/membuf-0</default>
</attribute>
- <!-- FSI is connected via proc7:cMFSI-7 -->
+ <!-- FSI is connected via proc7:cMFSI-3 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-7</default>
@@ -12676,7 +12681,7 @@
</attribute>
<attribute>
<id>FSI_MASTER_PORT</id>
- <default>7</default>
+ <default>3</default>
</attribute>
<attribute>
<id>FSI_SLAVE_CASCADE</id>
@@ -12736,14 +12741,11 @@
<!-- Centaur n0p63 : end -->
-<!-- Remove this until Simics model works again :
- @fixme with Task 39187
-
-Target used for FSI wrap-back testing
+<!-- Target used for FSI wrap-back testing -->
<targetInstance>
<id>sys0node0proc0wrap</id>
<type>chip-processor-venice</type>
- <attribute><id>HUID</id><default>0x00070000</default></attribute>
+ <attribute><id>HUID</id><default>0x00070099</default></attribute>
<attribute><id>SCOM_SWITCHES</id>
<default>
<field><id>useFsiScom</id><value>1</value></field>
@@ -12761,7 +12763,7 @@ Target used for FSI wrap-back testing
<default>affinity:sys-0/node-0/proc-9</default>
</attribute>
- FSI is connected via wrapback to itself over MFSI-0
+ <!-- FSI is connected via wrapback to itself over MFSI-0 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
<default>physical:sys-0/node-0/proc-0</default>
@@ -12785,7 +12787,6 @@ Target used for FSI wrap-back testing
<attribute><id>VPD_REC_NUM</id><default>0</default></attribute>
</targetInstance>
--->
<!-- DIMMS
diff --git a/src/usr/targeting/test/testtargeting.H b/src/usr/targeting/test/testtargeting.H
index a3c6232ea..a112275fc 100644
--- a/src/usr/targeting/test/testtargeting.H
+++ b/src/usr/targeting/test/testtargeting.H
@@ -236,7 +236,7 @@ class TargetingTestSuite : public CxxTest::TestSuite
ErrlUserDetailsTarget(l_pTarget1).addToLog(l_err);
ErrlUserDetailsTarget(l_pTarget2).addToLog(l_err);
- errlCommit(l_err, TARG_COMP_ID);
+ errlCommit(l_err, CXXTEST_COMP_ID);
TS_TRACE(EXIT_MRK "testErrlTargetFFDC");
}
OpenPOWER on IntegriCloud