Add CONTROL_NODE target type

- Added CONTROL_NODE target type to attribute definition
- Added CONTROL_NODE debug text to entity path decoder
- Updated targeting image compiler to balk control node setup to FSP

Change-Id: I52901ddbe93ee0c0413d7b54ee9d45782cae9010
CMVC: 882231
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4571
Tested-by: Jenkins Server
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 20 insertions, 18 deletions

diff --git a/src/usr/targeting/common/entitypath.C b/src/usr/targeting/common/entitypath.C
index 1bf2eb63e..a0124830e 100644
--- a/src/usr/targeting/common/entitypath.C
+++ b/src/usr/targeting/common/entitypath.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2011,2012              */
+/* COPYRIGHT International Business Machines Corp. 2011,2013              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -304,6 +304,8 @@ const char* EntityPath::pathElementTypeAsString(
             return "Proc";
         case TYPE_NODE:
             return "Node";
+        case TYPE_CONTROL_NODE:
+            return "Control Node";
         case TYPE_CORE:
             return "Core";
         case TYPE_L2:
diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index 975db7317..36d62ad6a 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -1637,7 +1637,11 @@ sub generate_max_config
 
 sub generate_system_node
 {
-    print "
+    # Brazos node4 is the fsp node and we'll let the fsp
+    # MRW parser handle that.
+    if( !( ($sysname eq "brazos") && ($node == $MAXNODE) ) )
+    {
+        print "
 <!-- $SYSNAME System node $node -->
 
 <targetInstance>
@@ -1652,24 +1656,17 @@ sub generate_system_node
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-$sys/node-$node</default>
     </attribute>";
-
-    # TODO: move RID calculation to genHwsvMrwXml_fsp.pm
-    # call to do any fsp per-system_node attributes
-    my $rid = sprintf("0x80%X",${node});
-
-    # TODO: replace Brazos system check with something less dependent on name
-    #brazos is different then tuleta and orlena
-    #for 1 node systems the RID is 0x800 but for brazos, 
-    #the 800 is for the maxdale, and 801-804 for the processor nodes.  
-    if ($sysname eq "brazos")
-    {
-        $rid = sprintf("0x80%X",${node}+1);
-    }
-    do_plugin('fsp_system_node', $node, $rid );
-
-    print "
+        # add fsp extensions
+        do_plugin('fsp_node_add_extensions', $node);
+        print "
 </targetInstance>
 ";
+    }
+    else
+    {
+        # create fsp control node
+        do_plugin('fsp_control_node', $node);
+    }
 
     # call to do any fsp per-system_node targets
     do_plugin('fsp_system_node_targets', $node);
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 4cee297b9..ae9ca7c63 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -151,6 +151,9 @@
         <name>TODCLK</name>
     </enumerator>
     <enumerator>
+        <name>CONTROL_NODE</name>
+    </enumerator>
+    <enumerator>
         <name>LAST_IN_RANGE</name>
     </enumerator>
     <default>NA</default>