Add support for logical DIMMs generated from the MRW

- Fixed whitespace pruning of entity paths in attribute compiler
- Added *.mrw.xml files (empty) to hold logical DIMM target instances
- Updated makefile to process *.mrw.xml files
- Updated SALERNO system XML to reference logical DIMM cards
- Updated attribute XML with new postion, mba port, mba slot attributes
- Updated attribute XML with new class type
- Updated target type XML with classes/attributes for logical DIMMs

Change-Id: I2981405fdf1e8706d7380a7963ede8e9fd6bc323
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/639
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

8 files changed, 144 insertions, 8 deletions

diff --git a/src/usr/targeting/xmltohb/attribute_types.xml b/src/usr/targeting/xmltohb/attribute_types.xml
index 7a05cd43d..caaaa4d16 100644
--- a/src/usr/targeting/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/xmltohb/attribute_types.xml
@@ -58,11 +58,15 @@
     <enumerator>
         <name>SYS</name>
         <value>6</value>
-    </enumerator>             
+    </enumerator> 
     <enumerator>
-        <name>MAX</name>
+        <name>LOGICAL_CARD</name>
         <value>7</value>
-    </enumerator>             
+    </enumerator>            
+    <enumerator>
+        <name>MAX</name>
+        <value>8</value>
+    </enumerator>        
     <default>NA</default>
 </enumerationType>
 
@@ -2792,4 +2796,40 @@
     <readable/>
 </attribute>    
 
+<attribute>
+    <id>POSITION</id>
+    <description>Position of target relative to node</description>
+    <simpleType>
+        <uint16_t>
+            <default>0</default>
+        </uint16_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+</attribute>
+
+<attribute>
+    <id>MBA_PORT</id>
+    <description>MBA port this DIMM is connected to</description>
+    <simpleType>
+        <uint8_t>
+            <default>0</default>
+        </uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+</attribute>
+
+<attribute>
+    <id>MBA_SLOT</id>
+    <description>MBA slot this DIMM is connected to</description>
+    <simpleType>
+        <uint8_t>
+            <default>0</default>
+        </uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+</attribute>
+
 </attributes>
diff --git a/src/usr/targeting/xmltohb/makefile b/src/usr/targeting/xmltohb/makefile
index 7dccc3003..48d04ae45 100644
--- a/src/usr/targeting/xmltohb/makefile
+++ b/src/usr/targeting/xmltohb/makefile
@@ -85,8 +85,9 @@ $(call GENTARGET,$(XMLTOHB_TARGETS)) : \
 	     --src-output-dir=$(dir $@) --img-output-dir=none \
 	     --img-output-file=none
 
-# system-specific XML needs the generic plus the xxx.system.xml file
-${GENDIR}/%.hb.xml: %.system.xml ${XMLTOHB_GENERIC_SOURCES}
+# system-specific XML needs the generic plus the xxx.system.xml file + the
+# MRW file
+${GENDIR}/%.hb.xml: %.system.xml ${XMLTOHB_GENERIC_SOURCES} %.mrw.xml
 	./mergexml.sh $^ > $@
 
 # create the binary files
diff --git a/src/usr/targeting/xmltohb/simics_SALERNO.mrw.xml b/src/usr/targeting/xmltohb/simics_SALERNO.mrw.xml
new file mode 100644
index 000000000..f000ee349
--- /dev/null
+++ b/src/usr/targeting/xmltohb/simics_SALERNO.mrw.xml
@@ -0,0 +1,22 @@
+<!--  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
index b4584c0db..603e26b06 100644
--- a/src/usr/targeting/xmltohb/simics_SALERNO.system.xml
+++ b/src/usr/targeting/xmltohb/simics_SALERNO.system.xml
@@ -427,7 +427,7 @@
 
 <targetInstance>
     <id>sys0node0proc0dimm0</id>
-    <type>card-dimm</type>
+    <type>lcard-dimm</type>
     <attribute>
         <id>PHYS_PATH</id>
         <default>physical:sys-0/node-0/dimm-0</default>
diff --git a/src/usr/targeting/xmltohb/simics_VENICE.mrw.xml b/src/usr/targeting/xmltohb/simics_VENICE.mrw.xml
new file mode 100644
index 000000000..adeb2bce9
--- /dev/null
+++ b/src/usr/targeting/xmltohb/simics_VENICE.mrw.xml
@@ -0,0 +1,22 @@
+<!--  IBM_PROLOG_BEGIN_TAG
+     This is an automatically generated prolog.
+   
+     $Source: src/usr/targeting/xmltohb/simics_VENICE.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/target_types.xml b/src/usr/targeting/xmltohb/target_types.xml
index cc35f03af..77145653b 100644
--- a/src/usr/targeting/xmltohb/target_types.xml
+++ b/src/usr/targeting/xmltohb/target_types.xml
@@ -769,12 +769,26 @@
 </targetType>
 
 <targetType>
-    <id>card-dimm</id>
+    <id>lcard-dimm</id>
     <parent>card</parent>
     <attribute>
         <id>TYPE</id>
         <default>DIMM</default>
     </attribute>
+    <attribute>
+        <id>CLASS</id>
+        <default>LOGICAL_CARD</default>
+    </attribute>
+    <attribute>
+        <id>POSITION</id>
+    </attribute>
+    <attribute>
+        <id>MBA_PORT</id>
+    </attribute>
+    <attribute>
+        <id>MBA_SLOT</id>
+    </attribute>
+
     <!-- Defaulting this info to the one Simics Dummy device that we have -->
     <attribute>
         <id>EEPROM_ADDR_INFO0</id>
@@ -787,4 +801,16 @@
     </attribute>
 </targetType>
 
+<targetType>
+    <id>lcard-dimm-jedec</id>
+    <parent>lcard-dimm</parent>
+    <attribute><id>MODEL</id><default>JEDEC</default></attribute>
+</targetType>
+
+<targetType>
+    <id>lcard-dimm-cdimm</id>
+    <parent>lcard-dimm</parent>
+    <attribute><id>MODEL</id><default>CDIMM</default></attribute>
+</targetType>
+
 </attributes>
diff --git a/src/usr/targeting/xmltohb/vbu.mrw.xml b/src/usr/targeting/xmltohb/vbu.mrw.xml
new file mode 100644
index 000000000..1b83b150a
--- /dev/null
+++ b/src/usr/targeting/xmltohb/vbu.mrw.xml
@@ -0,0 +1,22 @@
+<!--  IBM_PROLOG_BEGIN_TAG
+     This is an automatically generated prolog.
+   
+     $Source: src/usr/targeting/xmltohb/vbu.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/xmltohb.pl b/src/usr/targeting/xmltohb/xmltohb.pl
index e071858f5..420e4e525 100755
--- a/src/usr/targeting/xmltohb/xmltohb.pl
+++ b/src/usr/targeting/xmltohb/xmltohb.pl
@@ -1943,6 +1943,9 @@ sub packEntityPath {
     my (@paths) = split(/\//,$path);
 
     my $type = 0;
+
+    # Trim whitespace from the type
+    $typeStr =~ s/^\s+|\s+$//g;
     if($typeStr eq "physical")
     {
         $type = 2;
@@ -1953,7 +1956,7 @@ sub packEntityPath {
     }
     else
     {
-        fatal("Unsupported enity path type.");
+        fatal("Unsupported enity path type of [$value], [$typeStr], [$path].");
     }
 
     if( (scalar @paths) > $maxPathElements)