Updates to IPMI Fru Inventory XML changes

Change-Id: I5b0f07086b1ca8cf9fd04406d2315e063d39b2b4
CQ: SW289819
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14909
Tested-by: Jenkins Server
Reviewed-by: Michael Baiocchi <baiocchi@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 74 insertions, 21 deletions

diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index 6861782d8..4f3529252 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -4249,27 +4249,28 @@ sub generate_is_dimm
          </default>
     </attribute>";
 
-               last;
-            }
-        }
-
-        print "
-    </attribute>
-     <attribute>
+            print "
+    <attribute>
         <id>EEPROM_VPD_FRU_INFO</id>
          <default>
-             <field><id>i2cMasterPath</id><value>physical:sys-$sys/node-$node/membuf-$ctaur</value></field>
-             <field><id>port</id><value>$dimmI2C->{$i+1}->{'i2c-master'}->{'i2c-port'}</value></field>
-             <field><id>devAddr</id><value>0x$dimmI2C->{$i+1}->{'address'}</value></field>
-             <field><id>engine</id><value>0</value></field>
+             <field><id>i2cMasterPath</id><value>physical:sys-$sys/"
+                . "node-$node/membuf-$ctaur</value></field>
+             <field><id>port</id><value>$dimmI2C[$j]{port}</value></field>
+             <field><id>devAddr</id><value>0x$dimmI2C[$j]{devAddr}"
+                . "</value></field>
+             <field><id>engine</id><value>$dimmI2C[$j]{engine}</value></field>
              <field><id>byteAddrOffset</id><value>0x01</value></field>
              <field><id>maxMemorySizeKB</id><value>0x01</value></field>
-             <field><id>writePageSize</id><value>0x00</value></field>
+             <field><id>writePageSize</id><value>0x50</value></field>
              <field><id>writeCycleTime</id><value>0x05</value></field>
              <field><id>fruId</id><value>$ipmiFruid++</value></field>
          </default>
     </attribute>";
 
+               last;
+            }
+        }
+
        print"
     <attribute>
         <id>VPD_REC_NUM</id>
@@ -4900,6 +4901,40 @@ sub addEepromsProc
         print "        </default>\n";
         print "    </attribute>\n";
 
+        if ($id_name eq "EEPROM_VPD_PRIMARY_INFO")
+        {
+            print "    <attribute>\n";
+            print "        <id>EEPROM_VPD_FRU_INFO</id>\n";
+
+            print "        <default>\n";
+            print "            <field><id>i2cMasterPath</id><value>physical:",
+                              "sys-$sys/node-$node/",
+                              "proc-$proc</value></field>\n";
+            print "            <field><id>port</id><value>",
+                              "$I2Cdevices[$i]{i2c_port}</value></field>\n";
+            print "            <field><id>devAddr</id><value>0x",
+                              "$I2Cdevices[$i]{i2c_devAddr}",
+                              "</value></field>\n";
+            print "            <field><id>engine</id><value>",
+                              "$I2Cdevices[$i]{i2c_engine}",
+                              "</value></field>\n";
+            print "            <field><id>byteAddrOffset</id><value>",
+                              "$I2Cdevices[$i]{i2c_byte_addr_offset}",
+                              "</value></field>\n";
+            print "            <field><id>maxMemorySizeKB</id><value>",
+                              "$I2Cdevices[$i]{i2c_max_mem_size}",
+                              "</value></field>\n";
+            print "            <field><id>writePageSize</id><value>",
+                              "$I2Cdevices[$i]{i2c_write_page_size}",
+                              "</value></field>\n";
+            print "            <field><id>writeCycleTime</id><value>",
+                              "$I2Cdevices[$i]{i2c_write_cycle_time}",
+                              "</value></field>\n";
+            print "            <field><id>fruId</id><value>$ipmiFruid++",
+                              "</value></field>\n";
+            print "        </default>\n";
+            print "    </attribute>\n";
+        }
     }
 }
 
@@ -4980,16 +5015,34 @@ sub addEepromsCentaur
         {
             print "    <attribute>\n";
             print "        <id>EEPROM_VPD_FRU_INFO</id>\n";
+
             print "        <default>\n";
-            print "            <field><id>i2cMasterPath</id><value>physical:sys-$sys/node-$node/proc-$proc</value></field>\n";
-            print "             <field><id>port</id><value>$port</value></field>\n";
-            print "             <field><id>devAddr</id><value>$devAddr_hex</value></field>\n";
-            print "             <field><id>engine</id><value>0</value></field>\n";
-            print "             <field><id>byteAddrOffset</id><value>0x02</value></field>\n";
-            print "             <field><id>maxMemorySizeKB</id><value>0x40</value></field>\n";
-            print "             <field><id>writePageSize</id><value>0x80</value></field>\n";
-            print "             <field><id>writeCycleTime</id><value>0x05</value></field>\n";
-            print "             <field><id>fruId</id><value>$ipmiFruid++</value></field>\n";
+            print "            <field><id>i2cMasterPath</id><value>physical:",
+                              "sys-$sys/node-$node/",
+                              "$I2Cdevices[$i]{i2cm_name}",
+                              "-$I2Cdevices[$i]{i2cm_pos}</value></field>\n";
+            print "            <field><id>port</id><value>",
+                              "$I2Cdevices[$i]{i2c_port}</value></field>\n";
+            print "            <field><id>devAddr</id><value>0x",
+                              "$I2Cdevices[$i]{i2c_devAddr}",
+                              "</value></field>\n";
+            print "            <field><id>engine</id><value>",
+                              "$I2Cdevices[$i]{i2c_engine}",
+                              "</value></field>\n";
+            print "            <field><id>byteAddrOffset</id><value>",
+                              "$I2Cdevices[$i]{i2c_byte_addr_offset}",
+                              "</value></field>\n";
+            print "            <field><id>maxMemorySizeKB</id><value>",
+                              "$I2Cdevices[$i]{i2c_max_mem_size}",
+                              "</value></field>\n";
+            print "            <field><id>writePageSize</id><value>",
+                              "$I2Cdevices[$i]{i2c_write_page_size}",
+                              "</value></field>\n";
+            print "            <field><id>writeCycleTime</id><value>",
+                              "$I2Cdevices[$i]{i2c_write_cycle_time}",
+                              "</value></field>\n";
+            print "            <field><id>fruId</id><value>$ipmiFruid++",
+                              "</value></field>\n";
             print "        </default>\n";
             print "    </attribute>\n";
         }