I/O Obus Scominit & Dccal Udpate

Change-Id: I31ea76f8cd28c77e64c9437d8e0bd9a40f09f7d4
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31498
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Gary A. Peterson <garyp@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31501
Reviewed-by: Hostboot Team <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>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

1 files changed, 13 insertions, 43 deletions

diff --git a/src/usr/isteps/istep08/call_proc_obus_scominit.C b/src/usr/isteps/istep08/call_proc_obus_scominit.C
index 389d5e299..b31df9f99 100644
--- a/src/usr/isteps/istep08/call_proc_obus_scominit.C
+++ b/src/usr/isteps/istep08/call_proc_obus_scominit.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -82,64 +82,34 @@ void* call_proc_obus_scominit( void *io_pArgs )
              "call_proc_obus_scominit entry" );
 
     do {
-        EDI_EI_INITIALIZATION::TargetPairs_t l_ObusConnections;
-        // Note:
-        // i_noDuplicate parameter must be set to false because
-        // two separate calls would be needed:
-        //    O0 <--> O1
-        //    O1 <--> O0
-        // only the first target is used to issue SCOMs
-        l_err =
-        EDI_EI_INITIALIZATION::PbusLinkSvc::getTheInstance().getPbusConnections(
-                                          l_ObusConnections, TYPE_OBUS, false);
-        if (l_err)
-        {
-            TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                    "ERROR 0x%.8X : getPbusConnections TYPE_OBUS returns error",
-                    l_err->reasonCode() );
-
-            // Create IStep error log and cross reference to error that occurred
-            l_StepError.addErrorDetails( l_err );
-            // Commit the error log
-            // Log should be deleted and set to NULL in errlCommit.
-            errlCommit(l_err, HWPF_COMP_ID);
 
-            // Shouldn't continue on this fatal error (no OBUS), break out
-            break;
-        }
+        // Get all OBUS targets
+        TARGETING::TargetHandleList l_obusTargetList;
+        getAllChiplets(l_obusTargetList, TYPE_OBUS);
 
-        for (const auto & l_ObusConnection: l_ObusConnections)
+        for (const auto & l_obusTarget: l_obusTargetList)
         {
-            const TARGETING::Target* l_thisObusTarget = l_ObusConnection.first;
-            const TARGETING::Target* l_connectedObusTarget =
-                                                        l_ObusConnection.second;
-
-            const fapi2::Target<fapi2::TARGET_TYPE_OBUS>
-                l_thisObusFapi2Target(
-                (const_cast<TARGETING::Target*>(l_thisObusTarget)));
 
             const fapi2::Target<fapi2::TARGET_TYPE_OBUS>
-                l_connectedObusFapi2Target(
-                (const_cast<TARGETING::Target*>(l_connectedObusTarget)));
+                l_obusFapi2Target(
+                (const_cast<TARGETING::Target*>(l_obusTarget)));
 
 
             TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                      "Running p9_io_obus_scominit HWP on "
-                     "This OBUS target %.8X - Connected OBUS target %.8X",
-                     TARGETING::get_huid(l_thisObusTarget),
-                     TARGETING::get_huid(l_connectedObusTarget) );
+                     "This OBUS target %.8X",
+                       TARGETING::get_huid(l_obusTarget));
 
             FAPI_INVOKE_HWP(l_err, p9_io_obus_scominit,
-                  l_thisObusFapi2Target, l_connectedObusFapi2Target);
+                            l_obusFapi2Target);
 
             if(l_err)
             {
                 TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                          "ERROR 0x%x: returned from p9_io_obus_scominit on "
-                         "OBUS target %.8X - connected target %.8X, PLID=0x%x",
-                         l_err->plid(),
-                         TARGETING::get_huid(l_thisObusTarget),
-                         TARGETING::get_huid(l_connectedObusTarget) );
+                         "OBUS target %.8X, PLID=0x%x",
+                        TARGETING::get_huid(l_obusTarget),
+                        l_err->plid());
                 l_StepError.addErrorDetails(l_err);
                 errlCommit(l_err, HWPF_COMP_ID);
             }