unfence inter-enclosure Abus links

Change-Id: I161daac8071995132cabbea7a996eecf1aa50a9d
RTC: 63132
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4471
Tested-by: Jenkins Server
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

12 files changed, 390 insertions, 13 deletions

diff --git a/src/include/usr/isteps/istep18list.H b/src/include/usr/isteps/istep18list.H
index 48bd78c78..2a735462b 100644
--- a/src/include/usr/isteps/istep18list.H
+++ b/src/include/usr/isteps/istep18list.H
@@ -224,6 +224,7 @@ const DepModInfo  g_istep18Dependancies = {
     {
         DEP_LIB(libestablish_system_smp.so),
         DEP_LIB(libtod_init.so),
+        DEP_LIB(libedi_ei_initialization.so),
         { 0 },
     }
 };
diff --git a/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C b/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C
index ccb463909..2bfadc164 100644
--- a/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C
+++ b/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C
@@ -838,5 +838,74 @@ void*    call_proc_fab_iovalid( void    *io_pArgs )
     return l_StepError.getErrorHandle();
 }
 
+//
+//  function to unfence inter-enclosure abus links
+//
+errlHndl_t  smp_unfencing_inter_enclosure_abus_links()
+{
+    errlHndl_t l_errl = NULL;
+
+    TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+               "smp_unfencing_inter_enclosure_abus_links entry" );
+
+    // Get all chip/chiplet targets
+    TARGETING::TargetHandleList l_cpuTargetList;
+    getAllChips(l_cpuTargetList, TYPE_PROC);
+
+    std::vector<proc_fab_iovalid_proc_chip> l_smp;
+
+    for (TargetHandleList::const_iterator l_cpu_iter = l_cpuTargetList.begin();
+         l_cpu_iter != l_cpuTargetList.end();
+         ++l_cpu_iter)
+    {
+        proc_fab_iovalid_proc_chip l_procEntry;
+
+        TARGETING::TargetHandle_t l_pTarget = *l_cpu_iter;
+        fapi::Target l_fapiproc_target(TARGET_TYPE_PROC_CHIP, l_pTarget);
+
+        l_procEntry.this_chip = l_fapiproc_target;
+        l_procEntry.a0 = false;
+        l_procEntry.a1 = false;
+        l_procEntry.a2 = false;
+        l_procEntry.x0 = false;
+        l_procEntry.x1 = false;
+        l_procEntry.x2 = false;
+        l_procEntry.x3 = false;
+
+        TARGETING::TargetHandleList l_abuses;
+        getChildChiplets( l_abuses, l_pTarget, TYPE_ABUS );
+
+        for (TargetHandleList::const_iterator l_abus_iter = l_abuses.begin();
+            l_abus_iter != l_abuses.end();
+            ++l_abus_iter)
+        {
+            TARGETING::TargetHandle_t l_pAbusTarget = *l_abus_iter;
+            ATTR_CHIP_UNIT_type l_srcID;
+            ATTR_IS_INTER_ENCLOSURE_BUS_type l_flag;
+            l_srcID = l_pAbusTarget->getAttr<ATTR_CHIP_UNIT>();
+            l_flag = l_pAbusTarget->getAttr<ATTR_IS_INTER_ENCLOSURE_BUS>();
+            switch (l_srcID)
+            {
+                case 0: l_procEntry.a0 = l_flag ? true : false; break;
+                case 1: l_procEntry.a1 = l_flag ? true : false; break;
+                case 2: l_procEntry.a2 = l_flag ? true : false; break;
+               default: break;
+            }
+        }
+
+        l_smp.push_back(l_procEntry);
+    }
+
+    FAPI_INVOKE_HWP( l_errl, proc_fab_iovalid, l_smp, true );
+
+    TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
+                "%s : proc_fab_iovalid HWP.",
+                (l_errl ? "ERROR" : "SUCCESS"));
+
+    TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+               "smp_unfencing_inter_enclosure_abus_links exit" );
+
+    return l_errl;
+}
 
 };   // end namespace
diff --git a/src/usr/hwpf/hwp/edi_ei_initialization/smp_unfencing_inter_enclosure_abus_links.H b/src/usr/hwpf/hwp/edi_ei_initialization/smp_unfencing_inter_enclosure_abus_links.H
new file mode 100644
index 000000000..724586868
--- /dev/null
+++ b/src/usr/hwpf/hwp/edi_ei_initialization/smp_unfencing_inter_enclosure_abus_links.H
@@ -0,0 +1,43 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/hwpf/hwp/edi_ei_initialization/smp_unfencing_inter_enclosure_abus_links.H $ */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2013                   */
+/*                                                                        */
+/* p1                                                                     */
+/*                                                                        */
+/* Object Code Only (OCO) source materials                                */
+/* Licensed Internal Code Source Materials                                */
+/* IBM HostBoot Licensed Internal Code                                    */
+/*                                                                        */
+/* The source code for this program is not published or otherwise         */
+/* divested of its trade secrets, irrespective of what has been           */
+/* deposited with the U.S. Copyright Office.                              */
+/*                                                                        */
+/* Origin: 30                                                             */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+#ifndef  __SMP_UNFENCING_INTER_ENCLOSURE_ABUS_LINKS_H
+#define  __SMP_UNFENCING_INTER_ENCLOSURE_ABUS_LINKS_H
+
+#include <errl/errlentry.H>
+
+namespace   EDI_EI_INITIALIZATION
+{
+
+/**
+ *  @brief   smp_unfencing_inter_enclosure_abus_links
+ *
+ *           Lower functional fences of inter-enclosure Abus links
+ *
+ *  return  errlHndl if an error occurs
+ *
+ */
+errlHndl_t  smp_unfencing_inter_enclosure_abus_links();
+
+}
+
+#endif
diff --git a/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.C b/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.C
index 426aa8d39..d30e4295a 100644
--- a/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.C
+++ b/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.C
@@ -51,6 +51,7 @@
 
 //  targeting support
 #include    <targeting/common/commontargeting.H>
+#include    <smp_unfencing_inter_enclosure_abus_links.H>
 
 //  fapi support
 #include    <fapi.H>
@@ -68,7 +69,7 @@ using   namespace   ISTEP;
 using   namespace   ISTEP_ERROR;
 using   namespace   TARGETING;
 using   namespace   fapi;
-
+using   namespace   EDI_EI_INITIALIZATION;
 
 //
 //  Wrapper function to call host_coalesce_host
@@ -165,10 +166,8 @@ void host_sys_fab_iovalid_processing( msg_t* io_pMsg )
         TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
                   "$TODO RTC:63128 - hb instances exchange and agree on cfg");
 
-        // $TODO RTC:63132 after agreement, open abuses as required
-        TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
-                  "$TODO RTC:63132 - open the required A-busses "
-                  " after agreement is reached");
+        // after agreement, open abuses as required
+        l_errl = smp_unfencing_inter_enclosure_abus_links();
 
         // release the storage from the message
         free(io_pMsg->extra_data);
diff --git a/src/usr/hwpf/hwp/establish_system_smp/makefile b/src/usr/hwpf/hwp/establish_system_smp/makefile
index 3ce0dbdcc..018c15f10 100644
--- a/src/usr/hwpf/hwp/establish_system_smp/makefile
+++ b/src/usr/hwpf/hwp/establish_system_smp/makefile
@@ -37,6 +37,8 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/include
 
 ##  NOTE: add the base istep dir here.
 EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/establish_system_smp
+EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/edi_ei_initialization
+
 
 ##  Include sub dirs
 ##  NOTE: add a new EXTRAINCDIR when you add a new HWP
diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index 12e404288..177e7d1d4 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -2227,6 +2227,27 @@ sub generate_ax_buses
         <id>PEER_TARGET</id>
         <default>physical:sys-$sys/node-$p_node/proc-$p_proc/"
             . "${type}bus-$p_port</default>
+    </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-$sys/node-$p_node/proc-$p_proc/"
+            . "${type}bus-$p_port</default>
+    </attribute>";
+            if (($node != $p_node) && ($type eq "A"))
+            {
+               print "
+    <attribute>
+        <id>IS_INTER_ENCLOSURE_BUS</id>
+        <default>1</default>
+    </attribute>";
+            }
+        }
+        else
+        {
+            print "
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:na</default>
     </attribute>";
         }
 
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index ae9ca7c63..97f19db6e 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -11964,4 +11964,28 @@ firmware notes: Platforms should initialize this attribute to AUTO (0)</descript
     </hwpfToHbAttrMap>
 </attribute>
 
+<attribute>
+    <id>IS_INTER_ENCLOSURE_BUS</id>
+    <description>Indicate an inter-enclosure bus at this endpoint target.
+                 0 = No, 1 = Yes
+    </description>
+    <simpleType>
+        <uint8_t><default>0</default></uint8_t>
+    </simpleType>
+    <persistency>volatile</persistency>
+    <readable/>
+    <writeable/>
+</attribute>
+
+<attribute>
+    <id>PEER_PATH</id>
+    <description>Entity path of the peer target of an Abus
+    </description>
+    <nativeType>
+        <name>EntityPath</name>
+    </nativeType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+</attribute>
+
 </attributes>
diff --git a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
index c7c2d0b54..66d75730f 100644
--- a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
@@ -831,6 +831,10 @@
         <default>affinity:sys-0/node-0/proc-0/abus-0</default>
     </attribute>
     <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:na</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>0</default>
     </attribute>
@@ -856,6 +860,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-2/abus-1</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-2/abus-1</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -878,6 +886,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-2/abus-2</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-2/abus-2</default>
+    </attribute>
 </targetInstance>
 
 <!-- murano n0p0 XBUS units -->
@@ -1526,6 +1538,10 @@
         <default>affinity:sys-0/node-0/proc-1/abus-0</default>
     </attribute>
     <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:na</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>0</default>
     </attribute>
@@ -1551,6 +1567,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-3/abus-1</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-3/abus-1</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -1573,6 +1593,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-3/abus-2</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-3/abus-2</default>
+    </attribute>
 </targetInstance>
 
 <!-- murano n0p1 XBUS units -->
@@ -2220,6 +2244,10 @@
         <default>affinity:sys-0/node-0/proc-2/abus-0</default>
     </attribute>
     <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:na</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>0</default>
     </attribute>
@@ -2245,6 +2273,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-0/abus-1</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-0/abus-1</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -2267,6 +2299,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-0/abus-2</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-0/abus-2</default>
+    </attribute>
 </targetInstance>
 
 <!-- murano n0p2 XBUS units -->
@@ -2915,6 +2951,10 @@
         <default>affinity:sys-0/node-0/proc-3/abus-0</default>
     </attribute>
     <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:na</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>0</default>
     </attribute>
@@ -2940,6 +2980,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-1/abus-1</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-1/abus-1</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -2962,6 +3006,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-1/abus-2</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-1/abus-2</default>
+    </attribute>
 </targetInstance>
 
 <!-- murano n0p3 XBUS units -->
diff --git a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
index 8ac32d65c..04ce59e95 100644
--- a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
@@ -1109,6 +1109,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-6/abus-2</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-6/abus-2</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -1131,6 +1135,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-4/abus-1</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-4/abus-1</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -1153,6 +1161,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-2/abus-0</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-2/abus-0</default>
+    </attribute>
 </targetInstance>
 
 <!-- Venice n0p0 XBUS units -->
@@ -2153,6 +2165,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-7/abus-2</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-7/abus-2</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -2175,6 +2191,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-5/abus-1</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-5/abus-1</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -2197,6 +2217,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-3/abus-0</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-3/abus-0</default>
+    </attribute>
 </targetInstance>
 
 <!-- Venice n0p1 XBUS units -->
@@ -3198,6 +3222,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-0/abus-2</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-0/abus-2</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -3220,6 +3248,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-6/abus-1</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-6/abus-1</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -3242,6 +3274,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-4/abus-0</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-4/abus-0</default>
+    </attribute>
 </targetInstance>
 
 <!-- Venice n0p2 XBUS units -->
@@ -4243,6 +4279,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-1/abus-2</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-1/abus-2</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4265,6 +4305,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-7/abus-1</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-7/abus-1</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4287,6 +4331,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-5/abus-0</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-5/abus-0</default>
+    </attribute>
 </targetInstance>
 
 <!-- Venice n0p3 XBUS units -->
@@ -5287,6 +5335,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-2/abus-2</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-2/abus-2</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5309,6 +5361,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-0/abus-1</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-0/abus-1</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5331,6 +5387,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-6/abus-0</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-6/abus-0</default>
+    </attribute>
 </targetInstance>
 
 
@@ -6331,6 +6391,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-3/abus-2</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-3/abus-2</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6353,6 +6417,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-1/abus-1</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-1/abus-1</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6375,6 +6443,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-7/abus-0</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-7/abus-0</default>
+    </attribute>
 </targetInstance>
 
 <!-- Venice n0p5 XBUS units -->
@@ -7374,6 +7446,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-4/abus-2</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-4/abus-2</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7396,6 +7472,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-2/abus-1</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-2/abus-1</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7418,6 +7498,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-0/abus-0</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-0/abus-0</default>
+    </attribute>
 </targetInstance>
 
 <!-- Venice n0p6 XBUS units -->
@@ -8417,6 +8501,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-5/abus-2</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-5/abus-2</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -8439,6 +8527,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-3/abus-1</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-3/abus-1</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -8461,6 +8553,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-1/abus-0</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-1/abus-0</default>
+    </attribute>
 </targetInstance>
 
 <!-- Venice n0p7 XBUS units -->
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index da65d6d43..270f229ad 100644
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -649,6 +649,8 @@
     <attribute><id>PEER_TARGET</id></attribute>
     <attribute><id>EI_BUS_TX_LANE_INVERT</id></attribute>
     <attribute><id>EI_BUS_TX_MSBSWAP</id></attribute>
+    <attribute><id>IS_INTER_ENCLOSURE_BUS</id></attribute>
+    <attribute><id>PEER_PATH</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 cfdc16af6..09679ac09 100644
--- a/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml
+++ b/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml
@@ -596,7 +596,7 @@
     <id>sys0node0proc0abus0</id>
     <type>unit-abus-murano</type>
     <attribute><id>HUID</id><default>0x000F0000</default></attribute>
-        <attribute>
+    <attribute>
         <id>PHYS_PATH</id>
         <default>physical:sys-0/node-0/proc-0/abus-0</default>
     </attribute>
@@ -605,6 +605,10 @@
         <default>affinity:sys-0/node-0/proc-0/abus-0</default>
     </attribute>
     <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:na</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>0</default>
     </attribute>
@@ -646,6 +650,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-2/abus-0</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-2/abus-0</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -661,6 +669,10 @@
         <default>affinity:sys-0/node-0/proc-0/abus-2</default>
     </attribute>
     <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:na</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>2</default>
     </attribute>
@@ -1033,6 +1045,10 @@
         <default>affinity:sys-0/node-0/proc-1/abus-0</default>
     </attribute>
     <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:na</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>0</default>
     </attribute>
@@ -1074,6 +1090,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-3/abus-0</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-3/abus-0</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -1089,6 +1109,10 @@
         <default>affinity:sys-0/node-0/proc-1/abus-2</default>
     </attribute>
     <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:na</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>2</default>
     </attribute>
@@ -1475,6 +1499,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-0/abus-1</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-0/abus-1</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -1490,6 +1518,10 @@
         <default>affinity:sys-0/node-0/proc-2/abus-1</default>
     </attribute> 
     <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:na</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>1</default>
     </attribute>
@@ -1516,6 +1548,10 @@
         <default>affinity:sys-0/node-0/proc-2/abus-2</default>
     </attribute>
     <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:na</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>2</default>
     </attribute>
@@ -1902,6 +1938,10 @@
         <id>PEER_TARGET</id>
         <default>physical:sys-0/node-0/proc-1/abus-1</default>
     </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:sys-0/node-0/proc-1/abus-1</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -1914,7 +1954,11 @@
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-1/abus-1</default>
+        <default>affinity:sys-0/node-0/proc-3/abus-1</default>
+    </attribute>
+    <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:na</default>
     </attribute>
     <attribute>
         <id>CHIP_UNIT</id>
@@ -1943,6 +1987,10 @@
         <default>affinity:sys-0/node-0/proc-3/abus-2</default>
     </attribute>
     <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:na</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>2</default>
     </attribute>
diff --git a/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml b/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml
index 7315bfdcb..24b1db2be 100644
--- a/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml
+++ b/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml
@@ -1180,7 +1180,7 @@
     <id>sys0node0proc0abus0</id>
     <type>unit-abus-venice</type>
     <attribute><id>HUID</id><default>0x000F0000</default></attribute>
-        <attribute>
+    <attribute>
         <id>PHYS_PATH</id>
         <default>physical:sys-0/node-0/proc-0/abus-0</default>
     </attribute>
@@ -1189,6 +1189,10 @@
         <default>affinity:sys-0/node-0/proc-0/abus-0</default>
     </attribute>
     <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:na</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>0</default>
     </attribute>
@@ -1206,7 +1210,7 @@
     <id>sys0node0proc0abus1</id>
     <type>unit-abus-venice</type>
     <attribute><id>HUID</id><default>0x000F0001</default></attribute>
-        <attribute>
+    <attribute>
         <id>PHYS_PATH</id>
         <default>physical:sys-0/node-0/proc-0/abus-1</default>
     </attribute>
@@ -1215,6 +1219,10 @@
         <default>affinity:sys-0/node-0/proc-0/abus-1</default>
     </attribute>
     <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:na</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>1</default>
     </attribute> 
@@ -1232,7 +1240,7 @@
     <id>sys0node0proc0abus2</id>
     <type>unit-abus-venice</type>
     <attribute><id>HUID</id><default>0x000F0002</default></attribute>
-        <attribute>
+    <attribute>
         <id>PHYS_PATH</id>
         <default>physical:sys-0/node-0/proc-0/abus-2</default>
     </attribute>
@@ -1241,6 +1249,10 @@
         <default>affinity:sys-0/node-0/proc-0/abus-2</default>
     </attribute>
     <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:na</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>2</default>
     </attribute>
@@ -2281,7 +2293,7 @@
     <id>sys0node0proc1abus0</id>
     <type>unit-abus-venice</type>
     <attribute><id>HUID</id><default>0x000F0003</default></attribute>
-        <attribute>
+    <attribute>
         <id>PHYS_PATH</id>
         <default>physical:sys-0/node-0/proc-1/abus-0</default>
     </attribute>
@@ -2290,6 +2302,10 @@
         <default>affinity:sys-0/node-0/proc-1/abus-0</default>
     </attribute>
     <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:na</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>0</default>
     </attribute>
@@ -2299,7 +2315,7 @@
     <id>sys0node0proc1abus1</id>
     <type>unit-abus-venice</type>
     <attribute><id>HUID</id><default>0x000F0004</default></attribute>
-        <attribute>
+    <attribute>
         <id>PHYS_PATH</id>
         <default>physical:sys-0/node-0/proc-1/abus-1</default>
     </attribute>
@@ -2308,6 +2324,10 @@
         <default>affinity:sys-0/node-0/proc-1/abus-1</default>
     </attribute> 
     <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:na</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>1</default>
     </attribute>
@@ -2317,7 +2337,7 @@
     <id>sys0node0proc1abus2</id>
     <type>unit-abus-venice</type>
     <attribute><id>HUID</id><default>0x000F0005</default></attribute>
-        <attribute>
+    <attribute>
         <id>PHYS_PATH</id>
         <default>physical:sys-0/node-0/proc-1/abus-2</default>
     </attribute>
@@ -2326,6 +2346,10 @@
         <default>affinity:sys-0/node-0/proc-1/abus-2</default>
     </attribute>
     <attribute>
+        <id>PEER_PATH</id>
+        <default>physical:na</default>
+    </attribute>
+    <attribute>
         <id>CHIP_UNIT</id>
         <default>2</default>
     </attribute>