Added support, in Istep 08, to facilitate the testing of SMP wrap

Adding support, in Istep 08 to make HWP calls for many various
components. In the various istep 8 call_proc_* and istep 10
call_proc*, I was able to consolidate the HWP call into a single
single function.  The consolidated code for these calls exists
in the file nest/nestHwpHelperFuncs.  Also added a function to
capture errors in file isteps/istepHelperFuncs.

Change-Id: I64f73d64950a52d2923f1c3fe280c55dffd1d742
RTC:190096
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/56518
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 29 insertions, 54 deletions

diff --git a/src/usr/isteps/istep10/call_proc_chiplet_enable_ridi.C b/src/usr/isteps/istep10/call_proc_chiplet_enable_ridi.C
index 72422e56b..2c82e7f10 100644
--- a/src/usr/isteps/istep10/call_proc_chiplet_enable_ridi.C
+++ b/src/usr/isteps/istep10/call_proc_chiplet_enable_ridi.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -22,6 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
+
 /**
    @file call_proc_chiplet_enable_ridi.C
  *
@@ -31,81 +32,55 @@
  *  HWP_IGNORE_VERSION_CHECK
  *
  */
+
 /******************************************************************************/
 // Includes
 /******************************************************************************/
-#include    <stdint.h>
-
-#include    <trace/interface.H>
-#include    <initservice/taskargs.H>
-#include    <errl/errlentry.H>
-
-#include    <isteps/hwpisteperror.H>
 
-#include    <errl/errludtarget.H>
+//  Component ID support
+#include <hbotcompid.H>                // HWPF_COMP_ID
 
-#include    <initservice/isteps_trace.H>
-#include    <initservice/initserviceif.H>
+//  TARGETING support
+#include <attributeenums.H>            // TYPE_PROC
 
-//  targeting support
-#include    <targeting/common/commontargeting.H>
-#include    <targeting/common/utilFilter.H>
-#include <fapi2/target.H>
-#include <fapi2/plat_hwp_invoker.H>
+//  Error handling support
+#include <isteps/hwpisteperror.H>      // ISTEP_ERROR::IStepError
 
-#include <p9_chiplet_enable_ridi.H>
+//  Tracing support
+#include <trace/interface.H>           // TRACFCOMP
+#include <initservice/isteps_trace.H>  // g_trac_isteps_trace
 
+//  HWP call support
+#include <nest/nestHwpHelperFuncs.H>   // fapiHWPCallWrapperForChip
 
-namespace   ISTEP_10
+namespace ISTEP_10
 {
-
 using   namespace   ISTEP;
 using   namespace   ISTEP_ERROR;
-using   namespace   ERRORLOG;
+using   namespace   ISTEPS_TRACE;
 using   namespace   TARGETING;
 
 //******************************************************************************
-// wrapper function to call proc_chiplet_enable_ridi
+// Wrapper function to call proc_chiplet_enable_ridi
 //******************************************************************************
 void* call_proc_chiplet_enable_ridi( void *io_pArgs )
 {
-    errlHndl_t l_err = NULL;
-    IStepError l_StepError;
-
-    TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-               "call_proc_chiplet_enable_ridi entry" );
-    //
-    //  get a list of all the procs in the system
-    //
-    TARGETING::TargetHandleList l_cpuTargetList;
-    getAllChips(l_cpuTargetList, TYPE_PROC);
-
-    // Loop through all processors including master
-    for (const auto & l_cpu_target: l_cpuTargetList)
-    {
-      const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>l_fapi2_proc_target(
-                l_cpu_target);
+    IStepError l_stepError;
 
-      TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-          "Running p9_chiplet_enable_ridi HWP on processor target %.8X",
-          TARGETING::get_huid(l_cpu_target) );
+    TRACFCOMP(g_trac_isteps_trace,
+              ENTER_MRK"call_proc_chiplet_enable_ridi entry");
 
-      FAPI_INVOKE_HWP(l_err, p9_chiplet_enable_ridi, l_fapi2_proc_target);
-      if(l_err)
-      {
-          TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
-                    "ERROR: call p9_chiplet_enable_ridi, PLID=0x%x",
-                    l_err->plid());
-          l_StepError.addErrorDetails(l_err);
-          errlCommit(l_err, HWPF_COMP_ID);
-      }
 
-    } // end of going through all processors
+#ifndef CONFIG_SMP_WRAP_TEST
+    // Make the FAPI call to p9_chiplet_enable_ridi
+    fapiHWPCallWrapperHandler(P9_CHIPLET_ENABLE_RIDI, l_stepError,
+                              HWPF_COMP_ID, TYPE_PROC);
+#endif
 
-    TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-               "call_proc_chiplet_enable_ridi exit");
+    TRACFCOMP(g_trac_isteps_trace,
+              EXIT_MRK"call_proc_chiplet_enable_ridi exit");
 
-    return l_StepError.getErrorHandle();
+    return l_stepError.getErrorHandle();
 }
 
-};   // end namespace
+};   // end namespace ISTEP_10