Changed BMC type chip-bmc-ast2500

RTC:166755
Change-Id: I372efe81ed4eb2089f60cc42ec7d59003155d20b
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42963
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: Donald Washburn <dwashbur@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

5 files changed, 35 insertions, 12 deletions

diff --git a/src/usr/targeting/common/Targets.pm b/src/usr/targeting/common/Targets.pm
index 1a41dde98..f7f707660 100644
--- a/src/usr/targeting/common/Targets.pm
+++ b/src/usr/targeting/common/Targets.pm
@@ -503,6 +503,7 @@ sub buildAffinity
     my $node            = -1;
     my $proc            = -1;
     my $tpm             = -1;
+    my $bmc             = -1;
     my $sys_phys        = "";
     my $node_phys       = "";
     my $node_aff        = "";
@@ -584,6 +585,22 @@ sub buildAffinity
             $self->setAttribute($target, "AFFINITY_PATH", $tpm_aff);
             $self->setAttribute($target, "ORDINAL_ID",    $pos);
         }
+        elsif ($type eq "BMC")
+        {
+            $bmc++;
+
+            $self->{targeting}{SYS}[0]{NODES}[$node]{BMC}[$bmc]{KEY} = $target;
+            my $bmc_phys = $node_phys . "/bmc-$bmc";
+            my $bmc_aff  = $node_aff  . "/bmc-$bmc";
+
+            $self->setHuid($target, $sys_pos, $bmc);
+            $self->setAttribute($target, "FAPI_NAME",getFapiName($type));
+            $self->setAttribute($target, "FAPI_POS",      $pos);
+            $self->setAttribute($target, "PHYS_PATH",     $bmc_phys);
+            $self->setAttribute($target, "AFFINITY_PATH", $bmc_aff);
+            $self->setAttribute($target, "ORDINAL_ID",    $pos);
+
+        }
         elsif ($type eq "MCS")
         {
             $self->setAttribute($target, "VPD_REC_NUM", 0);
@@ -896,6 +913,7 @@ sub getFapiName
         $nonFapiTargets{"NVBUS"} = "NA";
         $nonFapiTargets{"OCC"}   = "NA";
         $nonFapiTargets{"NPU"}   = "NA";
+        $nonFapiTargets{"BMC"}   = "NA";
     }
 
     if ($nonFapiTargets{$target} eq "NA")
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 3acc5c886..84b881671 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -75,9 +75,13 @@
         <value>9</value>
     </enumerator>
     <enumerator>
-        <name>MAX</name>
+        <name>SP</name>
         <value>10</value>
     </enumerator>
+    <enumerator>
+        <name>MAX</name>
+        <value>11</value>
+    </enumerator>
     <default>NA</default>
 </enumerationType>
 
diff --git a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
index 37befea8e..415941956 100644
--- a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
@@ -12313,17 +12313,17 @@
 </targetInstance>
 
 <targetInstance>
-    <id>sys0bmc</id>
-    <type>bmc</type>
+    <id>sys0node0bmc0</id>
+    <type>chip-bmc-ast2500</type>
     <attribute>
     <id>PHYS_PATH</id>
-    <default>physical:sys-0/sp-0</default>
+    <default>physical:sys-0/node-0/bmc-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/sp-0</default>
+        <default>affinity:sys-0/node-0/bmc-0</default>
     </attribute>
-    <attribute><id>HUID</id><default>0x00320000</default></attribute>
+    <attribute><id>HUID</id><default>0x003A0000</default></attribute>
 </targetInstance>
 
 <targetInstance>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 4892d61d6..50732004a 100755
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -2690,10 +2690,10 @@
 
 <targetType>
     <id>sp</id>
-    <parent>chip</parent>
+    <parent>base</parent>
     <attribute>
         <id>CLASS</id>
-        <default>CHIP</default>
+        <default>SP</default>
     </attribute>
     <attribute>
         <id>TYPE</id>
@@ -2702,11 +2702,11 @@
 </targetType>
 
 <targetType>
-    <id>bmc</id>
+    <id>chip-bmc-ast2500</id>
     <parent>sp</parent>
     <attribute>
         <id>TYPE</id>
-        <default>SP</default>
+        <default>BMC</default>
     </attribute>
     <attribute>
         <id>MODEL</id>
diff --git a/src/usr/targeting/common/xmltohb/target_types_openpower.xml b/src/usr/targeting/common/xmltohb/target_types_openpower.xml
index e56f7ab00..f4b5c7208 100644
--- a/src/usr/targeting/common/xmltohb/target_types_openpower.xml
+++ b/src/usr/targeting/common/xmltohb/target_types_openpower.xml
@@ -102,7 +102,7 @@
     <attribute><id>IPMI_SENSORS</id></attribute>
     <attribute>
         <id>GPIO_INFO</id>
-    </attribute>        
+    </attribute>
     <attribute><id>EEPROM_VPD_PRIMARY_INFO</id></attribute>
 </targetTypeExtension>
 
@@ -128,10 +128,11 @@
 </targetTypeExtension>
 
 <targetTypeExtension>
-    <id>bmc</id>
+    <id>chip-bmc-ast2500</id>
     <attribute><id>BMC_MANUFACTURER</id></attribute>
     <attribute><id>BMC_HW_CHIP_TYPE</id></attribute>
     <attribute><id>BMC_SW_TYPE</id></attribute>
+    <attribute><id>FRU_ID</id></attribute>
 </targetTypeExtension>
 
 <targetTypeExtension>