deconfing/gard of OBUS_BRICK/NPU targets

Change-Id: I1388859a81ba8b2e040f6d136eafcf50f1f138ba
RTC:173738
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40218
Reviewed-by: Matthew A. Ploetz <maploetz@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

3 files changed, 55 insertions, 2 deletions

diff --git a/src/usr/targeting/common/Targets.pm b/src/usr/targeting/common/Targets.pm
index 2bdbedf06..f10e4bddb 100644
--- a/src/usr/targeting/common/Targets.pm
+++ b/src/usr/targeting/common/Targets.pm
@@ -41,7 +41,7 @@ use constant
     PERVASIVE_PARENT_MCA_OFFSET => 7,
     PERVASIVE_PARENT_PEC_OFFSET => 13,
     PERVASIVE_PARENT_PHB_OFFSET => 13,
-
+    PERVASIVE_PARENT_NPU_OFFSET => 5,
     NUM_PROCS_PER_GROUP => 4,
 };
 
@@ -859,6 +859,7 @@ sub getFapiName
         $nonFapiTargets{"TPM"}   = "NA";
         $nonFapiTargets{"NVBUS"} = "NA";
         $nonFapiTargets{"OCC"}   = "NA";
+        $nonFapiTargets{"NPU"}   = "NA";
     }
 
     if ($nonFapiTargets{$target} eq "NA")
@@ -961,6 +962,10 @@ sub getPervasiveForUnit
             $unitToPervasive{"OBUS_BRICK$obrick"}
                 = PERVASIVE_PARENT_OBUS_OFFSET + $offset;
         }
+        for my $npu (0..$maxInstance{"NPU"}-1)
+        {
+            $unitToPervasive{"NPU$npu"} = PERVASIVE_PARENT_NPU_OFFSET;
+        }
     }
 
     my $pervasive = "";
diff --git a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
index 3a94aaf9c..ca63e2b18 100644
--- a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
@@ -3277,6 +3277,10 @@
         <default>0</default>
     </attribute>
     <attribute>
+        <id>OPTICS_CONFIG_MODE</id>
+        <default>SMP</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>0</default>
     </attribute>
@@ -3310,6 +3314,10 @@
         <default>1</default>
     </attribute>
     <attribute>
+        <id>OPTICS_CONFIG_MODE</id>
+        <default>SMP</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>1</default>
     </attribute>
@@ -3343,6 +3351,10 @@
         <default>2</default>
     </attribute>
     <attribute>
+        <id>OPTICS_CONFIG_MODE</id>
+        <default>SMP</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>2</default>
     </attribute>
@@ -3376,6 +3388,10 @@
         <default>9</default>
     </attribute>
     <attribute>
+        <id>OPTICS_CONFIG_MODE</id>
+        <default>NVLINK</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>9</default>
     </attribute>
@@ -3409,6 +3425,10 @@
         <default>10</default>
     </attribute>
     <attribute>
+        <id>OPTICS_CONFIG_MODE</id>
+        <default>NVLINK</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>10</default>
     </attribute>
@@ -3442,6 +3462,10 @@
         <default>11</default>
     </attribute>
     <attribute>
+        <id>OPTICS_CONFIG_MODE</id>
+        <default>NVLINK</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>11</default>
     </attribute>
@@ -8664,6 +8688,10 @@
         <default>12</default>
     </attribute>
     <attribute>
+        <id>OPTICS_CONFIG_MODE</id>
+        <default>SMP</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>12</default>
     </attribute>
@@ -8697,6 +8725,10 @@
         <default>13</default>
     </attribute>
     <attribute>
+        <id>OPTICS_CONFIG_MODE</id>
+        <default>SMP</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>13</default>
     </attribute>
@@ -8730,6 +8762,10 @@
         <default>14</default>
     </attribute>
     <attribute>
+        <id>OPTICS_CONFIG_MODE</id>
+        <default>SMP</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>14</default>
     </attribute>
@@ -8763,6 +8799,10 @@
         <default>15</default>
     </attribute>
     <attribute>
+        <id>OPTICS_CONFIG_MODE</id>
+        <default>NVLINK</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>15</default>
     </attribute>
@@ -8796,6 +8836,10 @@
         <default>16</default>
     </attribute>
     <attribute>
+        <id>OPTICS_CONFIG_MODE</id>
+        <default>NVLINK</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>16</default>
     </attribute>
@@ -8829,6 +8873,10 @@
         <default>17</default>
     </attribute>
     <attribute>
+        <id>OPTICS_CONFIG_MODE</id>
+        <default>NVLINK</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>17</default>
     </attribute>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 86ac8ed04..b727c000a 100755
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -2205,7 +2205,7 @@
         <default>0</default> <!-- GARD -->
     </attribute>
     <attribute><id>OBUS_BRICK_LANE_MASK</id></attribute>
-    <attribute><id>OPTICS_CONFIG_MODE</id><default>SMP</default></attribute>
+    <attribute><id>OPTICS_CONFIG_MODE</id></attribute>
     <attribute><id>PARENT_PERVASIVE</id></attribute>
 </targetType>