Enable Istep 13 HWPs

This work includes enablement of
p9_mss_draminit HWPs
p9_mem_pll HWPs
mss_ddry_phy_reset
and startmemclocks

Change-Id: I43a64080c377e6655f60a2bb89f92f18db9a6469
RTC: 134081
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25946
Tested-by: Jenkins Server
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Reviewed-by: Andres A. Lugo-Reyes <aalugore@us.ibm.com>
Tested-by: FSP CI Jenkins
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

10 files changed, 200 insertions, 100 deletions

diff --git a/src/usr/isteps/istep13/call_mem_pll_initf.C b/src/usr/isteps/istep13/call_mem_pll_initf.C
index a59ac129b..6cea5444a 100644
--- a/src/usr/isteps/istep13/call_mem_pll_initf.C
+++ b/src/usr/isteps/istep13/call_mem_pll_initf.C
@@ -22,6 +22,8 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
+
+//Error handling and tracing
 #include <errl/errlentry.H>
 #include <errl/errlmanager.H>
 #include <errl/errludtarget.H>
@@ -29,21 +31,22 @@
 #include <initservice/isteps_trace.H>
 
 //HWP Invoker
-#include    <fapi2/plat_hwp_invoker.H>
+#include <fapi2/plat_hwp_invoker.H>
 
-//  targeting support
-#include    <targeting/common/commontargeting.H>
-#include    <targeting/common/util.H>
-#include    <targeting/common/utilFilter.H>
-#include    <fapi2/target.H>
+//targeting support
+#include <targeting/common/commontargeting.H>
+#include <targeting/common/util.H>
+#include <targeting/common/utilFilter.H>
+#include <fapi2/target.H>
 
 //From Import Directory (EKB Repository)
-#include    <p9_mem_pll_initf.H>
+#include <p9_mem_pll_initf.H>
 
 using   namespace   ERRORLOG;
 using   namespace   ISTEP;
 using   namespace   ISTEP_ERROR;
 using   namespace   TARGETING;
+
 namespace ISTEP_13
 {
 void* call_mem_pll_initf (void *io_pArgs)
@@ -67,14 +70,14 @@ void* call_mem_pll_initf (void *io_pArgs)
         const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>
           l_fapi2_procChip( l_procChip);
 
-        //call cen_mem_pll_initf to do pll l_fapi2_memChip
+        //call p9_mem_pll_initf on the proc chip
         FAPI_INVOKE_HWP(l_err, p9_mem_pll_initf, l_fapi2_procChip);
 
         if (l_err)
         {
             TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
-                      "ERROR 0x%.8X: p9_mem_pll_initf HWP returns error",
-                      l_err->reasonCode());
+                    "ERROR 0x%.8X: p9_mem_pll_initf HWP returns error",
+                    l_err->reasonCode());
 
             // capture the target data in the elog
             ErrlUserDetailsTarget(l_procChip).addToLog(l_err );
@@ -88,7 +91,8 @@ void* call_mem_pll_initf (void *io_pArgs)
         else
         {
             TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                        "SUCCESS: p9_mem_pll_initf HWP( )" );
+                       "SUCCESS running p9_mem_pll_initf HWP on "
+                       "target HUID %.8X", TARGETING::get_huid(l_procChip));
         }
     }
 
diff --git a/src/usr/isteps/istep13/call_mem_pll_reset.C b/src/usr/isteps/istep13/call_mem_pll_reset.C
index 90d1f8245..2b823d99a 100644
--- a/src/usr/isteps/istep13/call_mem_pll_reset.C
+++ b/src/usr/isteps/istep13/call_mem_pll_reset.C
@@ -22,24 +22,80 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
+
+//Error handling and tracing
 #include <errl/errlentry.H>
 #include <errl/errlmanager.H>
 #include <errl/errludtarget.H>
 #include <isteps/hwpisteperror.H>
 #include <initservice/isteps_trace.H>
 
+//HWP Invoker
+#include <fapi2/plat_hwp_invoker.H>
+
+//  targeting support
+#include <targeting/common/commontargeting.H>
+#include <targeting/common/util.H>
+#include <targeting/common/utilFilter.H>
+#include <fapi2/target.H>
+
+//From Import Directory (EKB Repository)
+#include <p9_mem_pll_reset.H>
 
+
+using   namespace   ERRORLOG;
+using   namespace   ISTEP;
 using   namespace   ISTEP_ERROR;
+using   namespace   TARGETING;
 
 namespace ISTEP_13
 {
 void* call_mem_pll_reset (void *io_pArgs)
 {
+    errlHndl_t l_err = NULL;
+
     IStepError l_StepError;
 
     TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mem_pll_reset entry" );
 
-    // TODO-RTC: 134081
+    // Get all Proc targets
+    TARGETING::TargetHandleList l_procTargetList;
+    getAllChips(l_procTargetList, TYPE_PROC);
+
+    for (const auto & l_procChip: l_procTargetList)
+    {
+        TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+                "Running p9_mem_pll_reset HWP on "
+                "target HUID %.8X", TARGETING::get_huid(l_procChip));
+
+        const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>
+        l_fapi2_procChip( l_procChip);
+
+        //call p9_mem_pll_reset on the proc chip
+        FAPI_INVOKE_HWP(l_err, p9_mem_pll_reset, l_fapi2_procChip);
+
+        if (l_err)
+        {
+            TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
+                    "ERROR 0x%.8X: p9_mem_pll_reset HWP returns error",
+                    l_err->reasonCode());
+
+            // capture the target data in the elog
+            ErrlUserDetailsTarget(l_procChip).addToLog(l_err );
+
+            //Create IStep error log and cross reference to error that occurred
+            l_StepError.addErrorDetails(l_err);
+
+            // Commit Error
+            errlCommit(l_err, HWPF_COMP_ID);
+        }
+        else
+        {
+            TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+                       "SUCCESS running p9_mem_pll_reset HWP on "
+                       "target HUID %.8X", TARGETING::get_huid(l_procChip));
+        }
+    }
 
     TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mem_pll_reset exit" );
 
diff --git a/src/usr/isteps/istep13/call_mem_pll_setup.C b/src/usr/isteps/istep13/call_mem_pll_setup.C
index 9b1143f5b..617decb64 100644
--- a/src/usr/isteps/istep13/call_mem_pll_setup.C
+++ b/src/usr/isteps/istep13/call_mem_pll_setup.C
@@ -22,6 +22,8 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
+
+//Error handling and tracing
 #include <errl/errlentry.H>
 #include <errl/errlmanager.H>
 #include <errl/errludtarget.H>
@@ -29,7 +31,7 @@
 #include <initservice/isteps_trace.H>
 
 //HWP Invoker
-#include    <fapi2/plat_hwp_invoker.H>
+#include <fapi2/plat_hwp_invoker.H>
 
 //  targeting support
 #include <targeting/common/commontargeting.H>
@@ -38,7 +40,7 @@
 #include <fapi2/target.H>
 
 //From Import Directory (EKB Repository)
-#include    <p9_mem_pll_setup.H>
+#include <p9_mem_pll_setup.H>
 
 
 using   namespace   ERRORLOG;
@@ -69,15 +71,15 @@ void* call_mem_pll_setup (void *io_pArgs)
 
         const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>
           l_fapi2_procChip( l_procChip);
-//@TODO RTC:152210 Enable Istep 13 HWPs that are waiting on mirrored files
-        //call cen_mem_pll_setup to verify lock
-//         FAPI_INVOKE_HWP(l_err, p9_mem_pll_setup, l_fapi2_procChip);
+
+        //call p9_mem_pll_setup to verify lock
+        FAPI_INVOKE_HWP(l_err, p9_mem_pll_setup, l_fapi2_procChip);
 
         if (l_err)
         {
             TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
-                      "ERROR 0x%.8X: p9_mem_pll_setup HWP returns error",
-                      l_err->reasonCode());
+                    "ERROR 0x%.8X: p9_mem_pll_setup HWP returns error",
+                    l_err->reasonCode());
 
             // capture the target data in the elog
             ErrlUserDetailsTarget(l_procChip).addToLog(l_err);
@@ -91,7 +93,8 @@ void* call_mem_pll_setup (void *io_pArgs)
         else
         {
             TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                       "SUCCESS: p9_mem_pll_setup HWP( )" );
+                       "SUCCESS running p9_mem_pll_setup HWP on "
+                       "target HUID %.8X", TARGETING::get_huid(l_procChip));
         }
     }
 
diff --git a/src/usr/isteps/istep13/call_mem_startclocks.C b/src/usr/isteps/istep13/call_mem_startclocks.C
index 8091ddb36..0cd610194 100644
--- a/src/usr/isteps/istep13/call_mem_startclocks.C
+++ b/src/usr/isteps/istep13/call_mem_startclocks.C
@@ -22,6 +22,8 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
+
+//Error handling and tracing
 #include <errl/errlentry.H>
 #include <errl/errlmanager.H>
 #include <errl/errludtarget.H>
@@ -29,17 +31,16 @@
 #include <initservice/isteps_trace.H>
 
 //HWP Invoker
-#include    <fapi2/plat_hwp_invoker.H>
-
+#include <fapi2/plat_hwp_invoker.H>
 
 //  targeting support
-#include    <targeting/common/commontargeting.H>
-#include    <targeting/common/util.H>
-#include    <targeting/common/utilFilter.H>
-#include    <fapi2/target.H>
+#include <targeting/common/commontargeting.H>
+#include <targeting/common/util.H>
+#include <targeting/common/utilFilter.H>
+#include <fapi2/target.H>
 
 //From Import Directory (EKB Repository)
-#include    <p9_mem_startclocks.H>
+#include <p9_mem_startclocks.H>
 
 
 using   namespace   ERRORLOG;
@@ -65,21 +66,21 @@ void* call_mem_startclocks (void *io_pArgs)
     {
         // Dump current run on target
         TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                "Running cen_mem_startclocks HWP on "
+                "Running p9_mem_startclocks HWP on "
                 "target HUID %.8X", TARGETING::get_huid(l_procChip));
 
         const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>
           l_fapi2_procChip( l_procChip);
 
-//@TODO RTC:152210 Enable Istep 13 HWPs that are waiting on mirrored files
+
         //  call the HWP with each fapi::Target
-//          FAPI_INVOKE_HWP(l_err, p9_mem_startclocks, l_fapi2_procChip);
+        FAPI_INVOKE_HWP(l_err, p9_mem_startclocks, l_fapi2_procChip);
 
         if (l_err)
         {
             TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
-                      "ERROR 0x%.8X: cen_mem_startclocks HWP returns error",
-                      l_err->reasonCode());
+                    "ERROR 0x%.8X: p9_mem_startclocks HWP returns error",
+                    l_err->reasonCode());
 
             // capture the target data in the elog
             ErrlUserDetailsTarget(l_procChip).addToLog(l_err);
@@ -94,7 +95,8 @@ void* call_mem_startclocks (void *io_pArgs)
         else
         {
             TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                       "SUCCESS :  cen_mem_startclocks HWP( )" );
+                       "SUCCESS running p9_mem_startclocks HWP on "
+                       "target HUID %.8X", TARGETING::get_huid(l_procChip));
         }
     }
 
diff --git a/src/usr/isteps/istep13/call_mss_ddr_phy_reset.C b/src/usr/isteps/istep13/call_mss_ddr_phy_reset.C
index 2daceb69c..205d6d593 100644
--- a/src/usr/isteps/istep13/call_mss_ddr_phy_reset.C
+++ b/src/usr/isteps/istep13/call_mss_ddr_phy_reset.C
@@ -22,6 +22,8 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
+
+//Error handling and tracing
 #include <errl/errlentry.H>
 #include <errl/errlmanager.H>
 #include <errl/errludtarget.H>
@@ -34,6 +36,7 @@
 #include <targeting/common/util.H>
 #include <targeting/common/utilFilter.H>
 
+//From Import Directory (EKB Repository)
 #include "istep13consts.H"
 #include <fapi2.H>
 #include <fapi2/plat_hwp_invoker.H>
@@ -75,8 +78,7 @@ void* call_mss_ddr_phy_reset (void *io_pArgs)
         fapi2::Target<fapi2::TARGET_TYPE_MCBIST> l_fapi_mcbist_target
             (l_mcbist_target);
 
-            //TODO 134081
-//          FAPI_INVOKE_HWP(l_err, p9_mss_ddr_phy_reset, l_fapi_mcbist_target);
+        FAPI_INVOKE_HWP(l_err, p9_mss_ddr_phy_reset, l_fapi_mcbist_target);
 
         if (l_err)
         {
@@ -96,9 +98,11 @@ void* call_mss_ddr_phy_reset (void *io_pArgs)
         else
         {
             TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                    "SUCCESS :  p9_mss_ddr_phy_reset HWP( )" );
+                       "SUCCESS running p9_mss_ddr_phy_reset HWP on "
+                       "target HUID %.8X", TARGETING::get_huid(l_mcbist_target));
         }
-    } // end l_mcbistNum loop
+
+    } // end l_mcbist loop
 
 //  TODO: RTC 155373 Need to remove hack that is setting IS_SIMULATION to 1 for this substep
     sys->setAttr<TARGETING::ATTR_IS_SIMULATION>(0);
diff --git a/src/usr/isteps/istep13/call_mss_draminit.C b/src/usr/isteps/istep13/call_mss_draminit.C
index 265b4ae3c..fff4463d1 100644
--- a/src/usr/isteps/istep13/call_mss_draminit.C
+++ b/src/usr/isteps/istep13/call_mss_draminit.C
@@ -22,30 +22,37 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
+
+//Error handling and tracing
 #include <errl/errlentry.H>
 #include <errl/errlmanager.H>
 #include <errl/errludtarget.H>
 #include <isteps/hwpisteperror.H>
-#include <istepHelperFuncs.H>
 #include <initservice/isteps_trace.H>
 #include <initservice/initserviceif.H>
 #include <plat_trace.H>
 
-//  targeting support
+//Istep 13 framework
+#include <istepHelperFuncs.H>
+#include "istep13consts.H"
+#include "platform_vddr.H"
+
+// targeting support
 #include <targeting/common/commontargeting.H>
 #include <targeting/common/util.H>
 #include <targeting/common/utilFilter.H>
-#include "istep13consts.H"
-#include "platform_vddr.H"
 
-#include    <fapi2.H>
-#include    <fapi2/plat_hwp_invoker.H>
-#include    <p9_mss_draminit.H>
+// fapi2 HWP invoker
+#include  <fapi2/plat_hwp_invoker.H>
 
-using   namespace   ERRORLOG;
-using   namespace   ISTEP;
-using   namespace   ISTEP_ERROR;
-using   namespace   TARGETING;
+//From Import Directory (EKB Repository)
+#include  <fapi2.H>
+#include  <p9_mss_draminit.H>
+
+using namespace ERRORLOG;
+using namespace ISTEP;
+using namespace ISTEP_ERROR;
+using namespace TARGETING;
 
 namespace ISTEP_13
 {
@@ -79,20 +86,20 @@ void   mss_post_draminit( IStepError & l_stepError )
 //         TARGETING::ATTR_MEM_VDDR_OFFSET_MILLIVOLTS,
 //         TARGETING::ATTR_VMEM_ID>();
 
-    if(l_err)
-    {
-        TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "mss_post_draminit: "
-            "ERROR 0x%08X: setMemoryVoltageDomainOffsetVoltage for VDDR domain",
-            l_err->reasonCode());
-        l_stepError.addErrorDetails(l_err);
-        errlCommit(l_err,HWPF_COMP_ID);
-        break;
-    }
-    else
-    {
-        TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                   "mss_post_draminit: mss_volt_vddr_offset(): SUCCESS");
-    }
+//     if(l_err)
+//     {
+//         TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "mss_post_draminit: "
+//             "ERROR 0x%08X: setMemoryVoltageDomainOffsetVoltage for VDDR domain",
+//             l_err->reasonCode());
+//         l_stepError.addErrorDetails(l_err);
+//         errlCommit(l_err,HWPF_COMP_ID);
+//         break;
+//     }
+//     else
+//     {
+//         TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+//                    "mss_post_draminit: mss_volt_vddr_offset(): SUCCESS");
+//     }
 
     // Call HWSV to call POWR code
     // This fuction has compile-time binding for different platforms
@@ -141,8 +148,7 @@ void* call_mss_draminit (void *io_pArgs)
         fapi2::Target<fapi2::TARGET_TYPE_MCBIST> l_fapi_mcbist_target
             (l_mcbist_target);
 
-            //TODO 134081
-//          FAPI_INVOKE_HWP(l_err, p9_mss_draminit, l_fapi_mcbist_target);
+        FAPI_INVOKE_HWP(l_err, p9_mss_draminit, l_fapi_mcbist_target);
 
         if (l_err)
         {
@@ -162,7 +168,8 @@ void* call_mss_draminit (void *io_pArgs)
         else
         {
             TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                    "SUCCESS :  mss_draminit HWP( )" );
+                       "SUCCESS running p9_mss_draminit HWP on "
+                       "target HUID %.8X", TARGETING::get_huid(l_mcbist_target));
         }
 
     }   // endfor   mcbist's
diff --git a/src/usr/isteps/istep13/call_mss_draminit_mc.C b/src/usr/isteps/istep13/call_mss_draminit_mc.C
index 764ce870c..69dae7107 100644
--- a/src/usr/isteps/istep13/call_mss_draminit_mc.C
+++ b/src/usr/isteps/istep13/call_mss_draminit_mc.C
@@ -22,6 +22,8 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
+
+//Error handling and tracing
 #include <errl/errlentry.H>
 #include <errl/errlmanager.H>
 #include <errl/errludtarget.H>
@@ -32,18 +34,23 @@
 #include <targeting/common/commontargeting.H>
 #include <targeting/common/util.H>
 #include <targeting/common/utilFilter.H>
+
+// Istep 13 framework
 #include "istep13consts.H"
 
-#include    <config.h>
-#include    <fapi2.H>
-#include    <fapi2/plat_hwp_invoker.H>
-#include    <p9_mss_draminit_mc.H>
+// fapi2 HWP invoker
+#include  <fapi2/plat_hwp_invoker.H>
+
+//From Import Directory (EKB Repository)
+#include  <config.h>
+#include  <fapi2.H>
+#include  <p9_mss_draminit_mc.H>
 
 
-using   namespace   ERRORLOG;
-using   namespace   ISTEP;
-using   namespace   ISTEP_ERROR;
-using   namespace   TARGETING;
+using namespace ERRORLOG;
+using namespace ISTEP;
+using namespace ISTEP_ERROR;
+using namespace TARGETING;
 
 namespace ISTEP_13
 {
@@ -74,8 +81,7 @@ void* call_mss_draminit_mc (void *io_pArgs)
 
         fapi2::Target<fapi2::TARGET_TYPE_MCBIST> l_fapi_mcbist_target
             (l_mcbist_target);
-            //TODO 134081
-//         FAPI_INVOKE_HWP(l_err, p9_mss_draminit_mc, l_fapi_mcbist_target);
+        FAPI_INVOKE_HWP(l_err, p9_mss_draminit_mc, l_fapi_mcbist_target);
 
         if (l_err)
         {
@@ -95,7 +101,8 @@ void* call_mss_draminit_mc (void *io_pArgs)
         else
         {
             TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                    "SUCCESS :  p9_mss_draminit_mc HWP( )" );
+                       "SUCCESS running p9_mss_draminit_mc HWP on "
+                       "target HUID %.8X", TARGETING::get_huid(l_mcbist_target));
         }
 
     } // End; memBuf loop
diff --git a/src/usr/isteps/istep13/call_mss_draminit_training.C b/src/usr/isteps/istep13/call_mss_draminit_training.C
index 9ea71dcb8..748169cf9 100644
--- a/src/usr/isteps/istep13/call_mss_draminit_training.C
+++ b/src/usr/isteps/istep13/call_mss_draminit_training.C
@@ -22,6 +22,8 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
+
+//Error handling and tracing
 #include <errl/errlentry.H>
 #include <errl/errlmanager.H>
 #include <errl/errludtarget.H>
@@ -32,11 +34,16 @@
 #include <targeting/common/commontargeting.H>
 #include <targeting/common/util.H>
 #include <targeting/common/utilFilter.H>
+
+// Istep 13 framework
 #include "istep13consts.H"
 
+// fapi2 HWP invoker
+#include    <fapi2/plat_hwp_invoker.H>
+
+//From Import Directory (EKB Repository)
 #include    <config.h>
 #include    <fapi2.H>
-#include    <fapi2/plat_hwp_invoker.H>
 #include    <p9_mss_draminit_training.H>
 
 
@@ -69,8 +76,7 @@ void* call_mss_draminit_training (void *io_pArgs)
 
         fapi2::Target <fapi2::TARGET_TYPE_MCBIST> l_fapi_mcbist_target
             (l_mcbist_target);
-            //TODO 134081
-//         FAPI_INVOKE_HWP(l_err, p9_mss_draminit_training, l_fapi_mcbist_target);
+        FAPI_INVOKE_HWP(l_err, p9_mss_draminit_training, l_fapi_mcbist_target);
 
         if (l_err)
         {
@@ -90,9 +96,9 @@ void* call_mss_draminit_training (void *io_pArgs)
         else
         {
             TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                    "SUCCESS :  p9_mss_draminit_training HWP( )" );
+                       "SUCCESS running p9_mss_draminit_training HWP on "
+                       "target HUID %.8X", TARGETING::get_huid(l_mcbist_target));
         }
-
     }
 
     TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
diff --git a/src/usr/isteps/istep13/call_mss_scominit.C b/src/usr/isteps/istep13/call_mss_scominit.C
index d757375c3..6d7ddc435 100644
--- a/src/usr/isteps/istep13/call_mss_scominit.C
+++ b/src/usr/isteps/istep13/call_mss_scominit.C
@@ -22,6 +22,8 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
+
+//Error handling and tracing
 #include <errl/errlentry.H>
 #include <errl/errlmanager.H>
 #include <errl/errludtarget.H>
@@ -33,10 +35,12 @@
 #include    <targeting/common/util.H>
 #include    <targeting/common/utilFilter.H>
 
-#include    <config.h>
-#include    <fapi2.H>
+// fapi2 HWP invoker
 #include    <fapi2/plat_hwp_invoker.H>
 
+//From Import Directory (EKB Repository)
+#include    <config.h>
+#include    <fapi2.H>
 #include    <p9_mss_scominit.H>
 #include    <p9_throttle_sync.H>
 
@@ -94,7 +98,8 @@ void* call_mss_scominit (void *io_pArgs)
             else
             {
                 TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                           "SUCCESS :  p9_mss_scominit HWP( )" );
+                           "SUCCESS running p9_mss_scominit HWP on "
+                           "target HUID %.8X", TARGETING::get_huid(l_target));
             }
         }
         if (!l_stepError.isNull())
@@ -138,7 +143,8 @@ void* call_mss_scominit (void *io_pArgs)
             else
             {
                 TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                           "SUCCESS :  p9_throttle_sync HWP( )" );
+                           "SUCCESS running p9_throttle_sync HWP on "
+                           "target HUID %.8X", TARGETING::get_huid(l_procChip));
             }
         }
 
diff --git a/src/usr/isteps/istep13/makefile b/src/usr/isteps/istep13/makefile
index 62552f99e..f1bf4bbcd 100644
--- a/src/usr/isteps/istep13/makefile
+++ b/src/usr/isteps/istep13/makefile
@@ -28,23 +28,25 @@ MODULE = istep13
 PROCEDURES_PATH = ${ROOTPATH}/src/import/chips/p9/procedures
 
 #Add all the extra include paths
-EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2
-EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/
-EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs/
+
 EXTRAINCDIR += ${ROOTPATH}/src/usr/isteps/
 EXTRAINCDIR += ${ROOTPATH}/obj/genfiles
+EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include
+EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/
+EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs/
+EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include
 EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory
 EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib
 EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib/utils
 EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib/mc/
 EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/perv
 EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/nest
-
 EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/initfiles
-EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include
 
 
+
+# from src/usr/isteps/istep13
 OBJS += call_host_disable_memvolt.o
 OBJS += call_mem_pll_reset.o
 OBJS += call_mem_pll_initf.o
@@ -58,6 +60,7 @@ OBJS += call_mss_draminit_training.o
 OBJS += call_mss_draminit_trainadv.o
 OBJS += call_mss_draminit_mc.o
 
+#From import/chips/p9/procedures/hwp/memory/lib
 OBJS += rank.o
 OBJS += c_str.o
 OBJS += ccs.o
@@ -70,27 +73,29 @@ OBJS += dp16.o
 OBJS += xlate.o
 OBJS += port.o
 
-
-
-
 OBJS += $(if $(CONFIG_OPENPOWER_VDDR),openpower_vddr.o,hbVddrMsg.o)
 
-
+#HWP build tool
 include ${ROOTPATH}/procedure.rules.mk
 
+# PLL HWPs
 include ${PROCEDURES_PATH}/hwp/perv/p9_mem_pll_initf.mk
-include ${PROCEDURES_PATH}/hwp/initfiles/p9_mca_scom.mk
-include ${PROCEDURES_PATH}/hwp/initfiles/p9_ddrphy_scom.mk
+include ${PROCEDURES_PATH}/hwp/perv/p9_mem_pll_setup.mk
+include ${PROCEDURES_PATH}/hwp/perv/p9_mem_pll_reset.mk
+
+#Start Memclocks
+include ${PROCEDURES_PATH}/hwp/perv/p9_mem_startclocks.mk
+
+#Scom init
 include ${PROCEDURES_PATH}/hwp/memory/p9_mss_scominit.mk
 include ${PROCEDURES_PATH}/hwp/nest/p9_throttle_sync.mk
 
+include ${PROCEDURES_PATH}/hwp/initfiles/p9_ddrphy_scom.mk
+include ${PROCEDURES_PATH}/hwp/initfiles/p9_mca_scom.mk
 include ${PROCEDURES_PATH}/hwp/initfiles/p9_mcs_scom.mk
 include ${PROCEDURES_PATH}/hwp/initfiles/p9_mcbist_scom.mk
 
-include ${PROCEDURES_PATH}/hwp/perv/p9_mem_startclocks.mk
-include ${PROCEDURES_PATH}/hwp/perv/p9_mem_pll_setup.mk
-
-
+#Dram init
 include ${PROCEDURES_PATH}/hwp/memory/p9_mss_draminit.mk
 include ${PROCEDURES_PATH}/hwp/memory/p9_mss_draminit_training.mk
 include ${PROCEDURES_PATH}/hwp/memory/p9_mss_draminit_mc.mk