diff options
author | Nick Bofferding <bofferdn@us.ibm.com> | 2011-10-27 13:24:47 -0500 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2011-11-15 16:57:35 -0600 |
commit | 22b8b1dc178665eb32f923e47211f549b4d1913f (patch) | |
tree | 8d3dd9cff7df3767012c856ff8739ef0cadc6434 /src/usr | |
parent | 1595ed5f5602346579dba1f8714d3092f50e928f (diff) | |
download | talos-hostboot-22b8b1dc178665eb32f923e47211f549b4d1913f.tar.gz talos-hostboot-22b8b1dc178665eb32f923e47211f549b4d1913f.zip |
Add Centaurs to target/attribute model
- Create/update Centaur chips, MBS, MBA units
- Add unit testcase to query the Centaurs
- Update the Venice, VBU target instances
- Increase max endpoint pairs to 10
- Other general model updates for compatibility, consistency
- Register FSISCOM and SCOM operations with DD framework for Centaur chips
Change-Id: If43bc57888e66b7d2ea53704ca703328eec844f9
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/465
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/fsiscom/fsiscom.C | 4 | ||||
-rw-r--r-- | src/usr/scom/scom.C | 5 | ||||
-rw-r--r-- | src/usr/targeting/entitypath.C | 4 | ||||
-rw-r--r-- | src/usr/targeting/predicates/predicatectm.C | 10 | ||||
-rw-r--r-- | src/usr/targeting/test/targetingtest.H | 46 | ||||
-rw-r--r-- | src/usr/targeting/xmltohb/attribute_types.xml | 3 | ||||
-rw-r--r-- | src/usr/targeting/xmltohb/simics_VENICE.system.xml | 6202 | ||||
-rw-r--r-- | src/usr/targeting/xmltohb/target_types.xml | 310 | ||||
-rw-r--r-- | src/usr/targeting/xmltohb/vbu.system.xml | 292 | ||||
-rwxr-xr-x | src/usr/targeting/xmltohb/xmltohb.pl | 2 |
10 files changed, 6400 insertions, 478 deletions
diff --git a/src/usr/fsiscom/fsiscom.C b/src/usr/fsiscom/fsiscom.C index 2788614ed..a09e52835 100644 --- a/src/usr/fsiscom/fsiscom.C +++ b/src/usr/fsiscom/fsiscom.C @@ -343,5 +343,9 @@ DEVICE_REGISTER_ROUTE(DeviceFW::WILDCARD, TARGETING::TYPE_PROC, fsiScomPerformOp); +DEVICE_REGISTER_ROUTE(DeviceFW::WILDCARD, + DeviceFW::FSISCOM, + TARGETING::TYPE_MEMBUF, + fsiScomPerformOp); } // end namespace diff --git a/src/usr/scom/scom.C b/src/usr/scom/scom.C index 895724d4d..ed5ffb306 100644 --- a/src/usr/scom/scom.C +++ b/src/usr/scom/scom.C @@ -50,6 +50,11 @@ DEVICE_REGISTER_ROUTE(DeviceFW::WILDCARD, TARGETING::TYPE_PROC, scomPerformOp); +DEVICE_REGISTER_ROUTE(DeviceFW::WILDCARD, + DeviceFW::SCOM, + TARGETING::TYPE_MEMBUF, + scomPerformOp); + /////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// errlHndl_t scomPerformOp(DeviceFW::OperationType i_opType, diff --git a/src/usr/targeting/entitypath.C b/src/usr/targeting/entitypath.C index a49c16231..c61ad87c3 100644 --- a/src/usr/targeting/entitypath.C +++ b/src/usr/targeting/entitypath.C @@ -352,6 +352,10 @@ const char* EntityPath::pathElementTypeAsString( return "L3"; case TYPE_PERVASIVE: return "Pervasive"; + case TYPE_MEMBUF: + return "Membuf"; + case TYPE_DMI: + return "DMI"; case TYPE_POWERBUS: return "Powerbus"; case TYPE_SCM: diff --git a/src/usr/targeting/predicates/predicatectm.C b/src/usr/targeting/predicates/predicatectm.C index cb3275c19..20bf469d5 100644 --- a/src/usr/targeting/predicates/predicatectm.C +++ b/src/usr/targeting/predicates/predicatectm.C @@ -60,6 +60,16 @@ namespace TARGETING #define TARG_CLASS "PredicateCTM::" //****************************************************************************** +// PredicateCTM::~PredicateCTM() +//****************************************************************************** + +PredicateCTM::~PredicateCTM() +{ + #define TARG_FUNC "~PredicateCTM()" + #undef TARG_FUNC +} + +//****************************************************************************** // PredicateCTM::operator() //****************************************************************************** diff --git a/src/usr/targeting/test/targetingtest.H b/src/usr/targeting/test/targetingtest.H index e86ca08c1..a2a25ab34 100644 --- a/src/usr/targeting/test/targetingtest.H +++ b/src/usr/targeting/test/targetingtest.H @@ -1290,6 +1290,52 @@ class TargetingTestSuite: public CxxTest::TestSuite TS_TRACE(EXIT_MRK "testPodNumericalTypes" ); } + + void testCentaurs() + { + TS_TRACE(ENTER_MRK "testCentaurs" ); + + using namespace TARGETING; + + PredicateCTM l_procChip(CLASS_CHIP,TYPE_PROC,MODEL_VENICE); + TargetRangeFilter l_filter( + targetService().begin(), + targetService().end(), + &l_procChip); + + PredicateCTM l_mbs(CLASS_UNIT,TYPE_MBS); + uint32_t l_count = 0; + uint32_t l_procs = 0; + + // For each processor + for(;l_filter;++l_filter) + { + l_procs++; + + TargetHandleList l_list; + (void) targetService().getAssociated( + l_list, + *l_filter, + TARGETING::TargetService::CHILD_BY_AFFINITY, + TARGETING::TargetService::ALL, + &l_mbs); + l_count += l_list.size(); + } + + if(l_procs) + { + if(l_count <= 0) + { + TS_FAIL("Did not find any Centaur chips connected to processors"); + } + else + { + TS_TRACE("Found %d Centaur chips connected to processors",l_count); + } + } + + TS_TRACE(EXIT_MRK "testCentaurs" ); + } }; #endif // End __TESTTARGETING_H diff --git a/src/usr/targeting/xmltohb/attribute_types.xml b/src/usr/targeting/xmltohb/attribute_types.xml index 212c69b30..8c0f7dbf8 100644 --- a/src/usr/targeting/xmltohb/attribute_types.xml +++ b/src/usr/targeting/xmltohb/attribute_types.xml @@ -143,6 +143,9 @@ <name>PCI</name> </enumerator> <enumerator> + <name>DMI</name> + </enumerator> + <enumerator> <name>LAST_IN_RANGE</name> </enumerator> <default>NA</default> diff --git a/src/usr/targeting/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/xmltohb/simics_VENICE.system.xml index e724905e7..c62f6745f 100644 --- a/src/usr/targeting/xmltohb/simics_VENICE.system.xml +++ b/src/usr/targeting/xmltohb/simics_VENICE.system.xml @@ -31,6 +31,8 @@ * 1 Centaur hanging beneath each Venice ================================================================= --> +<!-- System --> + <targetInstance> <id>sys0</id> <type>sys-sys-power8</type> @@ -44,6 +46,8 @@ </attribute> </targetInstance> +<!-- System node 0 --> + <targetInstance> <id>sys0node0</id> <type>enc-node-power8</type> @@ -57,12 +61,11 @@ </attribute> </targetInstance> +<!-- Venice n0p0 processor chip --> - -<!-- Venice n0p0 : start --> <targetInstance> <id>sys0node0proc0</id> - <type>chip-processor-salerno</type> + <type>chip-processor-venice</type> <attribute><id>SCOM_SWITCHES</id> <default> <field><id>useFsiScom</id><value>0</value></field> @@ -88,9 +91,11 @@ </attribute> </targetInstance> +<!-- Venice n0p0 EX units --> + <targetInstance> <id>sys0node0proc0ex0</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-0</default> @@ -103,7 +108,7 @@ <targetInstance> <id>sys0node0proc0ex1</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-1</default> @@ -116,7 +121,7 @@ <targetInstance> <id>sys0node0proc0ex2</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-2</default> @@ -129,7 +134,7 @@ <targetInstance> <id>sys0node0proc0ex3</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-3</default> @@ -142,7 +147,7 @@ <targetInstance> <id>sys0node0proc0ex4</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-4</default> @@ -155,7 +160,7 @@ <targetInstance> <id>sys0node0proc0ex5</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-5</default> @@ -166,9 +171,11 @@ </attribute> </targetInstance> +<!-- Venice n0p0 core units --> + <targetInstance> <id>sys0node0proc0ex0core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-0/core-0</default> @@ -181,7 +188,7 @@ <targetInstance> <id>sys0node0proc0ex1core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-1/core-0</default> @@ -194,7 +201,7 @@ <targetInstance> <id>sys0node0proc0ex2core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-2/core-0</default> @@ -207,7 +214,7 @@ <targetInstance> <id>sys0node0proc0ex3core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-3/core-0</default> @@ -220,7 +227,7 @@ <targetInstance> <id>sys0node0proc0ex4core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-4/core-0</default> @@ -233,7 +240,7 @@ <targetInstance> <id>sys0node0proc0ex5core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-5/core-0</default> @@ -244,9 +251,11 @@ </attribute> </targetInstance> +<!-- Venice n0p0 MCS units --> + <targetInstance> <id>sys0node0proc0mcs0</id> - <type>unit-mcs-salerno</type> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/mcs-0</default> @@ -258,60 +267,101 @@ </targetInstance> <targetInstance> - <id>sys0node0proc0mcs0mba0</id> - <type>unit-mba-salerno</type> + <id>sys0node0proc0mcs1</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/mcs-0/mba-0</default> + <default>physical:sys-0/node-0/proc-0/mcs-1</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-0/mba-0</default> + <default>affinity:sys-0/node-0/proc-0/mcs-1</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc0mcs0mba1</id> - <type>unit-mba-salerno</type> + <id>sys0node0proc0mcs2</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/mcs-0/mba-1</default> + <default>physical:sys-0/node-0/proc-0/mcs-2</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-0/mba-1</default> + <default>affinity:sys-0/node-0/proc-0/mcs-2</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc0mcs0mba0port0</id> - <type>unit-memport-salerno</type> + <id>sys0node0proc0mcs3</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/mcs-0/mba-0/mem_port-0</default> + <default>physical:sys-0/node-0/proc-0/mcs-3</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-0/mba-0/mem_port-0</default> + <default>affinity:sys-0/node-0/proc-0/mcs-3</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc0mcs0mba1port0</id> - <type>unit-memport-salerno</type> + <id>sys0node0proc0mcs4</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/mcs-0/mba-1/mem_port-0</default> + <default>physical:sys-0/node-0/proc-0/mcs-4</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-0/mba-1/mem_port-0</default> + <default>affinity:sys-0/node-0/proc-0/mcs-4</default> </attribute> </targetInstance> <targetInstance> + <id>sys0node0proc0mcs5</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-0/mcs-5</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-5</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc0mcs6</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-0/mcs-6</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-6</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc0mcs7</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-0/mcs-7</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-7</default> + </attribute> +</targetInstance> + +<!-- Venice n0p0 pervasive unit --> + +<targetInstance> <id>sys0node0proc0pervasive0</id> - <type>unit-pervasive-salerno</type> + <type>unit-pervasive-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/pervasive-0</default> @@ -322,9 +372,11 @@ </attribute> </targetInstance> +<!-- Venice n0p0 powerbus unit --> + <targetInstance> <id>sys0node0proc0powerbus0</id> - <type>unit-powerbus-salerno</type> + <type>unit-powerbus-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/powerbus-0</default> @@ -335,9 +387,11 @@ </attribute> </targetInstance> +<!-- Venice n0p0 PCI units --> + <targetInstance> <id>sys0node0proc0pci0</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/pci-0</default> @@ -350,7 +404,7 @@ <targetInstance> <id>sys0node0proc0pci1</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/pci-1</default> @@ -363,7 +417,7 @@ <targetInstance> <id>sys0node0proc0pci2</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/pci-2</default> @@ -373,14 +427,12 @@ <default>affinity:sys-0/node-0/proc-0/pci-2</default> </attribute> </targetInstance> -<!-- Venice n0p0 : finish --> - +<!-- Venice n0p1 processor chip --> -<!-- Venice n0p1 : start --> <targetInstance> <id>sys0node0proc1</id> - <type>chip-processor-salerno</type> + <type>chip-processor-venice</type> <attribute><id>SCOM_SWITCHES</id> <default> <field><id>useFsiScom</id><value>1</value></field> @@ -427,9 +479,11 @@ </attribute> </targetInstance> +<!-- Venice n0p1 EX units --> + <targetInstance> <id>sys0node0proc1ex0</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-1/ex-0</default> @@ -442,7 +496,7 @@ <targetInstance> <id>sys0node0proc1ex1</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-1/ex-1</default> @@ -455,7 +509,7 @@ <targetInstance> <id>sys0node0proc1ex2</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-1/ex-2</default> @@ -468,7 +522,7 @@ <targetInstance> <id>sys0node0proc1ex3</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-1/ex-3</default> @@ -481,7 +535,7 @@ <targetInstance> <id>sys0node0proc1ex4</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-1/ex-4</default> @@ -494,7 +548,7 @@ <targetInstance> <id>sys0node0proc1ex5</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-1/ex-5</default> @@ -505,9 +559,11 @@ </attribute> </targetInstance> +<!-- Venice n0p1 core units --> + <targetInstance> <id>sys0node0proc1ex0core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-1/ex-0/core-0</default> @@ -520,7 +576,7 @@ <targetInstance> <id>sys0node0proc1ex1core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-1/ex-1/core-0</default> @@ -533,7 +589,7 @@ <targetInstance> <id>sys0node0proc1ex2core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-1/ex-2/core-0</default> @@ -546,7 +602,7 @@ <targetInstance> <id>sys0node0proc1ex3core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-1/ex-3/core-0</default> @@ -559,7 +615,7 @@ <targetInstance> <id>sys0node0proc1ex4core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-1/ex-4/core-0</default> @@ -572,7 +628,7 @@ <targetInstance> <id>sys0node0proc1ex5core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-1/ex-5/core-0</default> @@ -583,9 +639,11 @@ </attribute> </targetInstance> +<!-- Venice n0p1 MCS units --> + <targetInstance> <id>sys0node0proc1mcs0</id> - <type>unit-mcs-salerno</type> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-1/mcs-0</default> @@ -597,60 +655,101 @@ </targetInstance> <targetInstance> - <id>sys0node0proc1mcs0mba0</id> - <type>unit-mba-salerno</type> + <id>sys0node0proc1mcs1</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-1/mcs-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-1</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc1mcs2</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-1/mcs-0/mba-0</default> + <default>physical:sys-0/node-0/proc-1/mcs-2</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-1/mcs-0/mba-0</default> + <default>affinity:sys-0/node-0/proc-1/mcs-2</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc1mcs0mba1</id> - <type>unit-mba-salerno</type> + <id>sys0node0proc1mcs3</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-1/mcs-0/mba-1</default> + <default>physical:sys-0/node-0/proc-1/mcs-3</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-1/mcs-0/mba-1</default> + <default>affinity:sys-0/node-0/proc-1/mcs-3</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc1mcs0mba0port0</id> - <type>unit-memport-salerno</type> + <id>sys0node0proc1mcs4</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-1/mcs-0/mba-0/mem_port-0</default> + <default>physical:sys-0/node-0/proc-1/mcs-4</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-1/mcs-0/mba-0/mem_port-0</default> + <default>affinity:sys-0/node-0/proc-1/mcs-4</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc1mcs0mba1port0</id> - <type>unit-memport-salerno</type> + <id>sys0node0proc1mcs5</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-1/mcs-0/mba-1/mem_port-0</default> + <default>physical:sys-0/node-0/proc-1/mcs-5</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-1/mcs-0/mba-1/mem_port-0</default> + <default>affinity:sys-0/node-0/proc-1/mcs-5</default> </attribute> </targetInstance> <targetInstance> + <id>sys0node0proc1mcs6</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-1/mcs-6</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-6</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc1mcs7</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-1/mcs-7</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-7</default> + </attribute> +</targetInstance> + +<!-- Venice n0p1 pervasive unit --> + +<targetInstance> <id>sys0node0proc1pervasive0</id> - <type>unit-pervasive-salerno</type> + <type>unit-pervasive-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-1/pervasive-0</default> @@ -661,9 +760,11 @@ </attribute> </targetInstance> +<!-- Venice n0p1 powerbus unit --> + <targetInstance> <id>sys0node0proc1powerbus0</id> - <type>unit-powerbus-salerno</type> + <type>unit-powerbus-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-1/powerbus-0</default> @@ -674,9 +775,11 @@ </attribute> </targetInstance> +<!-- Venice n0p1 PCI units --> + <targetInstance> <id>sys0node0proc1pci0</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-1/pci-0</default> @@ -689,7 +792,7 @@ <targetInstance> <id>sys0node0proc1pci1</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-1/pci-1</default> @@ -702,7 +805,7 @@ <targetInstance> <id>sys0node0proc1pci2</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-1/pci-2</default> @@ -712,14 +815,12 @@ <default>affinity:sys-0/node-0/proc-1/pci-2</default> </attribute> </targetInstance> -<!-- Venice n0p1 : finish --> - +<!-- Venice n0p2 processor chip --> -<!-- Venice n0p2 : start --> <targetInstance> <id>sys0node0proc2</id> - <type>chip-processor-salerno</type> + <type>chip-processor-venice</type> <attribute><id>SCOM_SWITCHES</id> <default> <field><id>useFsiScom</id><value>1</value></field> @@ -766,9 +867,11 @@ </attribute> </targetInstance> +<!-- Venice n0p2 EX units --> + <targetInstance> <id>sys0node0proc2ex0</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-2/ex-0</default> @@ -781,7 +884,7 @@ <targetInstance> <id>sys0node0proc2ex1</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-2/ex-1</default> @@ -794,7 +897,7 @@ <targetInstance> <id>sys0node0proc2ex2</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-2/ex-2</default> @@ -807,7 +910,7 @@ <targetInstance> <id>sys0node0proc2ex3</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-2/ex-3</default> @@ -820,7 +923,7 @@ <targetInstance> <id>sys0node0proc2ex4</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-2/ex-4</default> @@ -833,7 +936,7 @@ <targetInstance> <id>sys0node0proc2ex5</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-2/ex-5</default> @@ -844,9 +947,11 @@ </attribute> </targetInstance> +<!-- Venice n0p2 core units --> + <targetInstance> <id>sys0node0proc2ex0core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-2/ex-0/core-0</default> @@ -859,7 +964,7 @@ <targetInstance> <id>sys0node0proc2ex1core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-2/ex-1/core-0</default> @@ -872,7 +977,7 @@ <targetInstance> <id>sys0node0proc2ex2core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-2/ex-2/core-0</default> @@ -885,7 +990,7 @@ <targetInstance> <id>sys0node0proc2ex3core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-2/ex-3/core-0</default> @@ -898,7 +1003,7 @@ <targetInstance> <id>sys0node0proc2ex4core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-2/ex-4/core-0</default> @@ -911,7 +1016,7 @@ <targetInstance> <id>sys0node0proc2ex5core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-2/ex-5/core-0</default> @@ -922,9 +1027,11 @@ </attribute> </targetInstance> +<!-- Venice n0p2 MCS units --> + <targetInstance> <id>sys0node0proc2mcs0</id> - <type>unit-mcs-salerno</type> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-2/mcs-0</default> @@ -936,60 +1043,101 @@ </targetInstance> <targetInstance> - <id>sys0node0proc2mcs0mba0</id> - <type>unit-mba-salerno</type> + <id>sys0node0proc2mcs1</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-2/mcs-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-1</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc2mcs2</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-2/mcs-2</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-2</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc2mcs3</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-2/mcs-3</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-3</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc2mcs4</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-2/mcs-0/mba-0</default> + <default>physical:sys-0/node-0/proc-2/mcs-4</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-0/mba-0</default> + <default>affinity:sys-0/node-0/proc-2/mcs-4</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc2mcs0mba1</id> - <type>unit-mba-salerno</type> + <id>sys0node0proc2mcs5</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-2/mcs-0/mba-1</default> + <default>physical:sys-0/node-0/proc-2/mcs-5</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-0/mba-1</default> + <default>affinity:sys-0/node-0/proc-2/mcs-5</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc2mcs0mba0port0</id> - <type>unit-memport-salerno</type> + <id>sys0node0proc2mcs6</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-2/mcs-0/mba-0/mem_port-0</default> + <default>physical:sys-0/node-0/proc-2/mcs-6</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-0/mba-0/mem_port-0</default> + <default>affinity:sys-0/node-0/proc-2/mcs-6</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc2mcs0mba1port0</id> - <type>unit-memport-salerno</type> + <id>sys0node0proc2mcs7</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-2/mcs-0/mba-1/mem_port-0</default> + <default>physical:sys-0/node-0/proc-2/mcs-7</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-0/mba-1/mem_port-0</default> + <default>affinity:sys-0/node-0/proc-2/mcs-7</default> </attribute> </targetInstance> +<!-- Venice n0p2 pervasive unit --> + <targetInstance> <id>sys0node0proc2pervasive0</id> - <type>unit-pervasive-salerno</type> + <type>unit-pervasive-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-2/pervasive-0</default> @@ -1000,9 +1148,11 @@ </attribute> </targetInstance> +<!-- Venice n0p2 powerbus unit --> + <targetInstance> <id>sys0node0proc2powerbus0</id> - <type>unit-powerbus-salerno</type> + <type>unit-powerbus-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-2/powerbus-0</default> @@ -1013,9 +1163,11 @@ </attribute> </targetInstance> +<!-- Venice n0p2 PCI units --> + <targetInstance> <id>sys0node0proc2pci0</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-2/pci-0</default> @@ -1028,7 +1180,7 @@ <targetInstance> <id>sys0node0proc2pci1</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-2/pci-1</default> @@ -1041,7 +1193,7 @@ <targetInstance> <id>sys0node0proc2pci2</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-2/pci-2</default> @@ -1051,14 +1203,12 @@ <default>affinity:sys-0/node-0/proc-2/pci-2</default> </attribute> </targetInstance> -<!-- Venice n0p2 : finish --> - +<!-- Venice n0p3 processor chip --> -<!-- Venice n0p3 : start --> <targetInstance> <id>sys0node0proc3</id> - <type>chip-processor-salerno</type> + <type>chip-processor-venice</type> <attribute><id>SCOM_SWITCHES</id> <default> <field><id>useFsiScom</id><value>1</value></field> @@ -1105,9 +1255,11 @@ </attribute> </targetInstance> +<!-- Venice n0p3 EX units --> + <targetInstance> <id>sys0node0proc3ex0</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-3/ex-0</default> @@ -1120,7 +1272,7 @@ <targetInstance> <id>sys0node0proc3ex1</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-3/ex-1</default> @@ -1133,7 +1285,7 @@ <targetInstance> <id>sys0node0proc3ex2</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-3/ex-2</default> @@ -1146,7 +1298,7 @@ <targetInstance> <id>sys0node0proc3ex3</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-3/ex-3</default> @@ -1159,7 +1311,7 @@ <targetInstance> <id>sys0node0proc3ex4</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-3/ex-4</default> @@ -1172,7 +1324,7 @@ <targetInstance> <id>sys0node0proc3ex5</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-3/ex-5</default> @@ -1183,9 +1335,11 @@ </attribute> </targetInstance> +<!-- Venice n0p3 core units --> + <targetInstance> <id>sys0node0proc3ex0core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-3/ex-0/core-0</default> @@ -1198,7 +1352,7 @@ <targetInstance> <id>sys0node0proc3ex1core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-3/ex-1/core-0</default> @@ -1211,7 +1365,7 @@ <targetInstance> <id>sys0node0proc3ex2core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-3/ex-2/core-0</default> @@ -1224,7 +1378,7 @@ <targetInstance> <id>sys0node0proc3ex3core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-3/ex-3/core-0</default> @@ -1237,7 +1391,7 @@ <targetInstance> <id>sys0node0proc3ex4core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-3/ex-4/core-0</default> @@ -1250,7 +1404,7 @@ <targetInstance> <id>sys0node0proc3ex5core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-3/ex-5/core-0</default> @@ -1261,9 +1415,11 @@ </attribute> </targetInstance> +<!-- Venice n0p3 MCS units --> + <targetInstance> <id>sys0node0proc3mcs0</id> - <type>unit-mcs-salerno</type> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-3/mcs-0</default> @@ -1275,60 +1431,101 @@ </targetInstance> <targetInstance> - <id>sys0node0proc3mcs0mba0</id> - <type>unit-mba-salerno</type> + <id>sys0node0proc3mcs1</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-3/mcs-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-1</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc3mcs2</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-3/mcs-2</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-2</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc3mcs3</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-3/mcs-3</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-3</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc3mcs4</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-3/mcs-0/mba-0</default> + <default>physical:sys-0/node-0/proc-3/mcs-4</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-3/mcs-0/mba-0</default> + <default>affinity:sys-0/node-0/proc-3/mcs-4</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc3mcs0mba1</id> - <type>unit-mba-salerno</type> + <id>sys0node0proc3mcs5</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-3/mcs-0/mba-1</default> + <default>physical:sys-0/node-0/proc-3/mcs-5</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-3/mcs-0/mba-1</default> + <default>affinity:sys-0/node-0/proc-3/mcs-5</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc3mcs0mba0port0</id> - <type>unit-memport-salerno</type> + <id>sys0node0proc3mcs6</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-3/mcs-0/mba-0/mem_port-0</default> + <default>physical:sys-0/node-0/proc-3/mcs-6</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-3/mcs-0/mba-0/mem_port-0</default> + <default>affinity:sys-0/node-0/proc-3/mcs-6</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc3mcs0mba1port0</id> - <type>unit-memport-salerno</type> + <id>sys0node0proc3mcs7</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-3/mcs-0/mba-1/mem_port-0</default> + <default>physical:sys-0/node-0/proc-3/mcs-7</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-3/mcs-0/mba-1/mem_port-0</default> + <default>affinity:sys-0/node-0/proc-3/mcs-7</default> </attribute> </targetInstance> +<!-- Venice n0p3 pervasive unit --> + <targetInstance> <id>sys0node0proc3pervasive0</id> - <type>unit-pervasive-salerno</type> + <type>unit-pervasive-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-3/pervasive-0</default> @@ -1339,9 +1536,11 @@ </attribute> </targetInstance> +<!-- Venice n0p3 powerbus unit --> + <targetInstance> <id>sys0node0proc3powerbus0</id> - <type>unit-powerbus-salerno</type> + <type>unit-powerbus-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-3/powerbus-0</default> @@ -1352,9 +1551,11 @@ </attribute> </targetInstance> +<!-- Venice n0p3 PCI units --> + <targetInstance> <id>sys0node0proc3pci0</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-3/pci-0</default> @@ -1367,7 +1568,7 @@ <targetInstance> <id>sys0node0proc3pci1</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-3/pci-1</default> @@ -1380,7 +1581,7 @@ <targetInstance> <id>sys0node0proc3pci2</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-3/pci-2</default> @@ -1390,14 +1591,12 @@ <default>affinity:sys-0/node-0/proc-3/pci-2</default> </attribute> </targetInstance> -<!-- Venice n0p3 : finish --> +<!-- Venice n0p4 processor chip --> - -<!-- Venice n0p4 : start --> <targetInstance> <id>sys0node0proc4</id> - <type>chip-processor-salerno</type> + <type>chip-processor-venice</type> <attribute><id>SCOM_SWITCHES</id> <default> <field><id>useFsiScom</id><value>1</value></field> @@ -1444,9 +1643,11 @@ </attribute> </targetInstance> +<!-- Venice n0p4 EX units --> + <targetInstance> <id>sys0node0proc4ex0</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-4/ex-0</default> @@ -1459,7 +1660,7 @@ <targetInstance> <id>sys0node0proc4ex1</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-4/ex-1</default> @@ -1472,7 +1673,7 @@ <targetInstance> <id>sys0node0proc4ex2</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-4/ex-2</default> @@ -1485,7 +1686,7 @@ <targetInstance> <id>sys0node0proc4ex3</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-4/ex-3</default> @@ -1498,7 +1699,7 @@ <targetInstance> <id>sys0node0proc4ex4</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-4/ex-4</default> @@ -1511,7 +1712,7 @@ <targetInstance> <id>sys0node0proc4ex5</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-4/ex-5</default> @@ -1522,9 +1723,11 @@ </attribute> </targetInstance> +<!-- Venice n0p4 core units --> + <targetInstance> <id>sys0node0proc4ex0core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-4/ex-0/core-0</default> @@ -1537,7 +1740,7 @@ <targetInstance> <id>sys0node0proc4ex1core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-4/ex-1/core-0</default> @@ -1550,7 +1753,7 @@ <targetInstance> <id>sys0node0proc4ex2core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-4/ex-2/core-0</default> @@ -1563,7 +1766,7 @@ <targetInstance> <id>sys0node0proc4ex3core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-4/ex-3/core-0</default> @@ -1576,7 +1779,7 @@ <targetInstance> <id>sys0node0proc4ex4core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-4/ex-4/core-0</default> @@ -1589,7 +1792,7 @@ <targetInstance> <id>sys0node0proc4ex5core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-4/ex-5/core-0</default> @@ -1600,9 +1803,11 @@ </attribute> </targetInstance> +<!-- Venice n0p4 MCS units --> + <targetInstance> <id>sys0node0proc4mcs0</id> - <type>unit-mcs-salerno</type> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-4/mcs-0</default> @@ -1614,60 +1819,101 @@ </targetInstance> <targetInstance> - <id>sys0node0proc4mcs0mba0</id> - <type>unit-mba-salerno</type> + <id>sys0node0proc4mcs1</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-4/mcs-0/mba-0</default> + <default>physical:sys-0/node-0/proc-4/mcs-1</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-4/mcs-0/mba-0</default> + <default>affinity:sys-0/node-0/proc-4/mcs-1</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc4mcs0mba1</id> - <type>unit-mba-salerno</type> + <id>sys0node0proc4mcs2</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-4/mcs-0/mba-1</default> + <default>physical:sys-0/node-0/proc-4/mcs-2</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-4/mcs-0/mba-1</default> + <default>affinity:sys-0/node-0/proc-4/mcs-2</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc4mcs0mba0port0</id> - <type>unit-memport-salerno</type> + <id>sys0node0proc4mcs3</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-4/mcs-0/mba-0/mem_port-0</default> + <default>physical:sys-0/node-0/proc-4/mcs-3</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-4/mcs-0/mba-0/mem_port-0</default> + <default>affinity:sys-0/node-0/proc-4/mcs-3</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc4mcs0mba1port0</id> - <type>unit-memport-salerno</type> + <id>sys0node0proc4mcs4</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-4/mcs-0/mba-1/mem_port-0</default> + <default>physical:sys-0/node-0/proc-4/mcs-4</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-4/mcs-0/mba-1/mem_port-0</default> + <default>affinity:sys-0/node-0/proc-4/mcs-4</default> </attribute> </targetInstance> <targetInstance> + <id>sys0node0proc4mcs5</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-4/mcs-5</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-5</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc4mcs6</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-4/mcs-6</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-6</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc4mcs7</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-4/mcs-7</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-7</default> + </attribute> +</targetInstance> + +<!-- Vencie n0p4 pervasive unit --> + +<targetInstance> <id>sys0node0proc4pervasive0</id> - <type>unit-pervasive-salerno</type> + <type>unit-pervasive-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-4/pervasive-0</default> @@ -1678,9 +1924,11 @@ </attribute> </targetInstance> +<!-- Vencie n0p4 powerbus unit --> + <targetInstance> <id>sys0node0proc4powerbus0</id> - <type>unit-powerbus-salerno</type> + <type>unit-powerbus-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-4/powerbus-0</default> @@ -1691,9 +1939,11 @@ </attribute> </targetInstance> +<!-- Vencie n0p4 PCI units --> + <targetInstance> <id>sys0node0proc4pci0</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-4/pci-0</default> @@ -1706,7 +1956,7 @@ <targetInstance> <id>sys0node0proc4pci1</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-4/pci-1</default> @@ -1719,7 +1969,7 @@ <targetInstance> <id>sys0node0proc4pci2</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-4/pci-2</default> @@ -1729,14 +1979,12 @@ <default>affinity:sys-0/node-0/proc-4/pci-2</default> </attribute> </targetInstance> -<!-- Venice n0p4 : finish --> +<!-- Venice n0p5 processor chip --> - -<!-- Venice n0p5 : start --> <targetInstance> <id>sys0node0proc5</id> - <type>chip-processor-salerno</type> + <type>chip-processor-venice</type> <attribute><id>SCOM_SWITCHES</id> <default> <field><id>useFsiScom</id><value>1</value></field> @@ -1783,9 +2031,11 @@ </attribute> </targetInstance> +<!-- Venice n0p5 EX units --> + <targetInstance> <id>sys0node0proc5ex0</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-5/ex-0</default> @@ -1798,7 +2048,7 @@ <targetInstance> <id>sys0node0proc5ex1</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-5/ex-1</default> @@ -1811,7 +2061,7 @@ <targetInstance> <id>sys0node0proc5ex2</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-5/ex-2</default> @@ -1824,7 +2074,7 @@ <targetInstance> <id>sys0node0proc5ex3</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-5/ex-3</default> @@ -1837,7 +2087,7 @@ <targetInstance> <id>sys0node0proc5ex4</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-5/ex-4</default> @@ -1850,7 +2100,7 @@ <targetInstance> <id>sys0node0proc5ex5</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-5/ex-5</default> @@ -1861,9 +2111,11 @@ </attribute> </targetInstance> +<!-- Venice n0p5 core units --> + <targetInstance> <id>sys0node0proc5ex0core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-5/ex-0/core-0</default> @@ -1876,7 +2128,7 @@ <targetInstance> <id>sys0node0proc5ex1core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-5/ex-1/core-0</default> @@ -1889,7 +2141,7 @@ <targetInstance> <id>sys0node0proc5ex2core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-5/ex-2/core-0</default> @@ -1902,7 +2154,7 @@ <targetInstance> <id>sys0node0proc5ex3core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-5/ex-3/core-0</default> @@ -1915,7 +2167,7 @@ <targetInstance> <id>sys0node0proc5ex4core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-5/ex-4/core-0</default> @@ -1928,7 +2180,7 @@ <targetInstance> <id>sys0node0proc5ex5core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-5/ex-5/core-0</default> @@ -1939,9 +2191,11 @@ </attribute> </targetInstance> +<!-- Venice n0p5 MCS units --> + <targetInstance> <id>sys0node0proc5mcs0</id> - <type>unit-mcs-salerno</type> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-5/mcs-0</default> @@ -1953,60 +2207,101 @@ </targetInstance> <targetInstance> - <id>sys0node0proc5mcs0mba0</id> - <type>unit-mba-salerno</type> + <id>sys0node0proc5mcs1</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-5/mcs-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-1</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc5mcs2</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-5/mcs-2</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-2</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc5mcs3</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-5/mcs-0/mba-0</default> + <default>physical:sys-0/node-0/proc-5/mcs-3</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-5/mcs-0/mba-0</default> + <default>affinity:sys-0/node-0/proc-5/mcs-3</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc5mcs0mba1</id> - <type>unit-mba-salerno</type> + <id>sys0node0proc5mcs4</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-5/mcs-0/mba-1</default> + <default>physical:sys-0/node-0/proc-5/mcs-4</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-5/mcs-0/mba-1</default> + <default>affinity:sys-0/node-0/proc-5/mcs-4</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc5mcs0mba0port0</id> - <type>unit-memport-salerno</type> + <id>sys0node0proc5mcs5</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-5/mcs-0/mba-0/mem_port-0</default> + <default>physical:sys-0/node-0/proc-5/mcs-5</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-5/mcs-0/mba-0/mem_port-0</default> + <default>affinity:sys-0/node-0/proc-5/mcs-5</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc5mcs0mba1port0</id> - <type>unit-memport-salerno</type> + <id>sys0node0proc5mcs6</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-5/mcs-0/mba-1/mem_port-0</default> + <default>physical:sys-0/node-0/proc-5/mcs-6</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-5/mcs-0/mba-1/mem_port-0</default> + <default>affinity:sys-0/node-0/proc-5/mcs-6</default> </attribute> </targetInstance> <targetInstance> + <id>sys0node0proc5mcs7</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-5/mcs-7</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-7</default> + </attribute> +</targetInstance> + +<!-- Venice n0p5 pervasive unit --> + +<targetInstance> <id>sys0node0proc5pervasive0</id> - <type>unit-pervasive-salerno</type> + <type>unit-pervasive-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-5/pervasive-0</default> @@ -2017,9 +2312,11 @@ </attribute> </targetInstance> +<!-- Venice n0p5 powerbus unit --> + <targetInstance> <id>sys0node0proc5powerbus0</id> - <type>unit-powerbus-salerno</type> + <type>unit-powerbus-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-5/powerbus-0</default> @@ -2030,9 +2327,11 @@ </attribute> </targetInstance> +<!-- Venice n0p5 PCI units --> + <targetInstance> <id>sys0node0proc5pci0</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-5/pci-0</default> @@ -2045,7 +2344,7 @@ <targetInstance> <id>sys0node0proc5pci1</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-5/pci-1</default> @@ -2058,7 +2357,7 @@ <targetInstance> <id>sys0node0proc5pci2</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-5/pci-2</default> @@ -2068,14 +2367,12 @@ <default>affinity:sys-0/node-0/proc-5/pci-2</default> </attribute> </targetInstance> -<!-- Venice n0p5 : finish --> +<!-- Venice n0p6 processor chip --> - -<!-- Venice n0p6 : start --> <targetInstance> <id>sys0node0proc6</id> - <type>chip-processor-salerno</type> + <type>chip-processor-venice</type> <attribute><id>SCOM_SWITCHES</id> <default> <field><id>useFsiScom</id><value>1</value></field> @@ -2122,9 +2419,11 @@ </attribute> </targetInstance> +<!-- Venice n0p6 EX units --> + <targetInstance> <id>sys0node0proc6ex0</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-6/ex-0</default> @@ -2137,7 +2436,7 @@ <targetInstance> <id>sys0node0proc6ex1</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-6/ex-1</default> @@ -2150,7 +2449,7 @@ <targetInstance> <id>sys0node0proc6ex2</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-6/ex-2</default> @@ -2163,7 +2462,7 @@ <targetInstance> <id>sys0node0proc6ex3</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-6/ex-3</default> @@ -2176,7 +2475,7 @@ <targetInstance> <id>sys0node0proc6ex4</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-6/ex-4</default> @@ -2189,7 +2488,7 @@ <targetInstance> <id>sys0node0proc6ex5</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-6/ex-5</default> @@ -2200,9 +2499,11 @@ </attribute> </targetInstance> +<!-- Venice n0p6 core units --> + <targetInstance> <id>sys0node0proc6ex0core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-6/ex-0/core-0</default> @@ -2215,7 +2516,7 @@ <targetInstance> <id>sys0node0proc6ex1core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-6/ex-1/core-0</default> @@ -2228,7 +2529,7 @@ <targetInstance> <id>sys0node0proc6ex2core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-6/ex-2/core-0</default> @@ -2241,7 +2542,7 @@ <targetInstance> <id>sys0node0proc6ex3core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-6/ex-3/core-0</default> @@ -2254,7 +2555,7 @@ <targetInstance> <id>sys0node0proc6ex4core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-6/ex-4/core-0</default> @@ -2267,7 +2568,7 @@ <targetInstance> <id>sys0node0proc6ex5core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-6/ex-5/core-0</default> @@ -2278,9 +2579,11 @@ </attribute> </targetInstance> +<!-- Venice n0p6 MCS units --> + <targetInstance> <id>sys0node0proc6mcs0</id> - <type>unit-mcs-salerno</type> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-6/mcs-0</default> @@ -2292,60 +2595,101 @@ </targetInstance> <targetInstance> - <id>sys0node0proc6mcs0mba0</id> - <type>unit-mba-salerno</type> + <id>sys0node0proc6mcs1</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-6/mcs-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-1</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc6mcs2</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-6/mcs-2</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-2</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc6mcs3</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-6/mcs-3</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-3</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc6mcs4</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-6/mcs-0/mba-0</default> + <default>physical:sys-0/node-0/proc-6/mcs-4</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-6/mcs-0/mba-0</default> + <default>affinity:sys-0/node-0/proc-6/mcs-4</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc6mcs0mba1</id> - <type>unit-mba-salerno</type> + <id>sys0node0proc6mcs5</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-6/mcs-0/mba-1</default> + <default>physical:sys-0/node-0/proc-6/mcs-5</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-6/mcs-0/mba-1</default> + <default>affinity:sys-0/node-0/proc-6/mcs-5</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc6mcs0mba0port0</id> - <type>unit-memport-salerno</type> + <id>sys0node0proc6mcs6</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-6/mcs-0/mba-0/mem_port-0</default> + <default>physical:sys-0/node-0/proc-6/mcs-6</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-6/mcs-0/mba-0/mem_port-0</default> + <default>affinity:sys-0/node-0/proc-6/mcs-6</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc6mcs0mba1port0</id> - <type>unit-memport-salerno</type> + <id>sys0node0proc6mcs7</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-6/mcs-0/mba-1/mem_port-0</default> + <default>physical:sys-0/node-0/proc-6/mcs-7</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-6/mcs-0/mba-1/mem_port-0</default> + <default>affinity:sys-0/node-0/proc-6/mcs-7</default> </attribute> </targetInstance> +<!-- Venice n0p6 pervasive unit --> + <targetInstance> <id>sys0node0proc6pervasive0</id> - <type>unit-pervasive-salerno</type> + <type>unit-pervasive-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-6/pervasive-0</default> @@ -2356,9 +2700,11 @@ </attribute> </targetInstance> +<!-- Venice n0p6 powerbus unit --> + <targetInstance> <id>sys0node0proc6powerbus0</id> - <type>unit-powerbus-salerno</type> + <type>unit-powerbus-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-6/powerbus-0</default> @@ -2369,9 +2715,11 @@ </attribute> </targetInstance> +<!-- Venice n0p6 PCI units --> + <targetInstance> <id>sys0node0proc6pci0</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-6/pci-0</default> @@ -2384,7 +2732,7 @@ <targetInstance> <id>sys0node0proc6pci1</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-6/pci-1</default> @@ -2397,7 +2745,7 @@ <targetInstance> <id>sys0node0proc6pci2</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-6/pci-2</default> @@ -2407,14 +2755,12 @@ <default>affinity:sys-0/node-0/proc-6/pci-2</default> </attribute> </targetInstance> -<!-- Venice n0p6 : finish --> +<!-- Venice n0p7 processor chip --> - -<!-- Venice n0p7 : start --> <targetInstance> <id>sys0node0proc7</id> - <type>chip-processor-salerno</type> + <type>chip-processor-venice</type> <attribute><id>SCOM_SWITCHES</id> <default> <field><id>useFsiScom</id><value>1</value></field> @@ -2461,9 +2807,11 @@ </attribute> </targetInstance> +<!-- Venice n0p7 EX units --> + <targetInstance> <id>sys0node0proc7ex0</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-7/ex-0</default> @@ -2476,7 +2824,7 @@ <targetInstance> <id>sys0node0proc7ex1</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-7/ex-1</default> @@ -2489,7 +2837,7 @@ <targetInstance> <id>sys0node0proc7ex2</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-7/ex-2</default> @@ -2502,7 +2850,7 @@ <targetInstance> <id>sys0node0proc7ex3</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-7/ex-3</default> @@ -2515,7 +2863,7 @@ <targetInstance> <id>sys0node0proc7ex4</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-7/ex-4</default> @@ -2528,7 +2876,7 @@ <targetInstance> <id>sys0node0proc7ex5</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-7/ex-5</default> @@ -2539,9 +2887,11 @@ </attribute> </targetInstance> +<!-- Venice n0p7 core units --> + <targetInstance> <id>sys0node0proc7ex0core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-7/ex-0/core-0</default> @@ -2554,7 +2904,7 @@ <targetInstance> <id>sys0node0proc7ex1core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-7/ex-1/core-0</default> @@ -2567,7 +2917,7 @@ <targetInstance> <id>sys0node0proc7ex2core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-7/ex-2/core-0</default> @@ -2580,7 +2930,7 @@ <targetInstance> <id>sys0node0proc7ex3core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-7/ex-3/core-0</default> @@ -2593,7 +2943,7 @@ <targetInstance> <id>sys0node0proc7ex4core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-7/ex-4/core-0</default> @@ -2606,7 +2956,7 @@ <targetInstance> <id>sys0node0proc7ex5core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-7/ex-5/core-0</default> @@ -2617,9 +2967,11 @@ </attribute> </targetInstance> +<!-- Venice n0p7 MCS units --> + <targetInstance> <id>sys0node0proc7mcs0</id> - <type>unit-mcs-salerno</type> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-7/mcs-0</default> @@ -2631,60 +2983,101 @@ </targetInstance> <targetInstance> - <id>sys0node0proc7mcs0mba0</id> - <type>unit-mba-salerno</type> + <id>sys0node0proc7mcs1</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-7/mcs-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-1</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc7mcs2</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-7/mcs-0/mba-0</default> + <default>physical:sys-0/node-0/proc-7/mcs-2</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-7/mcs-0/mba-0</default> + <default>affinity:sys-0/node-0/proc-7/mcs-2</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc7mcs0mba1</id> - <type>unit-mba-salerno</type> + <id>sys0node0proc7mcs3</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-7/mcs-0/mba-1</default> + <default>physical:sys-0/node-0/proc-7/mcs-3</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-7/mcs-0/mba-1</default> + <default>affinity:sys-0/node-0/proc-7/mcs-3</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc7mcs0mba0port0</id> - <type>unit-memport-salerno</type> + <id>sys0node0proc7mcs4</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-7/mcs-0/mba-0/mem_port-0</default> + <default>physical:sys-0/node-0/proc-7/mcs-4</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-7/mcs-0/mba-0/mem_port-0</default> + <default>affinity:sys-0/node-0/proc-7/mcs-4</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc7mcs0mba1port0</id> - <type>unit-memport-salerno</type> + <id>sys0node0proc7mcs5</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-7/mcs-0/mba-1/mem_port-0</default> + <default>physical:sys-0/node-0/proc-7/mcs-5</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-7/mcs-0/mba-1/mem_port-0</default> + <default>affinity:sys-0/node-0/proc-7/mcs-5</default> </attribute> </targetInstance> <targetInstance> + <id>sys0node0proc7mcs6</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-7/mcs-6</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-6</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc7mcs7</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-7/mcs-7</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-7</default> + </attribute> +</targetInstance> + +<!-- Venice n0p7 pervasive unit --> + +<targetInstance> <id>sys0node0proc7pervasive0</id> - <type>unit-pervasive-salerno</type> + <type>unit-pervasive-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-7/pervasive-0</default> @@ -2695,9 +3088,11 @@ </attribute> </targetInstance> +<!-- Venice n0p7 powerbus unit --> + <targetInstance> <id>sys0node0proc7powerbus0</id> - <type>unit-powerbus-salerno</type> + <type>unit-powerbus-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-7/powerbus-0</default> @@ -2708,9 +3103,11 @@ </attribute> </targetInstance> +<!-- Venice n0p7 PCI unit --> + <targetInstance> <id>sys0node0proc7pci0</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-7/pci-0</default> @@ -2723,7 +3120,7 @@ <targetInstance> <id>sys0node0proc7pci1</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-7/pci-1</default> @@ -2736,7 +3133,7 @@ <targetInstance> <id>sys0node0proc7pci2</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-7/pci-2</default> @@ -2746,30 +3143,19 @@ <default>affinity:sys-0/node-0/proc-7/pci-2</default> </attribute> </targetInstance> -<!-- Venice n0p7 : finish --> - - <!-- Centaur n0p0 : start --> -<!-- @todo This is not complete, but useful for testing FSI --> + <targetInstance> <id>sys0node0membuf0</id> - <type>chip-processor-salerno</type><!-- @todo wrong type --> - <attribute><id>SCOM_SWITCHES</id> - <default> - <field><id>useFsiScom</id><value>1</value></field> - <field><id>useXscom</id><value>0</value></field> - <field><id>useInbandScom</id><value>0</value></field> - <field><id>reserved</id><value>0</value></field> - </default> - </attribute> + <type>chip-membuf-centaur</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/membuf-0</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/membuf-0</default> + <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0</default> </attribute> <!-- FSI is connected via proc0:cMFSI-0 --> @@ -2794,30 +3180,654 @@ <default>0</default> </attribute> </targetInstance> -<!-- Centaur n0p0 : finish --> + +<!-- Centaur MBS affiliated with membuf0 --> + +<targetInstance> + <id>sys0node0membuf0mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-0/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf0 --> + +<targetInstance> + <id>sys0node0membuf0mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-0/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf0mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-0/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p0 : end --> + + + +<!-- Centaur n0p1 : start --> + +<targetInstance> + <id>sys0node0membuf1</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc0:cMFSI-1 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-0</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>CMFSI</default> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>1</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf1 --> + +<targetInstance> + <id>sys0node0membuf1mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-1/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf1 --> + +<targetInstance> + <id>sys0node0membuf1mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-1/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf1mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-1/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p1 : end --> + + + +<!-- Centaur n0p2 : start --> + +<targetInstance> + <id>sys0node0membuf2</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-2</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-2/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc0:cMFSI-2 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-0</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>CMFSI</default> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>2</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf2 --> + +<targetInstance> + <id>sys0node0membuf2mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-2/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-2/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf2 --> + +<targetInstance> + <id>sys0node0membuf2mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-2/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-2/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf2mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-2/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-2/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p2 : end --> + + + +<!-- Centaur n0p3 : start --> + +<targetInstance> + <id>sys0node0membuf3</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-3</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-3/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc0:cMFSI-3 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-0</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>CMFSI</default> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>3</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf3 --> + +<targetInstance> + <id>sys0node0membuf3mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-3/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-3/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf3 --> + +<targetInstance> + <id>sys0node0membuf3mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-3/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-3/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf3mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-3/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-3/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p3 : end --> + + + +<!-- Centaur n0p4 : start --> + +<targetInstance> + <id>sys0node0membuf4</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-4</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc0:cMFSI-4 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-0</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>CMFSI</default> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>4</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf4 --> + +<targetInstance> + <id>sys0node0membuf4mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-4/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf4 --> + +<targetInstance> + <id>sys0node0membuf4mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-4/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf4mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-4/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p4 : end --> + + + +<!-- Centaur n0p5 : start --> + +<targetInstance> + <id>sys0node0membuf5</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-5</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc0:cMFSI-5 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-0</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>CMFSI</default> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>5</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf5 --> + +<targetInstance> + <id>sys0node0membuf5mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-5/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf5 --> + +<targetInstance> + <id>sys0node0membuf5mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-5/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf5mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-5/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p5 : end --> + + + +<!-- Centaur n0p6 : start --> + +<targetInstance> + <id>sys0node0membuf6</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-6</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc0:cMFSI-6 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-0</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>CMFSI</default> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>6</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf6 --> + +<targetInstance> + <id>sys0node0membuf6mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-6/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf6 --> + +<targetInstance> + <id>sys0node0membuf6mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-6/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf6mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-6/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p6 : end --> + + + +<!-- Centaur n0p7 : start --> + +<targetInstance> + <id>sys0node0membuf7</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-7</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc0:cMFSI-7 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-0</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>CMFSI</default> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>7</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf7 --> + +<targetInstance> + <id>sys0node0membuf7mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-7/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf7 --> + +<targetInstance> + <id>sys0node0membuf7mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-7/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf7mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-7/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p7 : end --> <!-- Centaur n0p8 : start --> -<!-- @todo This is not complete, but useful for testing FSI --> + <targetInstance> <id>sys0node0membuf8</id> - <type>chip-processor-salerno</type><!-- @todo wrong type --> - <attribute><id>SCOM_SWITCHES</id> - <default> - <field><id>useFsiScom</id><value>1</value></field> - <field><id>useXscom</id><value>0</value></field> - <field><id>useInbandScom</id><value>0</value></field> - <field><id>reserved</id><value>0</value></field> - </default> - </attribute> + <type>chip-membuf-centaur</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/membuf-8</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/membuf-8</default> + <default>affinity:sys-0/node-0/proc-1/mcs-0/membuf-0</default> </attribute> <!-- FSI is connected via proc1:cMFSI-0 --> @@ -2842,31 +3852,654 @@ <default>0</default> </attribute> </targetInstance> -<!-- Centaur n0p8 : finish --> +<!-- Centaur MBS affiliated with membuf8 --> + +<targetInstance> + <id>sys0node0membuf8mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-8/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-0/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf8 --> + +<targetInstance> + <id>sys0node0membuf8mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-8/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-0/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf8mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-8/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-0/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p8 : end --> + + + +<!-- Centaur n0p9 : start --> + +<targetInstance> + <id>sys0node0membuf9</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-9</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-1/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc1:cMFSI-1 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-1</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>1</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf9 --> + +<targetInstance> + <id>sys0node0membuf9mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-9/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-1/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf9 --> + +<targetInstance> + <id>sys0node0membuf9mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-9/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-1/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf9mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-9/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-1/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p9 : end --> + + + +<!-- Centaur n0p10 : start --> + +<targetInstance> + <id>sys0node0membuf10</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-10</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-2/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc1:cMFSI-2 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-1</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>2</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf10 --> + +<targetInstance> + <id>sys0node0membuf10mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-10/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-2/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf10 --> + +<targetInstance> + <id>sys0node0membuf10mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-10/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-2/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf10mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-10/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-2/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p10 : end --> + + + +<!-- Centaur n0p11 : start --> + +<targetInstance> + <id>sys0node0membuf11</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-11</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-3/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc1:cMFSI-3 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-1</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>3</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf11 --> + +<targetInstance> + <id>sys0node0membuf11mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-11/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-3/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf11 --> + +<targetInstance> + <id>sys0node0membuf11mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-11/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-3/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf11mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-11/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-3/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p11 : end --> + + + +<!-- Centaur n0p12 : start --> + +<targetInstance> + <id>sys0node0membuf12</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-12</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc1:cMFSI-4 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-1</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>4</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf12 --> + +<targetInstance> + <id>sys0node0membuf12mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-12/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf12 --> + +<targetInstance> + <id>sys0node0membuf12mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-12/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf12mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-12/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p12 : end --> + + + +<!-- Centaur n0p13 : start --> + +<targetInstance> + <id>sys0node0membuf13</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-13</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc1:cMFSI-5 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-1</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>5</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf13 --> + +<targetInstance> + <id>sys0node0membuf13mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-13/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf13 --> + +<targetInstance> + <id>sys0node0membuf13mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-13/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf13mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-13/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p13 : end --> + + + +<!-- Centaur n0p14 : start --> + +<targetInstance> + <id>sys0node0membuf14</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-14</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc1:cMFSI-6 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-1</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>6</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf14 --> + +<targetInstance> + <id>sys0node0membuf14mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-14/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf14 --> + +<targetInstance> + <id>sys0node0membuf14mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-14/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf14mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-14/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p14 : end --> + + + +<!-- Centaur n0p15 : start --> + +<targetInstance> + <id>sys0node0membuf15</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-15</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc1:cMFSI-7 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-1</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>7</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf15 --> + +<targetInstance> + <id>sys0node0membuf15mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-15/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf15 --> + +<targetInstance> + <id>sys0node0membuf15mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-15/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf15mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-15/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p15 : end --> <!-- Centaur n0p16 : start --> -<!-- @todo This is not complete, but useful for testing FSI --> + <targetInstance> <id>sys0node0membuf16</id> - <type>chip-processor-salerno</type><!-- @todo wrong type --> - <attribute><id>SCOM_SWITCHES</id> - <default> - <field><id>useFsiScom</id><value>1</value></field> - <field><id>useXscom</id><value>0</value></field> - <field><id>useInbandScom</id><value>0</value></field> - <field><id>reserved</id><value>0</value></field> - </default> - </attribute> + <type>chip-membuf-centaur</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/membuf-16</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/membuf-16</default> + <default>affinity:sys-0/node-0/proc-2/mcs-0/membuf-0</default> </attribute> <!-- FSI is connected via proc2:cMFSI-0 --> @@ -2876,12 +4509,600 @@ </attribute> <attribute> <id>FSI_MASTER_TYPE</id> - <default>NO_MASTER</default><!-- @fixme Simics is busted, should be CMFSI --> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf16 --> + +<targetInstance> + <id>sys0node0membuf16mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-16/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-0/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf16 --> + +<targetInstance> + <id>sys0node0membuf16mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-16/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-0/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf16mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-16/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-0/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p16 : end --> + + + +<!-- Centaur n0p17 : start --> + +<targetInstance> + <id>sys0node0membuf17</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-17</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-1/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc2:cMFSI-1 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-2</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>1</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf17 --> + +<targetInstance> + <id>sys0node0membuf17mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-17/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-1/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf17 --> + +<targetInstance> + <id>sys0node0membuf17mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-17/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-1/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf17mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-17/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-1/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p17 : end --> + + + +<!-- Centaur n0p18 : start --> + +<targetInstance> + <id>sys0node0membuf18</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-18</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-2/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc2:cMFSI-2 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-2</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>2</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf18 --> + +<targetInstance> + <id>sys0node0membuf18mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-18/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-2/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf18 --> + +<targetInstance> + <id>sys0node0membuf18mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-18/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-2/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf18mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-18/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-2/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p18 : end --> + + + +<!-- Centaur n0p19 : start --> + +<targetInstance> + <id>sys0node0membuf19</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-19</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-3/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc2:cMFSI-3 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-2</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>3</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf19 --> + +<targetInstance> + <id>sys0node0membuf19mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-19/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-3/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf19 --> + +<targetInstance> + <id>sys0node0membuf19mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-19/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-3/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf19mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-19/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-3/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p19 : end --> + + + +<!-- Centaur n0p20 : start --> + +<targetInstance> + <id>sys0node0membuf20</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-20</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc2:cMFSI-4 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-2</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>4</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf20 --> + +<targetInstance> + <id>sys0node0membuf20mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-20/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf20 --> + +<targetInstance> + <id>sys0node0membuf20mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-20/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf20mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-20/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p20 : end --> + + + +<!-- Centaur n0p21 : start --> + +<targetInstance> + <id>sys0node0membuf21</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-21</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc2:cMFSI-5 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-2</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> </attribute> <attribute> <id>FSI_MASTER_PORT</id> + <default>5</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> <default>0</default> </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf21 --> + +<targetInstance> + <id>sys0node0membuf21mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-21/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf21 --> + +<targetInstance> + <id>sys0node0membuf21mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-21/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf21mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-21/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p21 : end --> + + + +<!-- Centaur n0p22 : start --> + +<targetInstance> + <id>sys0node0membuf22</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-22</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc2:cMFSI-6 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-2</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>6</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf22 --> + +<targetInstance> + <id>sys0node0membuf22mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-22/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf22 --> + +<targetInstance> + <id>sys0node0membuf22mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-22/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf22mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-22/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p22 : end --> + + + +<!-- Centaur n0p23 : start --> + +<targetInstance> + <id>sys0node0membuf23</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-23</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc2:cMFSI-7 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-2</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>7</default> + </attribute> <attribute> <id>FSI_SLAVE_CASCADE</id> <default>0</default> @@ -2891,30 +5112,66 @@ <default>0</default> </attribute> </targetInstance> -<!-- Centaur n0p16 : finish --> + +<!-- Centaur MBS affiliated with membuf23 --> + +<targetInstance> + <id>sys0node0membuf23mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-23/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf23 --> + +<targetInstance> + <id>sys0node0membuf23mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-23/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf23mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-23/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p23 : end --> <!-- Centaur n0p24 : start --> -<!-- @todo This is not complete, but useful for testing FSI --> + <targetInstance> <id>sys0node0membuf24</id> - <type>chip-processor-salerno</type><!-- @todo wrong type --> - <attribute><id>SCOM_SWITCHES</id> - <default> - <field><id>useFsiScom</id><value>1</value></field> - <field><id>useXscom</id><value>0</value></field> - <field><id>useInbandScom</id><value>0</value></field> - <field><id>reserved</id><value>0</value></field> - </default> - </attribute> + <type>chip-membuf-centaur</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/membuf-24</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/membuf-24</default> + <default>affinity:sys-0/node-0/proc-3/mcs-0/membuf-0</default> </attribute> <!-- FSI is connected via proc3:cMFSI-0 --> @@ -2924,12 +5181,600 @@ </attribute> <attribute> <id>FSI_MASTER_TYPE</id> - <default>NO_MASTER</default><!-- @fixme Simics is busted, should be CMFSI --> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf24 --> + +<targetInstance> + <id>sys0node0membuf24mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-24/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-0/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf24 --> + +<targetInstance> + <id>sys0node0membuf24mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-24/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-0/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf24mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-24/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-0/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p24 : end --> + + + +<!-- Centaur n0p25 : start --> + +<targetInstance> + <id>sys0node0membuf25</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-25</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-1/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc3:cMFSI-1 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-3</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>1</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf25 --> + +<targetInstance> + <id>sys0node0membuf25mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-25/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-1/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf25 --> + +<targetInstance> + <id>sys0node0membuf25mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-25/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-1/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf25mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-25/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-1/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p25 : end --> + + + +<!-- Centaur n0p26 : start --> + +<targetInstance> + <id>sys0node0membuf26</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-26</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-2/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc3:cMFSI-2 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-3</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>2</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf26 --> + +<targetInstance> + <id>sys0node0membuf26mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-26/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-2/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf26 --> + +<targetInstance> + <id>sys0node0membuf26mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-26/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-2/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf26mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-26/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-2/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p26 : end --> + + + +<!-- Centaur n0p27 : start --> + +<targetInstance> + <id>sys0node0membuf27</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-27</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-3/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc3:cMFSI-3 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-3</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>3</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf27 --> + +<targetInstance> + <id>sys0node0membuf27mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-27/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-3/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf27 --> + +<targetInstance> + <id>sys0node0membuf27mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-27/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-3/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf27mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-27/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-3/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p27 : end --> + + + +<!-- Centaur n0p28 : start --> + +<targetInstance> + <id>sys0node0membuf28</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-28</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc3:cMFSI-4 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-3</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>4</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf28 --> + +<targetInstance> + <id>sys0node0membuf28mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-28/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf28 --> + +<targetInstance> + <id>sys0node0membuf28mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-28/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf28mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-28/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p28 : end --> + + + +<!-- Centaur n0p29 : start --> + +<targetInstance> + <id>sys0node0membuf29</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-29</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc3:cMFSI-5 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-3</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>5</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf29 --> + +<targetInstance> + <id>sys0node0membuf29mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-29/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf29 --> + +<targetInstance> + <id>sys0node0membuf29mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-29/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf29mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-29/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p29 : end --> + + + +<!-- Centaur n0p30 : start --> + +<targetInstance> + <id>sys0node0membuf30</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-30</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc3:cMFSI-6 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-3</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> </attribute> <attribute> <id>FSI_MASTER_PORT</id> + <default>6</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> <default>0</default> </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf30 --> + +<targetInstance> + <id>sys0node0membuf30mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-30/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf30 --> + +<targetInstance> + <id>sys0node0membuf30mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-30/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf30mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-30/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p30 : end --> + + + +<!-- Centaur n0p31 : start --> + +<targetInstance> + <id>sys0node0membuf31</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-31</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc3:cMFSI-7 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-3</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>7</default> + </attribute> <attribute> <id>FSI_SLAVE_CASCADE</id> <default>0</default> @@ -2939,30 +5784,66 @@ <default>0</default> </attribute> </targetInstance> -<!-- Centaur n0p24 : finish --> + +<!-- Centaur MBS affiliated with membuf31 --> + +<targetInstance> + <id>sys0node0membuf31mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-31/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf31 --> + +<targetInstance> + <id>sys0node0membuf31mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-31/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf31mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-31/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p31 : end --> <!-- Centaur n0p32 : start --> -<!-- @todo This is not complete, but useful for testing FSI --> + <targetInstance> <id>sys0node0membuf32</id> - <type>chip-processor-salerno</type><!-- @todo wrong type --> - <attribute><id>SCOM_SWITCHES</id> - <default> - <field><id>useFsiScom</id><value>1</value></field> - <field><id>useXscom</id><value>0</value></field> - <field><id>useInbandScom</id><value>0</value></field> - <field><id>reserved</id><value>0</value></field> - </default> - </attribute> + <type>chip-membuf-centaur</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/membuf-32</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/membuf-32</default> + <default>affinity:sys-0/node-0/proc-4/mcs-0/membuf-0</default> </attribute> <!-- FSI is connected via proc4:cMFSI-0 --> @@ -2972,13 +5853,601 @@ </attribute> <attribute> <id>FSI_MASTER_TYPE</id> - <default>NO_MASTER</default><!-- @fixme Simics is busted, should be CMFSI --> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf32 --> + +<targetInstance> + <id>sys0node0membuf32mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-32/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-0/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf32 --> + +<targetInstance> + <id>sys0node0membuf32mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-32/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-0/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf32mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-32/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-0/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p32 : end --> + + + +<!-- Centaur n0p33 : start --> + +<targetInstance> + <id>sys0node0membuf33</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-33</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-1/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc4:cMFSI-1 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-4</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>1</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf33 --> + +<targetInstance> + <id>sys0node0membuf33mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-33/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-1/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf33 --> + +<targetInstance> + <id>sys0node0membuf33mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-33/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-1/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf33mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-33/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-1/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p33 : end --> + + + +<!-- Centaur n0p34 : start --> + +<targetInstance> + <id>sys0node0membuf34</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-34</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-2/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc4:cMFSI-2 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-4</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>2</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf34 --> + +<targetInstance> + <id>sys0node0membuf34mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-34/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-2/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf34 --> + +<targetInstance> + <id>sys0node0membuf34mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-34/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-2/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf34mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-34/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-2/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p34 : end --> + + + +<!-- Centaur n0p35 : start --> + +<targetInstance> + <id>sys0node0membuf35</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-35</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-3/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc4:cMFSI-3 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-4</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>3</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf35 --> + +<targetInstance> + <id>sys0node0membuf35mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-35/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-3/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf35 --> + +<targetInstance> + <id>sys0node0membuf35mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-35/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-3/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf35mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-35/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-3/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p35 : end --> + + + +<!-- Centaur n0p36 : start --> + +<targetInstance> + <id>sys0node0membuf36</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-36</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-4/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc4:cMFSI-4 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-4</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>4</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf36 --> + +<targetInstance> + <id>sys0node0membuf36mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-36/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-4/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf36 --> + +<targetInstance> + <id>sys0node0membuf36mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-36/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-4/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf36mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-36/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-4/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p36 : end --> + + + +<!-- Centaur n0p37 : start --> + +<targetInstance> + <id>sys0node0membuf37</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-37</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-5/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc4:cMFSI-5 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-4</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>5</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf37 --> + +<targetInstance> + <id>sys0node0membuf37mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-37/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-5/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf37 --> + +<targetInstance> + <id>sys0node0membuf37mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-37/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-5/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf37mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-37/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-5/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p37 : end --> + + + +<!-- Centaur n0p38 : start --> + +<targetInstance> + <id>sys0node0membuf38</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-38</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-6/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc4:cMFSI-6 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-4</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> </attribute> <attribute> <id>FSI_MASTER_PORT</id> + <default>6</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> <default>0</default> </attribute> <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf38 --> + +<targetInstance> + <id>sys0node0membuf38mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-38/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-6/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf38 --> + +<targetInstance> + <id>sys0node0membuf38mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-38/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-6/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf38mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-38/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-6/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p38 : end --> + + + +<!-- Centaur n0p39 : start --> + +<targetInstance> + <id>sys0node0membuf39</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-39</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-7/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc4:cMFSI-7 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-4</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>7</default> + </attribute> + <attribute> <id>FSI_SLAVE_CASCADE</id> <default>0</default> </attribute> @@ -2987,30 +6456,66 @@ <default>0</default> </attribute> </targetInstance> -<!-- Centaur n0p32 : finish --> + +<!-- Centaur MBS affiliated with membuf39 --> + +<targetInstance> + <id>sys0node0membuf39mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-39/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-7/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf39 --> + +<targetInstance> + <id>sys0node0membuf39mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-39/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-7/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf39mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-39/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-4/mcs-7/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p39 : end --> <!-- Centaur n0p40 : start --> -<!-- @todo This is not complete, but useful for testing FSI --> + <targetInstance> <id>sys0node0membuf40</id> - <type>chip-processor-salerno</type><!-- @todo wrong type --> - <attribute><id>SCOM_SWITCHES</id> - <default> - <field><id>useFsiScom</id><value>1</value></field> - <field><id>useXscom</id><value>0</value></field> - <field><id>useInbandScom</id><value>0</value></field> - <field><id>reserved</id><value>0</value></field> - </default> - </attribute> + <type>chip-membuf-centaur</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/membuf-40</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/membuf-40</default> + <default>affinity:sys-0/node-0/proc-5/mcs-0/membuf-0</default> </attribute> <!-- FSI is connected via proc5:cMFSI-0 --> @@ -3020,12 +6525,600 @@ </attribute> <attribute> <id>FSI_MASTER_TYPE</id> - <default>NO_MASTER</default><!-- @fixme Simics is busted, should be CMFSI --> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf40 --> + +<targetInstance> + <id>sys0node0membuf40mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-40/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-0/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf40 --> + +<targetInstance> + <id>sys0node0membuf40mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-40/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-0/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf40mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-40/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-0/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p40 : end --> + + + +<!-- Centaur n0p41 : start --> + +<targetInstance> + <id>sys0node0membuf41</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-41</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-1/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc5:cMFSI-1 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-5</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> </attribute> <attribute> <id>FSI_MASTER_PORT</id> + <default>1</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> <default>0</default> </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf41 --> + +<targetInstance> + <id>sys0node0membuf41mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-41/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-1/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf41 --> + +<targetInstance> + <id>sys0node0membuf41mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-41/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-1/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf41mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-41/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-1/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p41 : end --> + + + +<!-- Centaur n0p42 : start --> + +<targetInstance> + <id>sys0node0membuf42</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-42</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-2/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc5:cMFSI-2 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-5</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>2</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf42 --> + +<targetInstance> + <id>sys0node0membuf42mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-42/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-2/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf42 --> + +<targetInstance> + <id>sys0node0membuf42mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-42/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-2/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf42mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-42/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-2/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p42 : end --> + + + +<!-- Centaur n0p43 : start --> + +<targetInstance> + <id>sys0node0membuf43</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-43</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-3/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc5:cMFSI-3 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-5</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>3</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf43 --> + +<targetInstance> + <id>sys0node0membuf43mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-43/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-3/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf43 --> + +<targetInstance> + <id>sys0node0membuf43mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-43/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-3/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf43mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-43/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-3/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p43 : end --> + + + +<!-- Centaur n0p44 : start --> + +<targetInstance> + <id>sys0node0membuf44</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-44</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-4/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc5:cMFSI-4 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-5</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>4</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf44 --> + +<targetInstance> + <id>sys0node0membuf44mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-44/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-4/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf44 --> + +<targetInstance> + <id>sys0node0membuf44mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-44/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-4/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf44mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-44/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-4/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p44 : end --> + + + +<!-- Centaur n0p45 : start --> + +<targetInstance> + <id>sys0node0membuf45</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-45</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-5/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc5:cMFSI-5 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-5</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>5</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf45 --> + +<targetInstance> + <id>sys0node0membuf45mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-45/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-5/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf45 --> + +<targetInstance> + <id>sys0node0membuf45mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-45/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-5/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf45mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-45/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-5/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p45 : end --> + + + +<!-- Centaur n0p46 : start --> + +<targetInstance> + <id>sys0node0membuf46</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-46</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-6/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc5:cMFSI-6 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-5</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>6</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf46 --> + +<targetInstance> + <id>sys0node0membuf46mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-46/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-6/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf46 --> + +<targetInstance> + <id>sys0node0membuf46mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-46/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-6/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf46mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-46/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-6/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p46 : end --> + + + +<!-- Centaur n0p47 : start --> + +<targetInstance> + <id>sys0node0membuf47</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-47</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-7/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc5:cMFSI-7 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-5</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>7</default> + </attribute> <attribute> <id>FSI_SLAVE_CASCADE</id> <default>0</default> @@ -3035,30 +7128,66 @@ <default>0</default> </attribute> </targetInstance> -<!-- Centaur n0p40 : finish --> + +<!-- Centaur MBS affiliated with membuf47 --> + +<targetInstance> + <id>sys0node0membuf47mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-47/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-7/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf47 --> + +<targetInstance> + <id>sys0node0membuf47mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-47/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-7/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf47mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-47/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-5/mcs-7/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p47 : end --> <!-- Centaur n0p48 : start --> -<!-- @todo This is not complete, but useful for testing FSI --> + <targetInstance> <id>sys0node0membuf48</id> - <type>chip-processor-salerno</type><!-- @todo wrong type --> - <attribute><id>SCOM_SWITCHES</id> - <default> - <field><id>useFsiScom</id><value>1</value></field> - <field><id>useXscom</id><value>0</value></field> - <field><id>useInbandScom</id><value>0</value></field> - <field><id>reserved</id><value>0</value></field> - </default> - </attribute> + <type>chip-membuf-centaur</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/membuf-48</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/membuf-48</default> + <default>affinity:sys-0/node-0/proc-6/mcs-0/membuf-0</default> </attribute> <!-- FSI is connected via proc6:cMFSI-0 --> @@ -3068,13 +7197,601 @@ </attribute> <attribute> <id>FSI_MASTER_TYPE</id> - <default>NO_MASTER</default><!-- @fixme Simics is busted, should be CMFSI --> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf48 --> + +<targetInstance> + <id>sys0node0membuf48mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-48/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-0/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf48 --> + +<targetInstance> + <id>sys0node0membuf48mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-48/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-0/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf48mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-48/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-0/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p48 : end --> + + + +<!-- Centaur n0p49 : start --> + +<targetInstance> + <id>sys0node0membuf49</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-49</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-1/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc6:cMFSI-1 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-6</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> </attribute> <attribute> <id>FSI_MASTER_PORT</id> + <default>1</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> <default>0</default> </attribute> <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf49 --> + +<targetInstance> + <id>sys0node0membuf49mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-49/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-1/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf49 --> + +<targetInstance> + <id>sys0node0membuf49mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-49/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-1/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf49mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-49/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-1/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p49 : end --> + + + +<!-- Centaur n0p50 : start --> + +<targetInstance> + <id>sys0node0membuf50</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-50</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-2/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc6:cMFSI-2 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-6</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>2</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf50 --> + +<targetInstance> + <id>sys0node0membuf50mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-50/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-2/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf50 --> + +<targetInstance> + <id>sys0node0membuf50mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-50/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-2/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf50mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-50/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-2/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p50 : end --> + + + +<!-- Centaur n0p51 : start --> + +<targetInstance> + <id>sys0node0membuf51</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-51</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-3/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc6:cMFSI-3 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-6</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>3</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf51 --> + +<targetInstance> + <id>sys0node0membuf51mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-51/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-3/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf51 --> + +<targetInstance> + <id>sys0node0membuf51mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-51/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-3/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf51mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-51/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-3/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p51 : end --> + + + +<!-- Centaur n0p52 : start --> + +<targetInstance> + <id>sys0node0membuf52</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-52</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-4/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc6:cMFSI-4 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-6</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>4</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf52 --> + +<targetInstance> + <id>sys0node0membuf52mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-52/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-4/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf52 --> + +<targetInstance> + <id>sys0node0membuf52mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-52/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-4/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf52mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-52/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-4/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p52 : end --> + + + +<!-- Centaur n0p53 : start --> + +<targetInstance> + <id>sys0node0membuf53</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-53</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-5/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc6:cMFSI-5 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-6</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>5</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf53 --> + +<targetInstance> + <id>sys0node0membuf53mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-53/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-5/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf53 --> + +<targetInstance> + <id>sys0node0membuf53mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-53/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-5/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf53mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-53/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-5/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p53 : end --> + + + +<!-- Centaur n0p54 : start --> + +<targetInstance> + <id>sys0node0membuf54</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-54</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-6/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc6:cMFSI-6 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-6</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>6</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf54 --> + +<targetInstance> + <id>sys0node0membuf54mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-54/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-6/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf54 --> + +<targetInstance> + <id>sys0node0membuf54mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-54/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-6/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf54mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-54/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-6/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p54 : end --> + + + +<!-- Centaur n0p55 : start --> + +<targetInstance> + <id>sys0node0membuf55</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-55</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-7/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc6:cMFSI-7 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-6</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>7</default> + </attribute> + <attribute> <id>FSI_SLAVE_CASCADE</id> <default>0</default> </attribute> @@ -3083,30 +7800,66 @@ <default>0</default> </attribute> </targetInstance> -<!-- Centaur n0p48 : finish --> + +<!-- Centaur MBS affiliated with membuf55 --> + +<targetInstance> + <id>sys0node0membuf55mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-55/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-7/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf55 --> + +<targetInstance> + <id>sys0node0membuf55mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-55/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-7/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf55mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-55/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-6/mcs-7/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p55 : end --> <!-- Centaur n0p56 : start --> -<!-- @todo This is not complete, but useful for testing FSI --> + <targetInstance> <id>sys0node0membuf56</id> - <type>chip-processor-salerno</type><!-- @todo wrong type --> - <attribute><id>SCOM_SWITCHES</id> - <default> - <field><id>useFsiScom</id><value>1</value></field> - <field><id>useXscom</id><value>0</value></field> - <field><id>useInbandScom</id><value>0</value></field> - <field><id>reserved</id><value>0</value></field> - </default> - </attribute> + <type>chip-membuf-centaur</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/membuf-56</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/membuf-56</default> + <default>affinity:sys-0/node-0/proc-7/mcs-0/membuf-0</default> </attribute> <!-- FSI is connected via proc7:cMFSI-0 --> @@ -3116,12 +7869,264 @@ </attribute> <attribute> <id>FSI_MASTER_TYPE</id> - <default>NO_MASTER</default><!-- @fixme Simics is busted, should be CMFSI --> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf56 --> + +<targetInstance> + <id>sys0node0membuf56mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-56/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-0/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf56 --> + +<targetInstance> + <id>sys0node0membuf56mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-56/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-0/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf56mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-56/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-0/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p56 : end --> + + + +<!-- Centaur n0p57 : start --> + +<targetInstance> + <id>sys0node0membuf57</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-57</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-1/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc7:cMFSI-1 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-7</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>1</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf57 --> + +<targetInstance> + <id>sys0node0membuf57mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-57/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-1/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf57 --> + +<targetInstance> + <id>sys0node0membuf57mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-57/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-1/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf57mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-57/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-1/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p57 : end --> + + + +<!-- Centaur n0p58 : start --> + +<targetInstance> + <id>sys0node0membuf58</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-58</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-2/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc7:cMFSI-2 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-7</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> </attribute> <attribute> <id>FSI_MASTER_PORT</id> + <default>2</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> <default>0</default> </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf58 --> + +<targetInstance> + <id>sys0node0membuf58mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-58/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-2/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf58 --> + +<targetInstance> + <id>sys0node0membuf58mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-58/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-2/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf58mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-58/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-2/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p58 : end --> + + + +<!-- Centaur n0p59 : start --> + +<targetInstance> + <id>sys0node0membuf59</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-59</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-3/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc7:cMFSI-3 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-7</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>3</default> + </attribute> <attribute> <id>FSI_SLAVE_CASCADE</id> <default>0</default> @@ -3131,14 +8136,392 @@ <default>0</default> </attribute> </targetInstance> -<!-- Centaur n0p56 : finish --> +<!-- Centaur MBS affiliated with membuf59 --> + +<targetInstance> + <id>sys0node0membuf59mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-59/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-3/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf59 --> +<targetInstance> + <id>sys0node0membuf59mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-59/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-3/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf59mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-59/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-3/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p59 : end --> + + + +<!-- Centaur n0p60 : start --> + +<targetInstance> + <id>sys0node0membuf60</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-60</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-4/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc7:cMFSI-4 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-7</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>4</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf60 --> + +<targetInstance> + <id>sys0node0membuf60mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-60/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-4/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf60 --> + +<targetInstance> + <id>sys0node0membuf60mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-60/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-4/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf60mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-60/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-4/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p60 : end --> + + + +<!-- Centaur n0p61 : start --> + +<targetInstance> + <id>sys0node0membuf61</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-61</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-5/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc7:cMFSI-5 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-7</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>5</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf61 --> + +<targetInstance> + <id>sys0node0membuf61mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-61/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-5/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf61 --> + +<targetInstance> + <id>sys0node0membuf61mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-61/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-5/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf61mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-61/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-5/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p61 : end --> + + + +<!-- Centaur n0p62 : start --> + +<targetInstance> + <id>sys0node0membuf62</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-62</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-6/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc7:cMFSI-6 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-7</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>6</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf62 --> + +<targetInstance> + <id>sys0node0membuf62mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-62/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-6/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf62 --> + +<targetInstance> + <id>sys0node0membuf62mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-62/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-6/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf62mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-62/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-6/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p62 : end --> + + + +<!-- Centaur n0p63 : start --> + +<targetInstance> + <id>sys0node0membuf63</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-63</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-7/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc7:cMFSI-7 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-7</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI --> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>7</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf63 --> + +<targetInstance> + <id>sys0node0membuf63mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-63/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-7/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf63 --> + +<targetInstance> + <id>sys0node0membuf63mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-63/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-7/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf63mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-63/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-7/mcs-7/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p63 : end --> <!-- @fixme : Temporary target used for FSI wrap-back testing --> <targetInstance> <id>sys0node0proc0wrap</id> - <type>chip-processor-salerno</type> + <type>chip-processor-venice</type> <attribute><id>SCOM_SWITCHES</id> <default> <field><id>useFsiScom</id><value>1</value></field> @@ -3179,5 +8562,4 @@ </attribute> </targetInstance> - </attributes> diff --git a/src/usr/targeting/xmltohb/target_types.xml b/src/usr/targeting/xmltohb/target_types.xml index ea371bd9c..fe44b7970 100644 --- a/src/usr/targeting/xmltohb/target_types.xml +++ b/src/usr/targeting/xmltohb/target_types.xml @@ -134,17 +134,31 @@ </targetType> <targetType> - <id>chip-processor-salerno</id> + <id>chip-processor-power8</id> <parent>chip-processor</parent> <attribute> + <id>XSCOM_CHIP_INFO</id> + </attribute> + <attribute><id>DUMMY_RW</id></attribute> + <attribute><id>DUMMY_HEAP_ZERO_DEFAULT</id></attribute> +</targetType> + +<targetType> + <id>chip-processor-salerno</id> + <parent>chip-processor-power8</parent> + <attribute> <id>MODEL</id> <default>SALERNO</default> </attribute> + </targetType> + +<targetType> + <id>chip-processor-venice</id> + <parent>chip-processor-power8</parent> <attribute> - <id>XSCOM_CHIP_INFO</id> + <id>MODEL</id> + <default>VENICE</default> </attribute> - <attribute><id>DUMMY_RW</id></attribute> - <attribute><id>DUMMY_HEAP_ZERO_DEFAULT</id></attribute> </targetType> <targetType> @@ -170,12 +184,17 @@ </targetType> <targetType> - <id>unit-ex-salerno</id> + <id>unit-ex-power8</id> <parent>unit</parent> <attribute> <id>TYPE</id> <default>EX</default> </attribute> +</targetType> + +<targetType> + <id>unit-ex-salerno</id> + <parent>unit-ex-power8</parent> <attribute> <id>MODEL</id> <default>SALERNO</default> @@ -183,12 +202,26 @@ </targetType> <targetType> - <id>unit-core-salerno</id> + <id>unit-ex-venice</id> + <parent>unit-ex-power8</parent> + <attribute> + <id>MODEL</id> + <default>VENICE</default> + </attribute> +</targetType> + +<targetType> + <id>unit-core-power8</id> <parent>unit</parent> <attribute> <id>TYPE</id> <default>CORE</default> </attribute> +</targetType> + +<targetType> + <id>unit-core-salerno</id> + <parent>unit-core-power8</parent> <attribute> <id>MODEL</id> <default>SALERNO</default> @@ -196,26 +229,26 @@ </targetType> <targetType> - <id>unit-mba-salerno</id> - <parent>unit</parent> - <attribute> - <id>TYPE</id> - <default>MBA</default> - </attribute> + <id>unit-core-venice</id> + <parent>unit-core-power8</parent> <attribute> <id>MODEL</id> - <default>SALERNO</default> + <default>VENICE</default> </attribute> - <attribute><id>MSS_EFF_PRIMARY_RANK</id></attribute> </targetType> <targetType> - <id>unit-pervasive-salerno</id> + <id>unit-pervasive-power8</id> <parent>unit</parent> <attribute> <id>TYPE</id> <default>PERVASIVE</default> </attribute> +</targetType> + +<targetType> + <id>unit-pervasive-salerno</id> + <parent>unit-pervasive-power8</parent> <attribute> <id>MODEL</id> <default>SALERNO</default> @@ -223,12 +256,26 @@ </targetType> <targetType> - <id>unit-pci-salerno</id> + <id>unit-pervasive-venice</id> + <parent>unit-pervasive-power8</parent> + <attribute> + <id>MODEL</id> + <default>VENICE</default> + </attribute> +</targetType> + +<targetType> + <id>unit-pci-power8</id> <parent>unit</parent> <attribute> <id>TYPE</id> <default>PCI</default> </attribute> +</targetType> + +<targetType> + <id>unit-pci-salerno</id> + <parent>unit-pci-power8</parent> <attribute> <id>MODEL</id> <default>SALERNO</default> @@ -236,12 +283,26 @@ </targetType> <targetType> - <id>unit-powerbus-salerno</id> + <id>unit-pci-venice</id> + <parent>unit-pci-power8</parent> + <attribute> + <id>MODEL</id> + <default>VENICE</default> + </attribute> +</targetType> + +<targetType> + <id>unit-powerbus-power8</id> <parent>unit</parent> <attribute> <id>TYPE</id> <default>POWERBUS</default> </attribute> +</targetType> + +<targetType> + <id>unit-powerbus-salerno</id> + <parent>unit-powerbus-power8</parent> <attribute> <id>MODEL</id> <default>SALERNO</default> @@ -249,46 +310,237 @@ </targetType> <targetType> - <id>unit-memport-salerno</id> - <parent>unit</parent> + <id>unit-powerbus-venice</id> + <parent>unit-powerbus-power8</parent> + <attribute> + <id>MODEL</id> + <default>VENICE</default> + </attribute> +</targetType> + +<targetType> + <id>enc-node-power8</id> + <parent>base</parent> + <attribute> + <id>CLASS</id> + <default>ENC</default> + </attribute> <attribute> <id>TYPE</id> - <default>MEM_PORT</default> + <default>NODE</default> </attribute> <attribute> <id>MODEL</id> - <default>SALERNO</default> + <default>POWER8</default> </attribute> </targetType> +<!-- Hybrid targets --> + +<targetType> + <id>unit-memport-power8</id> + <parent>unit</parent> + <attribute> + <id>TYPE</id> + <default>MEM_PORT</default> + </attribute> +</targetType> + <targetType> - <id>unit-mcs-salerno</id> + <id>unit-mbs-power8</id> + <parent>unit</parent> + <attribute> + <id>TYPE</id> + <default>MBS</default> + </attribute> +</targetType> + +<targetType> + <id>unit-mba-power8</id> + <parent>unit</parent> + <attribute> + <id>TYPE</id> + <default>MBA</default> + </attribute> + <attribute><id>MSS_EFF_PRIMARY_RANK</id></attribute> +</targetType> + +<targetType> + <id>unit-mcs-power8</id> <parent>unit</parent> <attribute> <id>TYPE</id> <default>MCS</default> </attribute> +</targetType> + +<targetType> + <id>unit-mcs-venice</id> + <parent>unit-mcs-power8</parent> + <attribute> + <id>MODEL</id> + <default>VENICE</default> + </attribute> +</targetType> + +<targetType> + <id>unit-mcs-salerno</id> + <parent>unit-mcs-power8</parent> + <attribute> + <id>MODEL</id> + <default>SALERNO</default> + </attribute> +</targetType> + +<!-- Processor target types --> + +<targetType> + <id>unit-mba-venice</id> + <parent>unit-mba-power8</parent> + <attribute> + <id>MODEL</id> + <default>VENICE</default> + </attribute> +</targetType> + +<targetType> + <id>unit-mba-salerno</id> + <parent>unit-mba-power8</parent> <attribute> <id>MODEL</id> <default>SALERNO</default> + </attribute> +</targetType> + +<targetType> + <id>unit-mbs-venice</id> + <parent>unit-mbs-power8</parent> + <attribute> + <id>MODEL</id> + <default>VENICE</default> </attribute> </targetType> <targetType> - <id>enc-node-power8</id> - <parent>base</parent> + <id>unit-mbs-salerno</id> + <parent>unit-mbs-power8</parent> <attribute> - <id>CLASS</id> - <default>ENC</default> + <id>MODEL</id> + <default>SALERNO</default> </attribute> +</targetType> + +<targetType> + <id>unit-memport-salerno</id> + <parent>unit-memport-power8</parent> + <attribute> + <id>MODEL</id> + <default>SALERNO</default> + </attribute> +</targetType> + +<targetType> + <id>unit-memport-venice</id> + <parent>unit-memport-power8</parent> + <attribute> + <id>MODEL</id> + <default>VENICE</default> + </attribute> +</targetType> + +<!-- Memory Buffer Target Types --> + +<!-- Centaur chip/DMI --> + +<targetType> + <id>chip-membuf-centaur</id> + <parent>chip</parent> <attribute> <id>TYPE</id> - <default>NODE</default> + <default>MEMBUF</default> </attribute> <attribute> <id>MODEL</id> - <default>POWER8</default> - </attribute> + <default>CENTAUR</default> + </attribute> + <attribute> + <id>PRIMARY_CAPABILITIES</id> + <default> + <field><id>supportsFsiScom</id><value>1</value></field> + <field><id>supportsXscom</id><value>0</value></field> + <field><id>supportsInbandScom</id><value>1</value></field> + <field><id>reserved</id><value>0</value></field> + </default> + </attribute> + <attribute> + <id>SCOM_SWITCHES</id> + <default> + <field><id>useFsiScom</id><value>1</value></field> + <field><id>useXscom</id><value>0</value></field> + <field><id>useInbandScom</id><value>0</value></field> + <field><id>reserved</id><value>0</value></field> + </default> + </attribute> +</targetType> + +<!-- Centaur MBS --> + +<targetType> + <id>unit-mbs-centaur</id> + <parent>unit-mbs-power8</parent> + <attribute> + <id>PRIMARY_CAPABILITIES</id> + <default> + <field><id>supportsFsiScom</id><value>1</value></field> + <field><id>supportsXscom</id><value>0</value></field> + <field><id>supportsInbandScom</id><value>1</value></field> + <field><id>reserved</id><value>0</value></field> + </default> + </attribute> + <attribute> + <id>MODEL</id> + <default>CENTAUR</default> + </attribute> </targetType> +<!-- Centaur MBA --> + +<targetType> + <id>unit-mba-centaur</id> + <parent>unit-mba-power8</parent> + <attribute> + <id>PRIMARY_CAPABILITIES</id> + <default> + <field><id>supportsFsiScom</id><value>1</value></field> + <field><id>supportsXscom</id><value>0</value></field> + <field><id>supportsInbandScom</id><value>1</value></field> + <field><id>reserved</id><value>0</value></field> + </default> + </attribute> + <attribute> + <id>MODEL</id> + <default>CENTAUR</default> + </attribute> +</targetType> + +<!-- Centaur memory port --> + +<targetType> + <id>unit-memport-centaur</id> + <parent>unit-memport-power8</parent> + <attribute> + <id>PRIMARY_CAPABILITIES</id> + <default> + <field><id>supportsFsiScom</id><value>0</value></field> + <field><id>supportsXscom</id><value>0</value></field> + <field><id>supportsInbandScom</id><value>0</value></field> + <field><id>reserved</id><value>0</value></field> + </default> + </attribute> + <attribute> + <id>MODEL</id> + <default>CENTAUR</default> + </attribute> +</targetType> + </attributes> diff --git a/src/usr/targeting/xmltohb/vbu.system.xml b/src/usr/targeting/xmltohb/vbu.system.xml index bc28d4ed0..ed8e7c23d 100644 --- a/src/usr/targeting/xmltohb/vbu.system.xml +++ b/src/usr/targeting/xmltohb/vbu.system.xml @@ -58,12 +58,11 @@ </attribute> </targetInstance> +<!-- Venice n0p0 processor chip --> - -<!-- Salerno n0p0 : start --> <targetInstance> <id>sys0node0proc0</id> - <type>chip-processor-salerno</type> + <type>chip-processor-venice</type> <attribute><id>SCOM_SWITCHES</id> <default> <field><id>useFsiScom</id><value>0</value></field> @@ -89,9 +88,11 @@ </attribute> </targetInstance> +<!-- Venice n0p0 EX units --> + <targetInstance> <id>sys0node0proc0ex0</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-0</default> @@ -104,7 +105,7 @@ <targetInstance> <id>sys0node0proc0ex1</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-1</default> @@ -117,7 +118,7 @@ <targetInstance> <id>sys0node0proc0ex2</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-2</default> @@ -130,7 +131,7 @@ <targetInstance> <id>sys0node0proc0ex3</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-3</default> @@ -143,7 +144,7 @@ <targetInstance> <id>sys0node0proc0ex4</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-4</default> @@ -156,7 +157,7 @@ <targetInstance> <id>sys0node0proc0ex5</id> - <type>unit-ex-salerno</type> + <type>unit-ex-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-5</default> @@ -167,9 +168,11 @@ </attribute> </targetInstance> +<!-- Venice n0p0 core units --> + <targetInstance> <id>sys0node0proc0ex0core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-0/core-0</default> @@ -182,7 +185,7 @@ <targetInstance> <id>sys0node0proc0ex1core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-1/core-0</default> @@ -195,7 +198,7 @@ <targetInstance> <id>sys0node0proc0ex2core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-2/core-0</default> @@ -208,7 +211,7 @@ <targetInstance> <id>sys0node0proc0ex3core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-3/core-0</default> @@ -221,7 +224,7 @@ <targetInstance> <id>sys0node0proc0ex4core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-4/core-0</default> @@ -234,7 +237,7 @@ <targetInstance> <id>sys0node0proc0ex5core0</id> - <type>unit-core-salerno</type> + <type>unit-core-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/ex-5/core-0</default> @@ -245,9 +248,11 @@ </attribute> </targetInstance> +<!-- Venice n0p0 MCS units --> + <targetInstance> <id>sys0node0proc0mcs0</id> - <type>unit-mcs-salerno</type> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/mcs-0</default> @@ -259,60 +264,101 @@ </targetInstance> <targetInstance> - <id>sys0node0proc0mcs0mba0</id> - <type>unit-mba-salerno</type> + <id>sys0node0proc0mcs1</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-0/mcs-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-1</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc0mcs2</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-0/mcs-2</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-2</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc0mcs3</id> + <type>unit-mcs-venice</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-0/mcs-3</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-3</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0proc0mcs4</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/mcs-0/mba-0</default> + <default>physical:sys-0/node-0/proc-0/mcs-4</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-0/mba-0</default> + <default>affinity:sys-0/node-0/proc-0/mcs-4</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc0mcs0mba1</id> - <type>unit-mba-salerno</type> + <id>sys0node0proc0mcs5</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/mcs-0/mba-1</default> + <default>physical:sys-0/node-0/proc-0/mcs-5</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-0/mba-1</default> + <default>affinity:sys-0/node-0/proc-0/mcs-5</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc0mcs0mba0port0</id> - <type>unit-memport-salerno</type> + <id>sys0node0proc0mcs6</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/mcs-0/mba-0/mem_port-0</default> + <default>physical:sys-0/node-0/proc-0/mcs-6</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-0/mba-0/mem_port-0</default> + <default>affinity:sys-0/node-0/proc-0/mcs-6</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc0mcs0mba1port0</id> - <type>unit-memport-salerno</type> + <id>sys0node0proc0mcs7</id> + <type>unit-mcs-venice</type> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/mcs-0/mba-1/mem_port-0</default> + <default>physical:sys-0/node-0/proc-0/mcs-7</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-0/mba-1/mem_port-0</default> + <default>affinity:sys-0/node-0/proc-0/mcs-7</default> </attribute> </targetInstance> +<!-- Venice n0p0 pervasive unit --> + <targetInstance> <id>sys0node0proc0pervasive0</id> - <type>unit-pervasive-salerno</type> + <type>unit-pervasive-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/pervasive-0</default> @@ -323,9 +369,11 @@ </attribute> </targetInstance> +<!-- Venice n0p0 powerbus unit --> + <targetInstance> <id>sys0node0proc0powerbus0</id> - <type>unit-powerbus-salerno</type> + <type>unit-powerbus-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/powerbus-0</default> @@ -336,9 +384,11 @@ </attribute> </targetInstance> +<!-- Venice n0p0 PCI units --> + <targetInstance> <id>sys0node0proc0pci0</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/pci-0</default> @@ -351,7 +401,7 @@ <targetInstance> <id>sys0node0proc0pci1</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/pci-1</default> @@ -364,7 +414,7 @@ <targetInstance> <id>sys0node0proc0pci2</id> - <type>unit-pci-salerno</type> + <type>unit-pci-venice</type> <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/proc-0/pci-2</default> @@ -374,7 +424,173 @@ <default>affinity:sys-0/node-0/proc-0/pci-2</default> </attribute> </targetInstance> -<!-- Salerno n0p0 : finish --> + +<!-- Centaur n0p0 : start --> + +<targetInstance> + <id>sys0node0membuf0</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc0:cMFSI-0 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-0</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>CMFSI</default> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf0 --> + +<targetInstance> + <id>sys0node0membuf0mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-0/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf0 --> + +<targetInstance> + <id>sys0node0membuf0mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-0/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf0mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-0/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p0 : end --> + + + +<!-- Centaur n0p1 : start --> + +<targetInstance> + <id>sys0node0membuf1</id> + <type>chip-membuf-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0</default> + </attribute> + + <!-- FSI is connected via proc0:cMFSI-1 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-0</default> + </attribute> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>CMFSI</default> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>1</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default>0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBS affiliated with membuf1 --> + +<targetInstance> + <id>sys0node0membuf1mbs0</id> + <type>unit-mbs-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-1/mbs-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0</default> + </attribute> +</targetInstance> + +<!-- Centaur MBAs affiliated with membuf1 --> + +<targetInstance> + <id>sys0node0membuf1mbs0mba0</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-1/mbs-0/mba-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-0</default> + </attribute> +</targetInstance> + +<targetInstance> + <id>sys0node0membuf1mbs0mba1</id> + <type>unit-mba-centaur</type> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/membuf-1/mbs-0/mba-1</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-1</default> + </attribute> +</targetInstance> + +<!-- Centaur n0p1 : end --> + </attributes> diff --git a/src/usr/targeting/xmltohb/xmltohb.pl b/src/usr/targeting/xmltohb/xmltohb.pl index b41af12d4..b067e0e8e 100755 --- a/src/usr/targeting/xmltohb/xmltohb.pl +++ b/src/usr/targeting/xmltohb/xmltohb.pl @@ -1897,7 +1897,7 @@ sub packEntityPath { my $binaryData; - my $maxPathElements = 8; + my $maxPathElements = 10; my ($typeStr,$path) = split(/:/,$value); my (@paths) = split(/\//,$path); |