diff options
Diffstat (limited to 'src/usr/targeting/xmltohb')
| -rw-r--r-- | src/usr/targeting/xmltohb/makefile | 1 | ||||
| -rw-r--r-- | src/usr/targeting/xmltohb/simics_MURANO.system.xml | 40 | ||||
| -rw-r--r-- | src/usr/targeting/xmltohb/simics_SALERNO.mrw.xml | 22 | ||||
| -rw-r--r-- | src/usr/targeting/xmltohb/simics_SALERNO.system.xml | 462 | ||||
| -rw-r--r-- | src/usr/targeting/xmltohb/simics_VENICE.system.xml | 25 |
5 files changed, 51 insertions, 499 deletions
diff --git a/src/usr/targeting/xmltohb/makefile b/src/usr/targeting/xmltohb/makefile index ebcbec44c..800d928bd 100644 --- a/src/usr/targeting/xmltohb/makefile +++ b/src/usr/targeting/xmltohb/makefile @@ -36,7 +36,6 @@ XMLTOHB_SOURCE_TARGETS = \ XMLTOHB_SYSTEM_BINARIES = \ vbu_targeting.bin \ - simics_SALERNO_targeting.bin \ simics_VENICE_targeting.bin \ simics_MURANO_targeting.bin diff --git a/src/usr/targeting/xmltohb/simics_MURANO.system.xml b/src/usr/targeting/xmltohb/simics_MURANO.system.xml index 1b5edada4..56935a1cd 100644 --- a/src/usr/targeting/xmltohb/simics_MURANO.system.xml +++ b/src/usr/targeting/xmltohb/simics_MURANO.system.xml @@ -111,7 +111,7 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id> + <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> <default> <field><id>nodeId</id><value>0</value></field> <field><id>chipId</id><value>0</value></field> @@ -125,6 +125,14 @@ <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0</default> </attribute> + <attribute> + <id>FABRIC_NODE_ID</id> + <default>0</default> + </attribute> + <attribute> + <id>FABRIC_CHIP_ID</id> + <default>0</default> + </attribute> </targetInstance> <!-- Murano n0p0 EX units --> @@ -539,7 +547,7 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id> + <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> <default> <field><id>nodeId</id><value>0</value></field> <field><id>chipId</id><value>0</value></field> @@ -574,6 +582,14 @@ <id>FSI_OPTION_FLAGS</id> <default>0</default> </attribute> + <attribute> + <id>FABRIC_NODE_ID</id> + <default>0</default> + </attribute> + <attribute> + <id>FABRIC_CHIP_ID</id> + <default>1</default> + </attribute> </targetInstance> <!-- Murano n0p1 EX units --> @@ -953,7 +969,7 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id> + <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> <default> <field><id>nodeId</id><value>0</value></field> <field><id>chipId</id><value>0</value></field> @@ -988,6 +1004,14 @@ <id>FSI_OPTION_FLAGS</id> <default>0</default> </attribute> + <attribute> + <id>FABRIC_NODE_ID</id> + <default>0</default> + </attribute> + <attribute> + <id>FABRIC_CHIP_ID</id> + <default>2</default> + </attribute> </targetInstance> <!-- Murano n0p2 EX units --> @@ -1368,7 +1392,7 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id> + <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> <default> <field><id>nodeId</id><value>0</value></field> <field><id>chipId</id><value>0</value></field> @@ -1403,6 +1427,14 @@ <id>FSI_OPTION_FLAGS</id> <default>0</default> </attribute> + <attribute> + <id>FABRIC_NODE_ID</id> + <default>0</default> + </attribute> + <attribute> + <id>FABRIC_CHIP_ID</id> + <default>3</default> + </attribute> </targetInstance> <!-- Murano n0p3 EX units --> diff --git a/src/usr/targeting/xmltohb/simics_SALERNO.mrw.xml b/src/usr/targeting/xmltohb/simics_SALERNO.mrw.xml deleted file mode 100644 index f000ee349..000000000 --- a/src/usr/targeting/xmltohb/simics_SALERNO.mrw.xml +++ /dev/null @@ -1,22 +0,0 @@ -<!-- IBM_PROLOG_BEGIN_TAG - This is an automatically generated prolog. - - $Source: src/usr/targeting/xmltohb/simics_SALERNO.mrw.xml $ - - IBM CONFIDENTIAL - - COPYRIGHT International Business Machines Corp. 2012 - - p1 - - Object Code Only (OCO) source materials - Licensed Internal Code Source Materials - IBM HostBoot Licensed Internal Code - - The source code for this program is not published or other- - wise divested of its trade secrets, irrespective of what has - been deposited with the U.S. Copyright Office. - - Origin: 30 - - IBM_PROLOG_END --> diff --git a/src/usr/targeting/xmltohb/simics_SALERNO.system.xml b/src/usr/targeting/xmltohb/simics_SALERNO.system.xml deleted file mode 100644 index 5de483d2c..000000000 --- a/src/usr/targeting/xmltohb/simics_SALERNO.system.xml +++ /dev/null @@ -1,462 +0,0 @@ -<!-- IBM_PROLOG_BEGIN_TAG - This is an automatically generated prolog. - - $Source: src/usr/targeting/xmltohb/simics_SALERNO.system.xml $ - - IBM CONFIDENTIAL - - COPYRIGHT International Business Machines Corp. 2011 - - p1 - - Object Code Only (OCO) source materials - Licensed Internal Code Source Materials - IBM HostBoot Licensed Internal Code - - The source code for this program is not published or other- - wise divested of its trade secrets, irrespective of what has - been deposited with the U.S. Copyright Office. - - Origin: 30 - - IBM_PROLOG_END --> - -<attributes> - -<!-- ===================================================================== - HOST BOOT TARGET INSTANCES - Contains target instance declarations for the Simics SALERNO - configuration - - * Config has 1-8 Salerno chips - ================================================================= --> - -<targetInstance> - <id>sys0</id> - <type>sys-sys-power8</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0</default> - </attribute> - <attribute> - <id>PROC_EPS_TABLE_TYPE</id> - <default>EPS_TYPE_LE</default> - </attribute> - <attribute> - <id>PROC_FABRIC_PUMP_MODE</id> - <default>MODE1</default> - </attribute> - <attribute> - <id>PROC_X_BUS_WIDTH</id> - <default>W8BYTE</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0</id> - <type>enc-node-power8</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0</default> - </attribute> -</targetInstance> - - - -<!-- Salerno n0p0 : start --> -<targetInstance> - <id>sys0node0proc0</id> - <type>chip-processor-salerno</type> - <attribute><id>SCOM_SWITCHES</id> - <default> - <field><id>useFsiScom</id><value>0</value></field> - <field><id>useXscom</id><value>1</value></field> - <field><id>useInbandScom</id><value>0</value></field> - <field><id>reserved</id><value>0</value></field> - </default> - </attribute> - <attribute> - <id>XSCOM_CHIP_INFO</id> - <default> - <field><id>nodeId</id><value>0</value></field> - <field><id>chipId</id><value>0</value></field> - </default> - </attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0ex0</id> - <type>unit-ex-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/ex-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/ex-0</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0ex1</id> - <type>unit-ex-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/ex-1</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/ex-1</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0ex2</id> - <type>unit-ex-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/ex-2</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/ex-2</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0ex3</id> - <type>unit-ex-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/ex-3</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/ex-3</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0ex4</id> - <type>unit-ex-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/ex-4</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/ex-4</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0ex5</id> - <type>unit-ex-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/ex-5</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/ex-5</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0ex0core0</id> - <type>unit-core-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/ex-0/core-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/ex-0/core-0</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0ex1core0</id> - <type>unit-core-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/ex-1/core-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/ex-1/core-0</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0ex2core0</id> - <type>unit-core-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/ex-2/core-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/ex-2/core-0</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0ex3core0</id> - <type>unit-core-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/ex-3/core-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/ex-3/core-0</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0ex4core0</id> - <type>unit-core-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/ex-4/core-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/ex-4/core-0</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0ex5core0</id> - <type>unit-core-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/ex-5/core-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/ex-5/core-0</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0mcs0</id> - <type>unit-mcs-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/mcs-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-0</default> - </attribute> - <attribute> - <id>CHIP_UNIT</id> - <default>0</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0mcs0mba0</id> - <type>unit-mba-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/mcs-0/mba-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-0/mba-0</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0mcs0mba1</id> - <type>unit-mba-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/mcs-0/mba-1</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-0/mba-1</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0mcs0mba0port0</id> - <type>unit-memport-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/mcs-0/mba-0/mem_port-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-0/mba-0/mem_port-0</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0mcs0mba1port0</id> - <type>unit-memport-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/mcs-0/mba-1/mem_port-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-0/mba-1/mem_port-0</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0pervasive0</id> - <type>unit-pervasive-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/pervasive-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/pervasive-0</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0powerbus0</id> - <type>unit-powerbus-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/powerbus-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/powerbus-0</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0pci0</id> - <type>unit-pci-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/pci-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/pci-0</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0pci1</id> - <type>unit-pci-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/pci-1</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/pci-1</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0pci2</id> - <type>unit-pci-salerno</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/pci-2</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/pci-2</default> - </attribute> -</targetInstance> -<!-- Salerno n0p0 : finish --> - - - -<!-- Temporary target used for FSI wrap-back testing --> -<targetInstance> - <id>sys0node0proc0wrap</id> - <type>chip-processor-salerno</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> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-9</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-9</default> - </attribute> - - <!-- FSI is connected via wrapback to itself over MFSI-0 --> - <attribute> - <id>FSI_MASTER_CHIP</id> - <default>physical:sys-0/node-0/proc-0</default> - </attribute> - <attribute> - <id>FSI_MASTER_TYPE</id> - <default>MFSI</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> - -<targetInstance> - <id>sys0node0proc0dimm0</id> - <type>lcard-dimm</type> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-0/mbs-0/mba-0/mem_port-0/dimm-0</default> - </attribute> - <attribute> - <id>EEPROM_ADDR_INFO0</id> - <default> - <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/proc-0</value></field> - <field><id>port</id><value>0</value></field> - <field><id>devAddr</id><value>0x50</value></field> - <field><id>engine</id><value>0</value></field> - </default> - </attribute> -</targetInstance> - -</attributes> diff --git a/src/usr/targeting/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/xmltohb/simics_VENICE.system.xml index 9b3573cb1..12306583b 100644 --- a/src/usr/targeting/xmltohb/simics_VENICE.system.xml +++ b/src/usr/targeting/xmltohb/simics_VENICE.system.xml @@ -110,7 +110,7 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id> + <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> <default> <field><id>nodeId</id><value>0</value></field> <field><id>chipId</id><value>0</value></field> @@ -518,7 +518,7 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id> + <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> <default> <field><id>nodeId</id><value>0</value></field> <field><id>chipId</id><value>0</value></field> @@ -947,7 +947,7 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id> + <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> <default> <field><id>nodeId</id><value>0</value></field> <field><id>chipId</id><value>0</value></field> @@ -1377,7 +1377,7 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id> + <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> <default> <field><id>nodeId</id><value>0</value></field> <field><id>chipId</id><value>0</value></field> @@ -1806,7 +1806,7 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id> + <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> <default> <field><id>nodeId</id><value>0</value></field> <field><id>chipId</id><value>0</value></field> @@ -2235,7 +2235,7 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id> + <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> <default> <field><id>nodeId</id><value>0</value></field> <field><id>chipId</id><value>0</value></field> @@ -2664,7 +2664,7 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id> + <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> <default> <field><id>nodeId</id><value>0</value></field> <field><id>chipId</id><value>0</value></field> @@ -3093,7 +3093,7 @@ </default> </attribute> <attribute> - <id>XSCOM_CHIP_INFO</id> + <id>XSCOM_CHIP_INFO</id><!-- @fixme: Story 35529 --> <default> <field><id>nodeId</id><value>0</value></field> <field><id>chipId</id><value>0</value></field> @@ -8962,7 +8962,10 @@ <!-- Centaur n0p63 : end --> -<!-- @fixme : Temporary target used for FSI wrap-back testing --> +<!-- Remove this until Simics model works again : + @fixme with Task 39187 + +Target used for FSI wrap-back testing <targetInstance> <id>sys0node0proc0wrap</id> <type>chip-processor-venice</type> @@ -8983,7 +8986,7 @@ <default>affinity:sys-0/node-0/proc-9</default> </attribute> - <!-- FSI is connected via wrapback to itself over MFSI-0 --> + FSI is connected via wrapback to itself over MFSI-0 <attribute> <id>FSI_MASTER_CHIP</id> <default>physical:sys-0/node-0/proc-0</default> @@ -9006,6 +9009,8 @@ </attribute> </targetInstance> +--> + <!-- DIMMS id/physical is sys-0/node-0/dimm-[d] |
