Clarify Hot Plug Controller Attribute

This commit clarifies the different properties of the Hot Plug
Controller attribute, so we know that the fields represent the I2C
Master information.

Change-Id: I2e5b45536ba81e6c0bcfdbc478eb1a149bc1eb89
RTC: 113749
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/16691
Tested-by: Jenkins Server
Reviewed-by: Elizabeth Liner <eliner@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 14 insertions, 11 deletions

diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index 7cc87ce82..9ca0a8fba 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -5175,15 +5175,15 @@ sub addHotPlug
 
     for my $i ( 0 .. $#I2CHotPlug )
     {
-        my $drivingProcNode;
-        my $drivingProcPos;
+        my $i2cmProcNode;
+        my $i2cmProcPos;
         for my $x (0 .. $#I2CHotPlug_Host )
         {
             if( $I2CHotPlug_Host[$x]{i2c_slave_path} eq
                     $I2CHotPlug[$i]{i2c_instPath})
             {
-                $drivingProcNode = $I2CHotPlug_Host[$i]{i2c_proc_node};
-                $drivingProcPos = $I2CHotPlug_Host[$i]{i2c_proc_pos};
+                $i2cmProcNode = $I2CHotPlug_Host[$i]{i2c_proc_node};
+                $i2cmProcPos = $I2CHotPlug_Host[$i]{i2c_proc_pos};
                 last;
             }
         }
@@ -5223,8 +5223,8 @@ sub addHotPlug
             $hot_plug_array[($hot_count*$row_count) + 4] =
                 sprintf("0x%x",(hex $I2CHotPlug[$i]{i2c_slaveAddr}) * 2);
             $hot_plug_array[($hot_count*$row_count) + 5] = $part_id_enum;
-            $hot_plug_array[($hot_count*$row_count) + 6] = $drivingProcNode;
-            $hot_plug_array[($hot_count*$row_count) + 7] = $drivingProcPos;
+            $hot_plug_array[($hot_count*$row_count) + 6] = $i2cmProcNode;
+            $hot_plug_array[($hot_count*$row_count) + 7] = $i2cmProcPos;
 
             $hot_count = $hot_count + 1;
         }
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 7e6ca15fb..089b575b4 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -14809,13 +14809,16 @@ firmware notes: Platforms should initialize this attribute to AUTO (0)</descript
     <description>Hot Plug Controller values for a specific processor.
         Purpose: Holds information about the hot plug controllers so that a
             Hardware procedure is able to turn them on and off.
-        Data Format: up to 8 Hot Plug Controllers x 5 variables of information
+        Data Format: up to 8 Hot Plug Controllers x 7 variables of information
             This data is at the processor level.
             The needed information and their individual sizes are as follows:
-            (1) Master engine,uint8_t, (2) Master port, uint8_t. (3) Speed,
-            uint16_t value, (4) Slave address, uint8_t, (5) Device type, enum.
-            0x01: MAX5961, 0x02: PCA9551, (6) driving processor node, uint8_t,
-            (7) driving processor position, uint8_t.
+            (1) I2C Master processor engine (uint8_t)
+            (2) I2C Master processor port (uint8_t)
+            (3) Bus Speed (uint16_t value: 2 uint8_t values: MSB, LSB)
+            (4) Slave address (uint8_t)
+            (5) Device type (uint8_t: see SUPPORTED_HOT_PLUG enum)
+            (6) I2C Master processor node (uint8_t)
+            (7) I2C Master processor position (uint8_t)
             Thus, the information will be 8 bytes.
     </description>
     <simpleType>