diff options
author | Elizabeth Liner <eliner@us.ibm.com> | 2015-01-05 15:40:30 -0600 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-03-25 09:31:57 -0500 |
commit | ee649986cbe68cf9a32ef2a1614b65cf2527cd9c (patch) | |
tree | 4ac4d3bb9bad8f6d7623c497c65db7072b4a7c89 /src/usr/targeting | |
parent | b3f6894ba21c46081e512fdae6b7530116701109 (diff) | |
download | talos-hostboot-ee649986cbe68cf9a32ef2a1614b65cf2527cd9c.tar.gz talos-hostboot-ee649986cbe68cf9a32ef2a1614b65cf2527cd9c.zip |
added a new attribute to represent Hot Plug Controllers
Change-Id: Ia4bc10e9f1abe443218d0220dbe69c3af075d1b2
RTC:113374
Backport: release-fips830
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15049
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: PRACHI GUPTA <pragupta@us.ibm.com>
Reviewed-by: Michael Baiocchi <baiocchi@us.ibm.com>
Reviewed-by: STEPHEN M. CPREK <smcprek@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/targeting')
9 files changed, 398 insertions, 3 deletions
diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl index ae5604d3b..8e3eb98ad 100755 --- a/src/usr/targeting/common/genHwsvMrwXml.pl +++ b/src/usr/targeting/common/genHwsvMrwXml.pl @@ -1337,6 +1337,7 @@ my $i2cBus = XMLin($i2c_busses_file); # Capture all i2c buses info into the @I2Cdevices array my @I2Cdevices; +my @I2CHotPlug; foreach my $i (@{$i2cBus->{'i2c-device'}}) { @@ -1346,7 +1347,7 @@ foreach my $i (@{$i2cBus->{'i2c-device'}}) 'i2cm_pos' =>$i->{'i2c-master'}->{target}->{position}, 'i2cm_uid' =>$i->{'i2c-master'}->{'unit-id'}, 'i2c_content_type'=>$i->{'content-type'}, - 'i2c_card_id'=>$i->{'card-id'}, + 'i2c_part_id'=>$i->{'part-id'}, 'i2c_port'=>$i->{'i2c-master'}->{'i2c-port'}, 'i2c_devAddr'=>$i->{'address'}, 'i2c_engine'=>$i->{'i2c-master'}->{'i2c-engine'}, @@ -1358,6 +1359,39 @@ foreach my $i (@{$i2cBus->{'i2c-device'}}) 'i2c_write_page_size' =>"0x80", 'i2c_write_cycle_time' => "0x05" }; + if(( ($i->{'part-type'} eq 'hotplug-controller') && + ($i->{'part-id'} eq 'MAX5961')) || + ( ($i->{'part-id'} eq 'PCA9551') && + ($i->{'i2c-master'}->{'host-connected'} eq '1' ))) + { + push @I2CHotPlug, { + 'i2cm_node'=>$i->{'i2c-master'}->{target}->{node}, + 'i2cm_pos' =>$i->{'i2c-master'}->{target}->{position}, + 'i2c_port'=>$i->{'i2c-master'}->{'i2c-port'}, + 'i2c_engine'=>$i->{'i2c-master'}->{'i2c-engine'}, + 'i2c_speed'=>$i->{'speed'}, + 'i2c_part_id'=>$i->{'part-id'}, + 'i2c_slaveAddr'=>$i->{'address'}, + 'i2c_instPath'=>$i->{'instance-path'}}; + } +} + +my $i2c_host_file = open_mrw_file($mrwdir, "${sysname}-host-i2c.xml"); +my $i2cHost = XMLin($i2c_host_file); + +my @I2CHotPlug_Host; +foreach my $i (@{$i2cHost->{'host-i2c-connection'}}) +{ + my $instancePath = $i->{'slave-device'}->{'instance-path'}; + + if( index($instancePath,'MAX5961') != -1 || + index($instancePath,'PCA9551') != -1 ) + { + push @I2CHotPlug_Host, { + 'i2c_slave_path'=>$i->{'slave-device'}->{'instance-path'}, + 'i2c_proc_node'=>$i->{'processor'}->{'target'}->{'node'}, + 'i2c_proc_pos'=>$i->{'processor'}->{'target'}->{'position'}}; + } } # Generate @STargets array from the @Targets array to have the order as shown @@ -2907,6 +2941,9 @@ sub generate_proc # add EEPROM attributes addEepromsProc($sys, $node, $proc); + #add Hot Plug attributes + addHotPlug($sys,$node,$proc); + # add I2C_BUS_SPEED_ARRAY attribute addI2cBusSpeedArray($sys, $node, $proc, "pu"); @@ -5079,6 +5116,108 @@ sub addEepromsProc } } +sub addHotPlug +{ + my ($sys,$node,$proc) = @_; + + #hot plug array is 8x8 array + my @hot_plug_array = (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0); + my $row_count = 8; + my $column_count = 8; + + my $hot_count = 0; + my $tmp_speed = 0x0; + + for my $i ( 0 .. $#I2CHotPlug ) + { + my $drivingProcNode; + my $drivingProcPos; + 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}; + last; + } + } + + + if(!($I2CHotPlug[$i]{'i2cm_node'} == $node) || + !($I2CHotPlug[$i]{'i2cm_pos'} == $proc)) + { + next; + } + if($hot_count < $row_count) + { + #enum for MAX5961 and PCA9551 defined in attribute_types.xml + #as SUPPORTED_HOT_PLUG. + my $part_id_enum = 0x00; + if($I2CHotPlug[$i]{i2c_part_id} eq "MAX5961") + { + $part_id_enum = 0x01; + } + else + { + $part_id_enum = 0x02; + } + + #update array + $tmp_speed = $I2CHotPlug[$i]{i2c_speed}; + + #update array 8 at a time (for up to 8 times) + $hot_plug_array[($hot_count*$row_count)] = + $I2CHotPlug[$i]{i2c_engine}; + $hot_plug_array[($hot_count*$row_count) + 1] = + $I2CHotPlug[$i]{i2c_port}; + $hot_plug_array[($hot_count*$row_count) + 2] = + ($tmp_speed & 0xFF00) >> 8; + $hot_plug_array[($hot_count*$row_count) + 3] = + ($tmp_speed & 0x00FF); + $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_count = $hot_count + 1; + } + else + { + #if we have found more than 8 controllers (not supported) + die "ERROR: addHotPlug: too many hotPlug's: $hot_count\n"; + } + } + + #and then print attribute here + if($hot_count > 0) + { + print " <attribute>\n"; + print " <id>HOT_PLUG_POWER_CONTROLLER_INFO</id>\n"; + print " <default>\n"; + for my $j (0 .. ($row_count - 1)) + { + print " "; + for my $k (0 .. ($column_count - 1)) + { + if($j == ($row_count -1) && $k == ($column_count - 1)) + { + #last entry does not have a comma + print "$hot_plug_array[($j*$row_count) + $k]"; + }else + { + print "$hot_plug_array[($j*$row_count) + $k],"; + } + } + print "\n"; + } + print " </default>\n"; + print " </attribute>\n"; + } +} sub addEepromsCentaur { @@ -5186,6 +5325,14 @@ sub addI2cBusSpeedArray && !($I2Cdevices[$i]{i2cm_uid} eq "I2CM_PROC_PROM1") + && + !( ($I2Cdevices[$i]{i2cm_uid} + eq "I2CM_HOTPLUG") && + ( ($I2Cdevices[$i]{i2c_part_id} + eq "MAX5961") || + ($I2Cdevices[$i]{i2c_part_id} + eq "PCA9551") ) + ) ) || ($I2Cdevices[$i]{i2cm_node} != $node) || ($I2Cdevices[$i]{i2cm_name} != $i2cm_name) ) diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index c961ebe6a..7e6ca15fb 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -14783,6 +14783,59 @@ firmware notes: Platforms should initialize this attribute to AUTO (0)</descript <readable/> <writeable/> </attribute> +<enumerationType> + <id>SUPPORTED_HOT_PLUG</id> + <description> + Enumeration indication which Hot Plug Controllers are supported by + the current system. + </description> + <enumerator> + <name>NA</name> + <value>0</value> + </enumerator> + <enumerator> + <name>MAX5961</name> + <value>0x01</value> + </enumerator> + <enumerator> + <name>PCA9551</name> + <value>0x02</value> + </enumerator> + <default>NA</default> +</enumerationType> + +<attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <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 + 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. + Thus, the information will be 8 bytes. + </description> + <simpleType> + <uint8_t> + <default>0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </uint8_t> + <array>8,8</array> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> + <hwpfToHbAttrMap> + <id>ATTR_HOT_PLUG_POWER_CONTROLLER_INFO</id> + <macro>DIRECT</macro> + </hwpfToHbAttrMap> +</attribute> + +</attributes> <attribute> <id>ISTEP_PAUSE_CONFIG</id> diff --git a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml index f5c85185b..0f507be10 100644 --- a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml @@ -729,6 +729,18 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFF00,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>1,0,1,144,0x6a,1,0,0,1,0,1,144,0x64,1,0,0, + 1,0,1,144,0x72,1,0,0,1,0,1,144,0x6c,1,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> + <attribute> + <id>I2C_BUS_SPEED_ARRAY</id> + <default>1000,1000,0,400,0,0</default> + </attribute> </targetInstance> <!-- Murano n0p0 EX units --> @@ -1612,6 +1624,13 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFF00,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0</default> + </attribute> </targetInstance> <!-- Murano n0p1 EX units --> @@ -2487,6 +2506,18 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFF00,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>1,0,1,144,0x74,1,0,2,1,0,1,144,0x72,1,0,2, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> + <attribute> + <id>I2C_BUS_SPEED_ARRAY</id> + <default>1000,1000,0,400,0,0</default> + </attribute> </targetInstance> <!-- Murano n0p2 EX units --> @@ -3362,6 +3393,12 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFF00,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0</default> + </attribute> </targetInstance> <!-- Murano n0p3 EX units --> diff --git a/src/usr/targeting/common/xmltohb/simics_NAPLES.system.xml b/src/usr/targeting/common/xmltohb/simics_NAPLES.system.xml index 95dcfa026..39dca5dcd 100644 --- a/src/usr/targeting/common/xmltohb/simics_NAPLES.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_NAPLES.system.xml @@ -686,6 +686,13 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFFFF,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> </targetInstance> <!-- Naples n0p0 EX units --> @@ -1549,6 +1556,13 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFFFF,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> </targetInstance> <!-- Naples n0p1 EX units --> @@ -2403,6 +2417,13 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFFFF,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> </targetInstance> <!-- Naples n0p2 EX units --> @@ -3257,6 +3278,13 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFFFF,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> </targetInstance> <!-- Naples n0p3 EX units --> diff --git a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml index 51f9ec778..8adbbc1fa 100644 --- a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml @@ -696,6 +696,13 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFFFF,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>1,1,1,144,0xc4,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> </targetInstance> <!-- Venice n0p0 EX units --> @@ -1931,6 +1938,13 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFFFF,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>1,1,1,144,0xc4,2,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> </targetInstance> <!-- Venice n0p1 EX units --> @@ -3165,6 +3179,13 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFFFF,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>1,1,1,144,0xc4,2,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> </targetInstance> <!-- Venice n0p2 EX units --> @@ -4399,6 +4420,13 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFFFF,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>1,1,1,144,0xc4,2,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> </targetInstance> <!-- Venice n0p3 EX units --> @@ -5633,6 +5661,13 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFFFF,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>1,1,1,144,0xc4,2,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> </targetInstance> <!-- Venice n0p4 EX units --> @@ -6836,6 +6871,13 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFFFF,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>1,1,1,144,0xc4,2,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> </targetInstance> <!-- Venice n0p5 EX units --> @@ -8037,6 +8079,13 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFFFF,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>1,1,1,144,0xc4,2,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> </targetInstance> <!-- Venice n0p6 EX units --> @@ -9238,6 +9287,13 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFFFF,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>1,1,1,144,0xc4,2,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> </targetInstance> <!-- Venice n0p7 EX units --> diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index 6dc4e5848..d2376886b 100644 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -525,6 +525,7 @@ </attribute> <attribute><id>PROC_PCIE_LANE_EQUALIZATION</id></attribute> <attribute><id>CDM_DOMAIN</id><default>FABRIC</default></attribute> + <attribute><id>HOT_PLUG_POWER_CONTROLLER_INFO</id></attribute> </targetType> <targetType> diff --git a/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml b/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml index cfa7fabcf..e65ef9bb4 100644 --- a/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml +++ b/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml @@ -5,7 +5,7 @@ <!-- --> <!-- OpenPOWER HostBoot Project --> <!-- --> -<!-- Contributors Listed Below - COPYRIGHT 2013,2014 --> +<!-- Contributors Listed Below - COPYRIGHT 2013,2015 --> <!-- [+] International Business Machines Corp. --> <!-- --> <!-- --> @@ -520,6 +520,13 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFF00,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> </targetInstance> <!-- Murano n0p0 EX units @@ -964,6 +971,13 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFF00,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> </targetInstance> <!-- Murano n0p1 EX units @@ -1392,6 +1406,13 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFF00,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> </targetInstance> <!-- Murano n2p0 EX units @@ -1821,6 +1842,13 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFF00,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> </targetInstance> <!-- Murano n2p1 EX units diff --git a/src/usr/targeting/common/xmltohb/vbu_NAPLES.system.xml b/src/usr/targeting/common/xmltohb/vbu_NAPLES.system.xml index db96d3242..bdf99c249 100644 --- a/src/usr/targeting/common/xmltohb/vbu_NAPLES.system.xml +++ b/src/usr/targeting/common/xmltohb/vbu_NAPLES.system.xml @@ -5,7 +5,7 @@ <!-- --> <!-- OpenPOWER HostBoot Project --> <!-- --> -<!-- Contributors Listed Below - COPYRIGHT 2014 --> +<!-- Contributors Listed Below - COPYRIGHT 2014,2015 --> <!-- [+] International Business Machines Corp. --> <!-- --> <!-- --> @@ -570,6 +570,13 @@ <default>0</default> </attribute> <!-- End PM_ attributes --> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> </targetInstance> <!-- Naples n0p0 EX units: Define only EX3 for now to preserve AWAN memory (model n_2_b n1_e8014_n8_pC_c1000_cen2_cen018_unopt_1 --> @@ -1081,6 +1088,14 @@ <default>0</default> </attribute> <!-- End PM_ attributes --> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> + </targetInstance> @@ -1507,6 +1522,14 @@ <attribute><id>RNG_BASE_ADDR</id> <default>0x0003FFFF40002000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> + </targetInstance> <!-- Naples n2p0 EX units @@ -1932,6 +1955,14 @@ <attribute><id>RNG_BASE_ADDR</id> <default>0x0003FFFF40003000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> + </targetInstance> <!-- Naples n2p1 EX units diff --git a/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml b/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml index 3f8d55510..d68d561fe 100644 --- a/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml +++ b/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml @@ -583,6 +583,13 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFFFF,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> </targetInstance> <!-- Venice n0p0 EX units --> @@ -1688,6 +1695,13 @@ <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> <default>0xFFFF,0x0000,0xFFFF,0x0000</default> </attribute> + <attribute> + <id>HOT_PLUG_POWER_CONTROLLER_INFO</id> + <default>0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + </default> + </attribute> </targetInstance> <!-- Venice n0p1 EX units --> |