Document Axone NPU configuration

- Updated simics_AXONE.system.xml with the valid target
configuration that we should be using for NPUs in Axone.
- Updated target xml files as well
- Corrected 1 PG rule that no longer applies
- Also modified the OBUS_BRICK layout in simics_AXONE as well

Change-Id: I05c68be027cd4da39afabee04fefbb266b87c5fb
RTC: 208518
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/76510
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Glenn Miles <milesg@ibm.com>
Tested-by: Jenkins Server <pfd-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>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

4 files changed, 494 insertions, 258 deletions

diff --git a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml
index 011d02371..51db0299c 100644
--- a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml
@@ -53,13 +53,19 @@
      *     PEC 2 has 3 PHBs
      * Each Axone has 1 XBUS chiplet (1 XBUS Chiplet translates to multiple xbus units)
      * Each Axone has 4 OBUS (OB0 to OB3)
-     *     Each OBUS has 3 OBUS_BRICK
+     *     Each OBUS has up to 2 OBUS_BRICKs
+     *         OBUS0 has 2 OBUS_BRICKs
+     *         OBUS1 has 1 OBUS_BRICK
+     *         OBUS2 has 1 OBUS_BRICK
+     *         OBUS3 has 2 OBUS_BRICKs
+     * Each Axone has 3 NPU units, each associated with 2 OBUS_BRICKs
+     *     NPU0 is associated with OBUS0, used for NVLINK ( 4 x4 links).
+     *     NPU1 is associated with OBUS1/2, used for OpenCAPI ( 1 x8 link).
+     *     NPU2 is associated with OBUS3, used for NVLINK ( 4 x4 links).
      * Each Axone has 21 PPE units (including the SBE):
      *    1 SBE, 1 Powerbus/Fabric PPE, 4 GPEs, 12 CMEs, and 3 IO PPEs.
      * Each chiplet existing in an Axone has 1 equivalent PERV unit
-     * Each Axone has 2 CAPP units  ##TBD## has 2 sys0node0proc0capp0 units
-     *    with same target ID...input MRW has capp0 and capp1...something
-     *    wrong in the processMrw.pl (same observed for Witherspoon)
+     * Each Axone has 1 CAPP unit
      * Each Axone has 1 OCC unit
 
     - p9Proc0(axone chip)
@@ -3487,11 +3493,11 @@
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0proc0obus0obus_brick2</id>
+    <id>sys0node0proc0obus1obus_brick0</id>
     <type>unit-obus-brick-axone</type>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/obus-0/obus_brick-2</default>
+        <default>affinity:sys-0/node-0/proc-0/obus-1/obus_brick-0</default>
     </attribute>
     <attribute>
         <id>CHIP_UNIT</id>
@@ -3499,7 +3505,7 @@
     </attribute>
     <attribute>
         <id>CHIPLET_ID</id>
-        <default>0x09</default>
+        <default>0x0A</default>
     </attribute>
     <attribute>
         <id>FAPI_NAME</id>
@@ -3519,24 +3525,24 @@
     </attribute>
     <attribute>
         <id>PARENT_PERVASIVE</id>
-        <default>physical:sys-0/node-0/proc-0/perv-9</default>
+        <default>physical:sys-0/node-0/proc-0/perv-10</default>
     </attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/obus-0/obus_brick-2</default>
+        <default>physical:sys-0/node-0/proc-0/obus-1/obus_brick-0</default>
     </attribute>
     <attribute>
         <id>REL_POS</id>
-        <default>2</default>
+        <default>0</default>
     </attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0proc0obus1obus_brick0</id>
+    <id>sys0node0proc0obus2obus_brick0</id>
     <type>unit-obus-brick-axone</type>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/obus-1/obus_brick-0</default>
+        <default>affinity:sys-0/node-0/proc-0/obus-2/obus_brick-0</default>
     </attribute>
     <attribute>
         <id>CHIP_UNIT</id>
@@ -3544,15 +3550,15 @@
     </attribute>
     <attribute>
         <id>CHIPLET_ID</id>
-        <default>0x0A</default>
+        <default>0x0B</default>
     </attribute>
     <attribute>
         <id>FAPI_NAME</id>
-        <default>pu.obus_brick:k0:n0:s0:p00:c3</default>
+        <default>pu.obus_brick:k0:n0:s0:p00:c4</default>
     </attribute>
     <attribute>
         <id>HUID</id>
-        <default>0x00420003</default>
+        <default>0x00420004</default>
     </attribute>
     <attribute>
         <id>OBUS_SLOT_INDEX</id>
@@ -3564,11 +3570,11 @@
     </attribute>
     <attribute>
         <id>PARENT_PERVASIVE</id>
-        <default>physical:sys-0/node-0/proc-0/perv-10</default>
+        <default>physical:sys-0/node-0/proc-0/perv-11</default>
     </attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/obus-1/obus_brick-0</default>
+        <default>physical:sys-0/node-0/proc-0/obus-2/obus_brick-0</default>
     </attribute>
     <attribute>
         <id>REL_POS</id>
@@ -3577,11 +3583,11 @@
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0proc0obus1obus_brick1</id>
+    <id>sys0node0proc0obus3obus_brick0</id>
     <type>unit-obus-brick-axone</type>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/obus-1/obus_brick-1</default>
+        <default>affinity:sys-0/node-0/proc-0/obus-3/obus_brick-0</default>
     </attribute>
     <attribute>
         <id>CHIP_UNIT</id>
@@ -3589,15 +3595,15 @@
     </attribute>
     <attribute>
         <id>CHIPLET_ID</id>
-        <default>0x0A</default>
+        <default>0x0C</default>
     </attribute>
     <attribute>
         <id>FAPI_NAME</id>
-        <default>pu.obus_brick:k0:n0:s0:p00:c4</default>
+        <default>pu.obus_brick:k0:n0:s0:p00:c6</default>
     </attribute>
     <attribute>
         <id>HUID</id>
-        <default>0x00420004</default>
+        <default>0x00420006</default>
     </attribute>
     <attribute>
         <id>OBUS_SLOT_INDEX</id>
@@ -3609,24 +3615,24 @@
     </attribute>
     <attribute>
         <id>PARENT_PERVASIVE</id>
-        <default>physical:sys-0/node-0/proc-0/perv-10</default>
+        <default>physical:sys-0/node-0/proc-0/perv-12</default>
     </attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/obus-1/obus_brick-1</default>
+        <default>physical:sys-0/node-0/proc-0/obus-3/obus_brick-0</default>
     </attribute>
     <attribute>
         <id>REL_POS</id>
-        <default>1</default>
+        <default>0</default>
     </attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0proc0obus1obus_brick2</id>
+    <id>sys0node0proc0obus3obus_brick1</id>
     <type>unit-obus-brick-axone</type>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/obus-1/obus_brick-2</default>
+        <default>affinity:sys-0/node-0/proc-0/obus-3/obus_brick-1</default>
     </attribute>
     <attribute>
         <id>CHIP_UNIT</id>
@@ -3634,7 +3640,7 @@
     </attribute>
     <attribute>
         <id>CHIPLET_ID</id>
-        <default>0x0A</default>
+        <default>0x0C</default>
     </attribute>
     <attribute>
         <id>FAPI_NAME</id>
@@ -3642,7 +3648,7 @@
     </attribute>
     <attribute>
         <id>HUID</id>
-        <default>0x00420005</default>
+        <default>0x00420007</default>
     </attribute>
     <attribute>
         <id>OBUS_SLOT_INDEX</id>
@@ -3654,56 +3660,53 @@
     </attribute>
     <attribute>
         <id>PARENT_PERVASIVE</id>
-        <default>physical:sys-0/node-0/proc-0/perv-10</default>
+        <default>physical:sys-0/node-0/proc-0/perv-12</default>
     </attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/obus-1/obus_brick-2</default>
+        <default>physical:sys-0/node-0/proc-0/obus-3/obus_brick-1</default>
     </attribute>
     <attribute>
         <id>REL_POS</id>
-        <default>3</default>
+        <default>1</default>
     </attribute>
 </targetInstance>
 
+
+<!-- ===================================================================== -->
+<!-- NPU Units for node 0 -->
+<!-- ===================================================================== -->
 <targetInstance>
-    <id>sys0node0proc0obus2obus_brick0</id>
-    <type>unit-obus-brick-axone</type>
+    <!-- Note : NPU0 covers OBUS0 -->
+    <id>sys0node0proc0npu0</id>
+    <type>unit-npu-axone</type>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/obus-2/obus_brick-0</default>
+        <default>affinity:sys-0/node-0/proc-0/npu-0</default>
     </attribute>
     <attribute>
         <id>CHIP_UNIT</id>
-        <default>6</default>
+        <default>0</default>
     </attribute>
     <attribute>
         <id>CHIPLET_ID</id>
-        <default>0x0B</default>
-    </attribute>
-    <attribute>
-        <id>FAPI_NAME</id>
-        <default>pu.obus_brick:k0:n0:s0:p00:c6</default>
+        <default>0x05</default>
     </attribute>
     <attribute>
         <id>HUID</id>
-        <default>0x00420006</default>
-    </attribute>
-    <attribute>
-        <id>OBUS_SLOT_INDEX</id>
-        <default>0xFF</default>
+        <default>0x00430000</default>
     </attribute>
     <attribute>
         <id>ORDINAL_ID</id>
-        <default>6</default>
+        <default>0</default>
     </attribute>
     <attribute>
         <id>PARENT_PERVASIVE</id>
-        <default>physical:sys-0/node-0/proc-0/perv-11</default>
+        <default>physical:sys-0/node-0/proc-0/perv-5</default>
     </attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/obus-2/obus_brick-0</default>
+        <default>physical:sys-0/node-0/proc-0/npu-0</default>
     </attribute>
     <attribute>
         <id>REL_POS</id>
@@ -3712,228 +3715,114 @@
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0proc0obus2obus_brick1</id>
-    <type>unit-obus-brick-axone</type>
+    <!-- Note : NPU1 covers OBUS1 and OBUS2, but OBUS2 isn't wired out -->
+    <!--        on the Swift configuration -->
+    <id>sys0node0proc0npu1</id>
+    <type>unit-npu-axone</type>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/obus-2/obus_brick-1</default>
+        <default>affinity:sys-0/node-0/proc-0/npu-1</default>
     </attribute>
     <attribute>
         <id>CHIP_UNIT</id>
-        <default>7</default>
-    </attribute>
-    <attribute>
-        <id>CHIPLET_ID</id>
-        <default>0x0B</default>
-    </attribute>
-    <attribute>
-        <id>FAPI_NAME</id>
-        <default>pu.obus_brick:k0:n0:s0:p00:c7</default>
-    </attribute>
-    <attribute>
-        <id>HUID</id>
-        <default>0x00420007</default>
-    </attribute>
-    <attribute>
-        <id>OBUS_SLOT_INDEX</id>
-        <default>0xFF</default>
-    </attribute>
-    <attribute>
-        <id>ORDINAL_ID</id>
-        <default>7</default>
-    </attribute>
-    <attribute>
-        <id>PARENT_PERVASIVE</id>
-        <default>physical:sys-0/node-0/proc-0/perv-11</default>
-    </attribute>
-    <attribute>
-        <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/obus-2/obus_brick-1</default>
-    </attribute>
-    <attribute>
-        <id>REL_POS</id>
         <default>1</default>
     </attribute>
-</targetInstance>
-
-<targetInstance>
-    <id>sys0node0proc0obus2obus_brick2</id>
-    <type>unit-obus-brick-axone</type>
-    <attribute>
-        <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/obus-2/obus_brick-2</default>
-    </attribute>
-    <attribute>
-        <id>CHIP_UNIT</id>
-        <default>8</default>
-    </attribute>
     <attribute>
         <id>CHIPLET_ID</id>
-        <default>0x0B</default>
+        <default>0x05</default>
     </attribute>
     <attribute>
-        <id>FAPI_NAME</id>
-        <default>pu.obus_brick:k0:n0:s0:p00:c8</default>
+        <id>CLASS</id>
+        <default>UNIT</default>
     </attribute>
     <attribute>
         <id>HUID</id>
-        <default>0x00420008</default>
-    </attribute>
-    <attribute>
-        <id>OBUS_SLOT_INDEX</id>
-        <default>0xFF</default>
+        <default>0x00430001</default>
     </attribute>
     <attribute>
         <id>ORDINAL_ID</id>
-        <default>8</default>
+        <default>1</default>
     </attribute>
     <attribute>
         <id>PARENT_PERVASIVE</id>
-        <default>physical:sys-0/node-0/proc-0/perv-11</default>
+        <default>physical:sys-0/node-0/proc-0/perv-5</default>
     </attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/obus-2/obus_brick-2</default>
+        <default>physical:sys-0/node-0/proc-0/npu-1</default>
     </attribute>
     <attribute>
-        <id>REL_POS</id>
-        <default>2</default>
-    </attribute>
-</targetInstance>
-
-<targetInstance>
-    <id>sys0node0proc0obus3obus_brick0</id>
-    <type>unit-obus-brick-axone</type>
-    <attribute>
-        <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/obus-3/obus_brick-0</default>
-    </attribute>
-    <attribute>
-        <id>CHIP_UNIT</id>
-        <default>9</default>
-    </attribute>
-    <attribute>
-        <id>CHIPLET_ID</id>
-        <default>0x0C</default>
-    </attribute>
-    <attribute>
-        <id>FAPI_NAME</id>
-        <default>pu.obus_brick:k0:n0:s0:p00:c9</default>
-    </attribute>
-    <attribute>
-        <id>HUID</id>
-        <default>0x00420009</default>
-    </attribute>
-    <attribute>
-        <id>OBUS_SLOT_INDEX</id>
-        <default>0xFF</default>
-    </attribute>
-    <attribute>
-        <id>ORDINAL_ID</id>
-        <default>9</default>
-    </attribute>
-    <attribute>
-        <id>PARENT_PERVASIVE</id>
-        <default>physical:sys-0/node-0/proc-0/perv-12</default>
+        <id>PRIMARY_CAPABILITIES</id>
+        <default>
+            <field><id>reserved</id><value>0</value></field>
+            <field><id>supportsFsiScom</id><value>1</value></field>
+            <field><id>supportsInbandScom</id><value>0</value></field>
+            <field><id>supportsXscom</id><value>1</value></field>
+        </default>
     </attribute>
     <attribute>
-        <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/obus-3/obus_brick-0</default>
+        <id>REL_POS</id>
+        <default>1</default>
     </attribute>
     <attribute>
-        <id>REL_POS</id>
-        <default>0</default>
+        <id>TYPE</id>
+        <default>NPU</default>
     </attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0proc0obus3obus_brick1</id>
-    <type>unit-obus-brick-axone</type>
+    <!-- Note : NPU2 covers OBUS3 -->
+    <id>sys0node0proc0npu2</id>
+    <type>unit-npu-axone</type>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/obus-3/obus_brick-1</default>
+        <default>affinity:sys-0/node-0/proc-0/npu-2</default>
     </attribute>
     <attribute>
         <id>CHIP_UNIT</id>
-        <default>10</default>
+        <default>2</default>
     </attribute>
     <attribute>
         <id>CHIPLET_ID</id>
-        <default>0x0C</default>
+        <default>0x03</default>
     </attribute>
     <attribute>
-        <id>FAPI_NAME</id>
-        <default>pu.obus_brick:k0:n0:s0:p00:c10</default>
+        <id>CLASS</id>
+        <default>UNIT</default>
     </attribute>
     <attribute>
         <id>HUID</id>
-        <default>0x0042000A</default>
-    </attribute>
-    <attribute>
-        <id>OBUS_SLOT_INDEX</id>
-        <default>0xFF</default>
+        <default>0x00430002</default>
     </attribute>
     <attribute>
         <id>ORDINAL_ID</id>
-        <default>10</default>
+        <default>2</default>
     </attribute>
     <attribute>
         <id>PARENT_PERVASIVE</id>
-        <default>physical:sys-0/node-0/proc-0/perv-12</default>
+        <default>physical:sys-0/node-0/proc-0/perv-3</default>
     </attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/obus-3/obus_brick-1</default>
-    </attribute>
-    <attribute>
-        <id>REL_POS</id>
-        <default>1</default>
-    </attribute>
-</targetInstance>
-
-<targetInstance>
-    <id>sys0node0proc0obus3obus_brick2</id>
-    <type>unit-obus-brick-axone</type>
-    <attribute>
-        <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/obus-3/obus_brick-2</default>
-    </attribute>
-    <attribute>
-        <id>CHIP_UNIT</id>
-        <default>11</default>
-    </attribute>
-    <attribute>
-        <id>CHIPLET_ID</id>
-        <default>0x0C</default>
-    </attribute>
-    <attribute>
-        <id>FAPI_NAME</id>
-        <default>pu.obus_brick:k0:n0:s0:p00:c11</default>
-    </attribute>
-    <attribute>
-        <id>HUID</id>
-        <default>0x0042000B</default>
-    </attribute>
-    <attribute>
-        <id>OBUS_SLOT_INDEX</id>
-        <default>0xFF</default>
+        <default>physical:sys-0/node-0/proc-0/npu-2</default>
     </attribute>
     <attribute>
-        <id>ORDINAL_ID</id>
-        <default>11</default>
-    </attribute>
-    <attribute>
-        <id>PARENT_PERVASIVE</id>
-        <default>physical:sys-0/node-0/proc-0/perv-12</default>
-    </attribute>
-    <attribute>
-        <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/obus-3/obus_brick-2</default>
+        <id>PRIMARY_CAPABILITIES</id>
+        <default>
+            <field><id>reserved</id><value>0</value></field>
+            <field><id>supportsFsiScom</id><value>1</value></field>
+            <field><id>supportsInbandScom</id><value>0</value></field>
+            <field><id>supportsXscom</id><value>1</value></field>
+        </default>
     </attribute>
     <attribute>
         <id>REL_POS</id>
         <default>2</default>
     </attribute>
+    <attribute>
+        <id>TYPE</id>
+        <default>NPU</default>
+    </attribute>
 </targetInstance>
 
 <!-- ===================================================================== -->
@@ -4069,54 +3958,6 @@
     </attribute>
 </targetInstance>
 
-<targetInstance>
-    <id>sys0node0proc0capp1</id>
-    <type>unit-capp-axone</type>
-    <attribute>
-        <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/capp-1</default>
-    </attribute>
-    <attribute>
-        <id>CHIP_UNIT</id>
-        <default>1</default>
-    </attribute>
-    <attribute>
-        <id>CHIPLET_ID</id>
-        <default>4</default>
-    </attribute>
-    <attribute>
-        <id>FAPI_NAME</id>
-        <default>pu.capp:k0:n0:s0:p00:c1</default>
-    </attribute>
-    <attribute>
-        <id>FAPI_POS</id>
-        <default>1</default>
-    </attribute>
-    <attribute>
-        <id>HUID</id>
-        <default>0x00210001</default>
-    </attribute>
-    <attribute>
-        <id>MRU_ID</id>
-        <default>0x02090001</default>
-    </attribute>
-    <attribute>
-        <id>ORDINAL_ID</id>
-        <default>1</default>
-    </attribute>
-    <attribute>
-        <id>PARENT_PERVASIVE</id>
-        <default>physical:sys-0/node-0/proc-0/perv-2</default>
-    </attribute>
-    <attribute>
-        <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/capp-1</default>
-    </attribute>
-    <attribute>
-        <id>REL_POS</id>
-        <default>1</default>
-    </attribute>
-</targetInstance>
 
 <!-- ===================================================================== -->
 <!-- OCC Units -->
@@ -12584,6 +12425,122 @@
 </targetInstance>
 
 <targetInstance>
+    <id>sys0node0proc0perv10</id>
+    <type>unit-perv-axone</type>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/perv-10</default>
+    </attribute>
+    <attribute>
+        <id>CHIP_UNIT</id>
+        <default>10</default>
+    </attribute>
+    <attribute>
+        <id>CHIPLET_ID</id>
+        <default>10</default>
+    </attribute>
+    <attribute>
+        <id>CLASS</id>
+        <default>UNIT</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_NAME</id>
+        <default>pu.perv:k0:n0:s0:p00:c10</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>10</default>
+    </attribute>
+    <attribute>
+        <id>HUID</id>
+        <default>0x002C000A</default>
+    </attribute>
+    <attribute>
+        <id>ORDINAL_ID</id>
+        <default>10</default>
+    </attribute>
+    <attribute>
+        <id>PHYS_PATH</id>
+        <default>physical:sys-0/node-0/proc-0/perv-10</default>
+    </attribute>
+    <attribute>
+        <id>PRIMARY_CAPABILITIES</id>
+        <default>
+            <field><id>reserved</id><value>0</value></field>
+            <field><id>supportsFsiScom</id><value>1</value></field>
+            <field><id>supportsInbandScom</id><value>0</value></field>
+            <field><id>supportsXscom</id><value>1</value></field>
+        </default>
+    </attribute>
+    <attribute>
+        <id>REL_POS</id>
+        <default>10</default>
+    </attribute>
+    <attribute>
+        <id>TYPE</id>
+        <default>PERV</default>
+    </attribute>
+</targetInstance>
+
+<targetInstance>
+    <id>sys0node0proc0perv11</id>
+    <type>unit-perv-axone</type>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/perv-11</default>
+    </attribute>
+    <attribute>
+        <id>CHIP_UNIT</id>
+        <default>11</default>
+    </attribute>
+    <attribute>
+        <id>CHIPLET_ID</id>
+        <default>11</default>
+    </attribute>
+    <attribute>
+        <id>CLASS</id>
+        <default>UNIT</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_NAME</id>
+        <default>pu.perv:k0:n0:s0:p00:c11</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>11</default>
+    </attribute>
+    <attribute>
+        <id>HUID</id>
+        <default>0x002C000B</default>
+    </attribute>
+    <attribute>
+        <id>ORDINAL_ID</id>
+        <default>11</default>
+    </attribute>
+    <attribute>
+        <id>PHYS_PATH</id>
+        <default>physical:sys-0/node-0/proc-0/perv-11</default>
+    </attribute>
+    <attribute>
+        <id>PRIMARY_CAPABILITIES</id>
+        <default>
+            <field><id>reserved</id><value>0</value></field>
+            <field><id>supportsFsiScom</id><value>1</value></field>
+            <field><id>supportsInbandScom</id><value>0</value></field>
+            <field><id>supportsXscom</id><value>1</value></field>
+        </default>
+    </attribute>
+    <attribute>
+        <id>REL_POS</id>
+        <default>11</default>
+    </attribute>
+    <attribute>
+        <id>TYPE</id>
+        <default>PERV</default>
+    </attribute>
+</targetInstance>
+
+<targetInstance>
     <id>sys0node0proc0perv12</id>
     <type>unit-perv-axone</type>
     <attribute>
diff --git a/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml b/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml
index 0fbb351c3..17aee231d 100644
--- a/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml
@@ -8955,6 +8955,138 @@
         <default>PERV</default>
     </attribute>
 </targetInstance>
+
+<targetInstance>
+    <id>sys0node0proc0perv10</id>
+    <type>unit-perv-cumulus</type>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/perv-10</default>
+    </attribute>
+
+
+    <attribute>
+        <id>CHIP_UNIT</id>
+        <default>10</default>
+    </attribute>
+    <attribute>
+        <id>CHIPLET_ID</id>
+        <default>10</default>
+    </attribute>
+    <attribute>
+        <id>CLASS</id>
+        <default>UNIT</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_NAME</id>
+        <default>pu.perv:k0:n0:s0:p00:c10</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>10</default>
+    </attribute>
+    <attribute>
+        <id>HUID</id>
+        <default>0x002C000A</default>
+    </attribute>
+
+
+
+
+
+    <attribute>
+        <id>ORDINAL_ID</id>
+        <default>10</default>
+    </attribute>
+    <attribute>
+        <id>PHYS_PATH</id>
+        <default>physical:sys-0/node-0/proc-0/perv-10</default>
+    </attribute>
+    <attribute>
+        <id>PRIMARY_CAPABILITIES</id>
+        <default>
+            <field><id>reserved</id><value>0</value></field>
+            <field><id>supportsFsiScom</id><value>1</value></field>
+            <field><id>supportsInbandScom</id><value>0</value></field>
+            <field><id>supportsXscom</id><value>1</value></field>
+        </default>
+    </attribute>
+    <attribute>
+        <id>REL_POS</id>
+        <default>10</default>
+    </attribute>
+    <attribute>
+        <id>RESOURCE_IS_CRITICAL</id>
+        <default>0</default>
+    </attribute>
+    <attribute>
+        <id>TYPE</id>
+        <default>PERV</default>
+    </attribute>
+</targetInstance>
+
+<targetInstance>
+    <id>sys0node0proc0perv11</id>
+    <type>unit-perv-cumulus</type>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/perv-11</default>
+    </attribute>
+    <attribute>
+        <id>CHIP_UNIT</id>
+        <default>11</default>
+    </attribute>
+    <attribute>
+        <id>CHIPLET_ID</id>
+        <default>11</default>
+    </attribute>
+    <attribute>
+        <id>CLASS</id>
+        <default>UNIT</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_NAME</id>
+        <default>pu.perv:k0:n0:s0:p00:c11</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>11</default>
+    </attribute>
+    <attribute>
+        <id>HUID</id>
+        <default>0x002C000B</default>
+    </attribute>
+    <attribute>
+        <id>ORDINAL_ID</id>
+        <default>11</default>
+    </attribute>
+    <attribute>
+        <id>PHYS_PATH</id>
+        <default>physical:sys-0/node-0/proc-0/perv-11</default>
+    </attribute>
+    <attribute>
+        <id>PRIMARY_CAPABILITIES</id>
+        <default>
+            <field><id>reserved</id><value>0</value></field>
+            <field><id>supportsFsiScom</id><value>1</value></field>
+            <field><id>supportsInbandScom</id><value>0</value></field>
+            <field><id>supportsXscom</id><value>1</value></field>
+        </default>
+    </attribute>
+    <attribute>
+        <id>REL_POS</id>
+        <default>11</default>
+    </attribute>
+    <attribute>
+        <id>RESOURCE_IS_CRITICAL</id>
+        <default>0</default>
+    </attribute>
+    <attribute>
+        <id>TYPE</id>
+        <default>PERV</default>
+    </attribute>
+</targetInstance>
+
 <targetInstance>
     <id>sys0node0proc0perv12</id>
     <type>unit-perv-cumulus</type>
diff --git a/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml b/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml
index d7f4cfa10..6e0177ea2 100644
--- a/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml
@@ -8947,6 +8947,134 @@
         <default>PERV</default>
     </attribute>
 </targetInstance>
+
+
+<targetInstance>
+    <id>sys0node0proc0perv10</id>
+    <type>unit-perv-cumulus</type>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/perv-10</default>
+    </attribute>
+
+
+    <attribute>
+        <id>CHIP_UNIT</id>
+        <default>10</default>
+    </attribute>
+    <attribute>
+        <id>CHIPLET_ID</id>
+        <default>10</default>
+    </attribute>
+    <attribute>
+        <id>CLASS</id>
+        <default>UNIT</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_NAME</id>
+        <default>pu.perv:k0:n0:s0:p00:c10</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>10</default>
+    </attribute>
+    <attribute>
+        <id>HUID</id>
+        <default>0x002C000A</default>
+    </attribute>
+    <attribute>
+        <id>ORDINAL_ID</id>
+        <default>10</default>
+    </attribute>
+    <attribute>
+        <id>PHYS_PATH</id>
+        <default>physical:sys-0/node-0/proc-0/perv-10</default>
+    </attribute>
+    <attribute>
+        <id>PRIMARY_CAPABILITIES</id>
+        <default>
+            <field><id>reserved</id><value>0</value></field>
+            <field><id>supportsFsiScom</id><value>1</value></field>
+            <field><id>supportsInbandScom</id><value>0</value></field>
+            <field><id>supportsXscom</id><value>1</value></field>
+        </default>
+    </attribute>
+    <attribute>
+        <id>REL_POS</id>
+        <default>10</default>
+    </attribute>
+    <attribute>
+        <id>RESOURCE_IS_CRITICAL</id>
+        <default>0</default>
+    </attribute>
+    <attribute>
+        <id>TYPE</id>
+        <default>PERV</default>
+    </attribute>
+</targetInstance>
+
+<targetInstance>
+    <id>sys0node0proc0perv11</id>
+    <type>unit-perv-cumulus</type>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/perv-11</default>
+    </attribute>
+    <attribute>
+        <id>CHIP_UNIT</id>
+        <default>11</default>
+    </attribute>
+    <attribute>
+        <id>CHIPLET_ID</id>
+        <default>11</default>
+    </attribute>
+    <attribute>
+        <id>CLASS</id>
+        <default>UNIT</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_NAME</id>
+        <default>pu.perv:k0:n0:s0:p00:c11</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>11</default>
+    </attribute>
+    <attribute>
+        <id>HUID</id>
+        <default>0x002C000B</default>
+    </attribute>
+    <attribute>
+        <id>ORDINAL_ID</id>
+        <default>11</default>
+    </attribute>
+    <attribute>
+        <id>PHYS_PATH</id>
+        <default>physical:sys-0/node-0/proc-0/perv-11</default>
+    </attribute>
+    <attribute>
+        <id>PRIMARY_CAPABILITIES</id>
+        <default>
+            <field><id>reserved</id><value>0</value></field>
+            <field><id>supportsFsiScom</id><value>1</value></field>
+            <field><id>supportsInbandScom</id><value>0</value></field>
+            <field><id>supportsXscom</id><value>1</value></field>
+        </default>
+    </attribute>
+    <attribute>
+        <id>REL_POS</id>
+        <default>11</default>
+    </attribute>
+    <attribute>
+        <id>RESOURCE_IS_CRITICAL</id>
+        <default>0</default>
+    </attribute>
+    <attribute>
+        <id>TYPE</id>
+        <default>PERV</default>
+    </attribute>
+</targetInstance>
+
 <targetInstance>
     <id>sys0node0proc0perv12</id>
     <type>unit-perv-cumulus</type>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 190ea86fc..3ebc3b5c7 100644
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -3111,6 +3111,7 @@
     </attribute>
   </targetType>
 
+  <!-- Three NPUs per proc -->
   <targetType>
     <id>unit-npu-axone</id>
     <parent>unit-npu-power9</parent>
@@ -3118,8 +3119,26 @@
       <id>MODEL</id>
       <default>AXONE</default>
     </attribute>
+    <attribute>
+      <default>
+        <field>
+          <id>childRollupAllowed</id>
+          <value>1</value>
+        </field>
+        <field>
+          <id>deconfigureParent</id>
+          <value>1</value>
+        </field>
+        <field>
+          <id>valid</id>
+          <value>1</value>
+        </field>
+      </default>
+      <id>PARENT_DECONFIG_RULES</id>
+    </attribute>
   </targetType>
 
+  <!-- One NPU per proc -->
   <targetType>
     <id>unit-npu-cumulus</id>
     <parent>unit-npu-power9</parent>
@@ -3129,6 +3148,7 @@
     </attribute>
   </targetType>
 
+  <!-- One NPU per proc -->
   <targetType>
     <id>unit-npu-nimbus</id>
     <parent>unit-npu-power9</parent>
@@ -3138,7 +3158,6 @@
     </attribute>
   </targetType>
 
-  <!-- One NPU per proc -->
   <targetType>
     <id>unit-npu-power9</id>
     <parent>unit</parent>