diff options
author | Stephen Cprek <smcprek@us.ibm.com> | 2014-02-11 16:25:38 -0600 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-02-13 14:31:13 -0600 |
commit | f22c1f8a45a9227d78dcd0135e0163f2347a7e29 (patch) | |
tree | 66d1cf978fa2bcf82748e9fc90f4ebe71e402a1c /src/usr/targeting | |
parent | 22d0abdb176f9b26f1b52339a44107875fe37f22 (diff) | |
download | talos-hostboot-f22c1f8a45a9227d78dcd0135e0163f2347a7e29.tar.gz talos-hostboot-f22c1f8a45a9227d78dcd0135e0163f2347a7e29.zip |
Add CAPP target support
Change-Id: Ie3b9ba88dc60a2a82dd2881984d8f568695dc1ed
RTC: 85615
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8782
Tested-by: Jenkins Server
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/targeting')
-rw-r--r-- | src/usr/targeting/common/entitypath.C | 2 | ||||
-rwxr-xr-x | src/usr/targeting/common/genHwsvMrwXml.pl | 49 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/attribute_types.xml | 8 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/simics_MURANO.system.xml | 80 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/simics_VENICE.system.xml | 162 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/target_types.xml | 40 |
6 files changed, 338 insertions, 3 deletions
diff --git a/src/usr/targeting/common/entitypath.C b/src/usr/targeting/common/entitypath.C index 179464c61..6a58331a0 100644 --- a/src/usr/targeting/common/entitypath.C +++ b/src/usr/targeting/common/entitypath.C @@ -364,6 +364,8 @@ const char* EntityPath::pathElementTypeAsString( return "PCIClockEndPoint"; case TYPE_PCIESWITCH: return "PCIESWITCH"; + case TYPE_CAPP: + return "CAPP"; // case TYPE_FSI_LINK: // return "FSI-link"; // case TYPE_CFAM: diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl index 8d5220717..75e72a3af 100755 --- a/src/usr/targeting/common/genHwsvMrwXml.pl +++ b/src/usr/targeting/common/genHwsvMrwXml.pl @@ -1168,6 +1168,7 @@ for (my $do_core = 0, my $i = 0; $i <= $#STargets; $i++) generate_ax_buses($proc, "X",$proc_ordinal_id); generate_nx($proc,$proc_ordinal_id,$node); generate_pore($proc,$proc_ordinal_id,$node); + generate_capp($proc,$proc_ordinal_id,$node); } } } @@ -2742,6 +2743,54 @@ sub generate_pore "; } +sub generate_capp +{ + my ($proc, $ordinalId, $node) = @_; + my $uidstr = sprintf("0x%02X21%04X",${node},$proc); + + # TODO RTC: 97477 + my $ipath = ""; + my $mruData = ""; + + print "\n<!-- $SYSNAME n${node}p$proc capp units -->\n"; + print " +<targetInstance> + <id>sys${sys}node${node}proc${proc}capp0</id> + <type>unit-capp-$CHIPNAME</type> + <attribute><id>HUID</id><default>${uidstr}</default></attribute> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-$sys/node-$node/proc-$proc/capp-0</default> + </attribute> + <attribute> + <id>MRU_ID</id>"; + # TODO RTC: 97477 + print " + <default>TO_BE_ADDED</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-$sys/node-$node/proc-$proc/capp-0</default> + </attribute> + <compileAttribute> + <id>INSTANCE_PATH</id>"; + # TODO RTC: 97477 + print " + <default>instance:TO_BE_ADDED</default> + </compileAttribute> + <attribute> + <id>CHIP_UNIT</id> + <default>0</default> + </attribute>"; + + # call to do any fsp per-capp attributes + do_plugin('fsp_capp', $proc, $ordinalId ); + + print " +</targetInstance> +"; +} + my $logicalDimmInit = 0; my %logicalDimmList = (); sub generate_logicalDimms diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index 9f164bb78..5ba9d01c3 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -206,14 +206,18 @@ <name>PCIESWITCH</name> <value>32</value> </enumerator> + <enumerator> + <name>CAPP</name> + <value>33</value> + </enumerator> <!-- add any new types here, and increment TEST_FAIL and LAST_IN_RANGE --> <enumerator> <name>TEST_FAIL</name> - <value>33</value> + <value>34</value> </enumerator> <enumerator> <name>LAST_IN_RANGE</name> - <value>34</value> + <value>35</value> </enumerator> <default>NA</default> </enumerationType> diff --git a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml index f25760388..4e21a72fa 100644 --- a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml @@ -1129,6 +1129,26 @@ </attribute> </targetInstance> +<!-- murano n0p0 CAPP unit --> + +<targetInstance> + <id>sys0node0proc0capp0</id> + <type>unit-capp-murano</type> + <attribute><id>HUID</id><default>0x00210000</default></attribute> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-0/capp-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>physical:sys-0/node-0/proc-0/capp-0</default> + </attribute> + <attribute> + <id>CHIP_UNIT</id> + <default>0</default> + </attribute> +</targetInstance> + <!-- Murano n0p1 processor chip --> <targetInstance> @@ -1952,6 +1972,26 @@ </attribute> </targetInstance> +<!-- murano n0p1 CAPP unit --> + +<targetInstance> + <id>sys0node0proc1capp0</id> + <type>unit-capp-murano</type> + <attribute><id>HUID</id><default>0x00210001</default></attribute> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-1/capp-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>physical:sys-0/node-0/proc-1/capp-0</default> + </attribute> + <attribute> + <id>CHIP_UNIT</id> + <default>0</default> + </attribute> +</targetInstance> + <!-- Murano n0p2 processor chip --> <targetInstance> @@ -2777,6 +2817,26 @@ </attribute> </targetInstance> +<!-- murano n0p2 CAPP unit --> + +<targetInstance> + <id>sys0node0proc2capp0</id> + <type>unit-capp-murano</type> + <attribute><id>HUID</id><default>0x00210002</default></attribute> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-2/capp-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>physical:sys-0/node-0/proc-2/capp-0</default> + </attribute> + <attribute> + <id>CHIP_UNIT</id> + <default>0</default> + </attribute> +</targetInstance> + <!-- Murano n0p3 processor chip --> <targetInstance> @@ -3600,6 +3660,26 @@ </attribute> </targetInstance> +<!-- murano n0p3 CAPP unit --> + +<targetInstance> + <id>sys0node0proc3capp0</id> + <type>unit-capp-murano</type> + <attribute><id>HUID</id><default>0x00210003</default></attribute> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-3/capp-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>physical:sys-0/node-0/proc-3/capp-0</default> + </attribute> + <attribute> + <id>CHIP_UNIT</id> + <default>0</default> + </attribute> +</targetInstance> + <!-- Centaur n0p4 : start --> <targetInstance> diff --git a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml index 8100c3e73..4b6442604 100644 --- a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml @@ -1,4 +1,4 @@ -<!-- IBM_PROLOG_BEGIN_TAG --> +po<!-- IBM_PROLOG_BEGIN_TAG --> <!-- This is an automatically generated prolog. --> <!-- --> <!-- $Source: src/usr/targeting/common/xmltohb/simics_VENICE.system.xml $ --> @@ -1484,6 +1484,26 @@ </attribute> </targetInstance> +<!-- venice n0p0 CAPP unit --> + +<targetInstance> + <id>sys0node0proc0capp0</id> + <type>unit-capp-venice</type> + <attribute><id>HUID</id><default>0x00210000</default></attribute> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-0/capp-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>physical:sys-0/node-0/proc-0/capp-0</default> + </attribute> + <attribute> + <id>CHIP_UNIT</id> + <default>0</default> + </attribute> +</targetInstance> + <!-- Venice n0p1 processor chip --> <targetInstance> @@ -2668,6 +2688,26 @@ </attribute> </targetInstance> +<!-- venice n0p1 CAPP unit --> + +<targetInstance> + <id>sys0node0proc1capp0</id> + <type>unit-capp-venice</type> + <attribute><id>HUID</id><default>0x00210001</default></attribute> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-1/capp-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>physical:sys-0/node-0/proc-1/capp-0</default> + </attribute> + <attribute> + <id>CHIP_UNIT</id> + <default>0</default> + </attribute> +</targetInstance> + <!-- Venice n0p2 processor chip --> <targetInstance> @@ -3853,6 +3893,26 @@ </attribute> </targetInstance> +<!-- venice n0p2 CAPP unit --> + +<targetInstance> + <id>sys0node0proc2capp0</id> + <type>unit-capp-venice</type> + <attribute><id>HUID</id><default>0x00210002</default></attribute> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-2/capp-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>physical:sys-0/node-0/proc-2/capp-0</default> + </attribute> + <attribute> + <id>CHIP_UNIT</id> + <default>0</default> + </attribute> +</targetInstance> + <!-- Venice n0p3 processor chip --> @@ -5038,6 +5098,26 @@ </attribute> </targetInstance> +<!-- venice n0p3 CAPP unit --> + +<targetInstance> + <id>sys0node0proc3capp0</id> + <type>unit-capp-venice</type> + <attribute><id>HUID</id><default>0x00210003</default></attribute> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-3/capp-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>physical:sys-0/node-0/proc-3/capp-0</default> + </attribute> + <attribute> + <id>CHIP_UNIT</id> + <default>0</default> + </attribute> +</targetInstance> + <!-- Venice n0p4 processor chip --> <targetInstance> @@ -6191,6 +6271,26 @@ </attribute> </targetInstance> +<!-- venice n0p4 CAPP unit --> + +<targetInstance> + <id>sys0node0proc4capp0</id> + <type>unit-capp-venice</type> + <attribute><id>HUID</id><default>0x00210004</default></attribute> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-4/capp-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>physical:sys-0/node-0/proc-4/capp-0</default> + </attribute> + <attribute> + <id>CHIP_UNIT</id> + <default>0</default> + </attribute> +</targetInstance> + <!-- Venice n0p5 processor chip --> <targetInstance> @@ -7342,6 +7442,26 @@ </attribute> </targetInstance> +<!-- venice n0p5 CAPP unit --> + +<targetInstance> + <id>sys0node0proc5capp0</id> + <type>unit-capp-venice</type> + <attribute><id>HUID</id><default>0x00210005</default></attribute> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-5/capp-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>physical:sys-0/node-0/proc-5/capp-0</default> + </attribute> + <attribute> + <id>CHIP_UNIT</id> + <default>0</default> + </attribute> +</targetInstance> + <!-- Venice n0p6 processor chip --> <targetInstance> @@ -8493,6 +8613,26 @@ </attribute> </targetInstance> +<!-- venice n0p6 CAPP unit --> + +<targetInstance> + <id>sys0node0proc6capp0</id> + <type>unit-capp-venice</type> + <attribute><id>HUID</id><default>0x00210006</default></attribute> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-6/capp-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>physical:sys-0/node-0/proc-6/capp-0</default> + </attribute> + <attribute> + <id>CHIP_UNIT</id> + <default>0</default> + </attribute> +</targetInstance> + <!-- Venice n0p7 processor chip --> <targetInstance> @@ -9643,6 +9783,26 @@ </attribute> </targetInstance> +<!-- venice n0p7 CAPP unit --> + +<targetInstance> + <id>sys0node0proc7capp0</id> + <type>unit-capp-venice</type> + <attribute><id>HUID</id><default>0x00210007</default></attribute> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-7/capp-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>physical:sys-0/node-0/proc-7/capp-0</default> + </attribute> + <attribute> + <id>CHIP_UNIT</id> + <default>0</default> + </attribute> +</targetInstance> + <!-- Centaur n0p0 : start --> <targetInstance> diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index 5304ac42d..b5580daf2 100644 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -1380,4 +1380,44 @@ </attribute> </targetType> +<targetType> + <id>unit-capp-power8</id> + <parent>unit</parent> + <attribute> + <id>TYPE</id> + <default>CAPP</default> + </attribute> + <attribute><id>DECONFIG_GARDABLE</id><default>1</default></attribute> + <attribute><id>HWAS_STATE_CHANGED_SUBSCRIPTION_MASK</id> + <default>0x00000001</default> <!--GARD --> + </attribute> + <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> +</targetType> + +<targetType> + <id>unit-capp-venice</id> + <parent>unit-capp-power8</parent> + <attribute> + <id>MODEL</id> + <default>VENICE</default> + </attribute> +</targetType> + +<targetType> + <id>unit-capp-murano</id> + <parent>unit-capp-power8</parent> + <attribute> + <id>MODEL</id> + <default>MURANO</default> + </attribute> +</targetType> + </attributes> |