add debug messages in HWAS istep functions

add istep trace messages to hwas istep functions, to be consistent with
the other istep functions. add HWAS msg so we knows when the discoverTargets
function is starting and finishing.

Change-Id: Ia51ded05dcaf68fe89c259a7a3e733175a2fc0bd
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/905
Reviewed-by: Mark W. Wenning <wenning@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 34 insertions, 2 deletions

diff --git a/src/include/usr/hwas/plat/hwasPlatTrace.H b/src/include/usr/hwas/plat/hwasPlatTrace.H
index 0dc3d36b2..a82687c30 100644
--- a/src/include/usr/hwas/plat/hwasPlatTrace.H
+++ b/src/include/usr/hwas/plat/hwasPlatTrace.H
@@ -43,6 +43,10 @@ extern trace_desc_t *g_trac_imp_hwas; // important - slow
 #define HWAS_DBG(_fmt_, _args_...) \
     TRACDCOMP(g_trac_dbg_hwas, TRACE_FILENAME _fmt_, ##_args_)
 
+// Information traces (go into slow trace buffer that should not wrap often)
+#define HWAS_INF(_fmt_, _args_...) \
+    TRACFCOMP(g_trac_imp_hwas, TRACE_FILENAME _fmt_, ##_args_)
+
 // Error traces (go into slow trace buffer that should not wrap often)
 #define HWAS_ERR(_fmt_, _args_...) \
     TRACFCOMP(g_trac_imp_hwas, TRACE_FILENAME _fmt_, ##_args_)
diff --git a/src/usr/hwas/hwas.C b/src/usr/hwas/hwas.C
index ff57bcc9e..b53f8da45 100644
--- a/src/usr/hwas/hwas.C
+++ b/src/usr/hwas/hwas.C
@@ -71,7 +71,7 @@ void enableHwasState(Target *i_target)
 
 errlHndl_t discoverTargets()
 {
-    HWAS_DBG("discoverTargets entry");
+    HWAS_INF("discoverTargets entry");
     errlHndl_t errl = NULL;
 
     //  loop through all the targets and set HWAS_STATE to a known default
@@ -211,7 +211,11 @@ errlHndl_t discoverTargets()
 
     if (errl != NULL)
     {
-        HWAS_ERR("returning errl %p", errl);
+        HWAS_ERR("discoverTargets returning errl %p", errl);
+    }
+    else
+    {
+        HWAS_INF("discoverTargets exit with no error");
     }
     return errl;
 } // discoverTargets
diff --git a/src/usr/hwas/plat/hostbootIstep.C b/src/usr/hwas/plat/hostbootIstep.C
index c78b76183..292b4ee3c 100644
--- a/src/usr/hwas/plat/hostbootIstep.C
+++ b/src/usr/hwas/plat/hostbootIstep.C
@@ -34,6 +34,7 @@
 
 #include <fsi/fsiif.H>
 #include <initservice/taskargs.H>
+#include <initservice/isteps_trace.H>
 
 namespace HWAS
 {
@@ -45,8 +46,11 @@ namespace HWAS
 //******************************************************************************
 void host_init_fsi( void *io_pArgs )
 {
+    TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "host_init_fsi entry" );
+
     errlHndl_t errl = FSI::initializeHardware( );
 
+    TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "host_init_fsi exit" );
     task_end2(errl);
 }
 
@@ -55,10 +59,12 @@ void host_init_fsi( void *io_pArgs )
 //******************************************************************************
 void host_set_ipl_parms( void *io_pArgs )
 {
+    TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "host_set_ipl_parms entry" );
     errlHndl_t errl = NULL;
 
     // stub -- nothing here currently
 
+    TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "host_set_ipl_parms exit" );
     task_end2(errl);
 }
 
@@ -67,8 +73,13 @@ void host_set_ipl_parms( void *io_pArgs )
 //******************************************************************************
 void host_discover_targets( void *io_pArgs )
 {
+    TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+                "host_discover_targets entry" );
+
     errlHndl_t errl = discoverTargets();
 
+    TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+                "host_discover_targets exit" );
     task_end2(errl);
 }
 
@@ -77,8 +88,11 @@ void host_discover_targets( void *io_pArgs )
 //******************************************************************************
 void host_gard( void *io_pArgs )
 {
+    TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "host_gard entry" );
+
     errlHndl_t errl = collectGard();
 
+    TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "host_gard exit" );
     task_end2(errl);
 }
 
@@ -87,10 +101,14 @@ void host_gard( void *io_pArgs )
 //******************************************************************************
 void host_cancontinue_clear( void *io_pArgs )
 {
+    TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+                "host_cancontinue_clear entry" );
     errlHndl_t errl = NULL;
 
     // stub -- nothing here currently
 
+    TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+                "host_cancontinue_clear exit" );
     task_end2(errl);
 }
 
@@ -99,10 +117,14 @@ void host_cancontinue_clear( void *io_pArgs )
 //******************************************************************************
 void proc_check_slave_sbe_seeprom_complete( void *io_pArgs )
 {
+    TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+                "proc_check_slave_sbe_seeprom_complete entry" );
     errlHndl_t errl = NULL;
 
     // stub -- nothing here currently
 
+    TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+                "proc_check_slave_sbe_seeprom_complete exit" );
     task_end2(errl);
 }
 
@@ -111,10 +133,12 @@ void proc_check_slave_sbe_seeprom_complete( void *io_pArgs )
 //******************************************************************************
 void proc_xmit_sbe( void *io_pArgs )
 {
+    TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "proc_xmit_sbe entry" );
     errlHndl_t errl = NULL;
 
     // stub -- nothing here currently
 
+    TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "proc_xmit_sbe exit" );
     task_end2(errl);
 }