From b24b1c63ee3ead9cc405fb594f4a8b2afc9ddffe Mon Sep 17 00:00:00 2001
From: Dan Crowell <dcrowell@us.ibm.com>
Date: Tue, 8 Mar 2016 22:52:37 -0600
Subject: Add NX targets

Modify parser script
Add NX target to NIMBUS config

CQ: SW335617
Change-Id: Icacf8db8583bc2295049bb88c06541fa45512280
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/21830
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Michael J. Vance <mjvance@us.ibm.com>
Reviewed-by: Elizabeth K. Liner <eliner@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
---
 src/usr/targeting/common/genHwsvMrwXml.pl          |  9 ++++++---
 .../common/xmltohb/simics_NIMBUS.system.xml        | 18 +++++++++++++++++
 src/usr/targeting/common/xmltohb/target_types.xml  | 23 ++++++++++++++++++++++
 3 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index cb6faa6da..6c58d04b9 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -1798,6 +1798,12 @@ for (my $do_core = 0, my $i = 0; $i <= $#STargets; $i++)
 
         generate_occ($proc, $proc_ordinal_id);
 
+        generate_nx($proc,$proc_ordinal_id,$node);
+
+        #TODO-RTC:149326-Finish up the rest of the misc units
+        #generate_pcies($proc,$proc_ordinal_id);
+        #generate_pore($proc,$proc_ordinal_id,$node);
+
         # call to do any fsp per-proc targets (ie, occ, psi)
         do_plugin('fsp_proc_targets', $proc, $i, $proc_ordinal_id,
                     $STargets[$i][NODE_FIELD], $STargets[$i][POS_FIELD]);
@@ -1866,9 +1872,6 @@ for (my $do_core = 0, my $i = 0; $i <= $#STargets; $i++)
             ($STargets[$i+1][NAME_FIELD] eq "memb"))
         {
             $mcs_count = 0;
-            generate_pcies($proc,$proc_ordinal_id);
-            generate_nx($proc,$proc_ordinal_id,$node);
-            generate_pore($proc,$proc_ordinal_id,$node);
         }
     }
     elsif ( $STargets[$i][NAME_FIELD] eq "mca")
diff --git a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
index 53898e6c4..5332f5c1a 100644
--- a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
@@ -2619,4 +2619,22 @@
     </attribute>
 </targetInstance>
 
+<targetInstance>
+    <id>sys0node0proc0nx0</id>
+    <type>unit-nx-power9</type>
+    <attribute><id>HUID</id><default>0x001E0000</default></attribute>
+    <attribute>
+        <id>PHYS_PATH</id>
+        <default>physical:sys-0/node-0/proc-0/nx-0</default>
+    </attribute>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>physical:sys-0/node-0/proc-0/nx-0</default>
+    </attribute>
+    <attribute>
+        <id>CHIP_UNIT</id>
+        <default>0</default>
+    </attribute>
+</targetInstance>
+
 </attributes>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 4f7b5b1c1..29dac74dd 100755
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -2699,6 +2699,29 @@
     </attribute>
 </targetType>
 
+<targetType>
+    <id>unit-nx-power9</id>
+    <parent>unit</parent>
+    <attribute>
+        <id>TYPE</id>
+        <default>NX</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>
+    <attribute><id>CDM_DOMAIN</id><default>FABRIC</default></attribute>
+</targetType>
+
 <!-- End p9 sub-units -->
 
 </attributes>
-- 
cgit v1.2.1