FAPI_INF entering and exiting message updates

Change-Id: Iac3116df68febfd228e7e0dc19c30526ac932906
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27804
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: PARVATHI RACHAKONDA <prachako@in.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27807
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

27 files changed, 172 insertions, 172 deletions

diff --git a/import/chips/p9/procedures/hwp/perv/p9_perv_sbe_cmn.C b/import/chips/p9/procedures/hwp/perv/p9_perv_sbe_cmn.C
index 25bce2a7..b39fa4c6 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_perv_sbe_cmn.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_perv_sbe_cmn.C
@@ -97,7 +97,7 @@ fapi2::ReturnCode p9_perv_sbe_cmn_array_init_module(const
     fapi2::buffer<uint64_t> l_data64;
     int l_timeout = 0;
     fapi2::buffer<uint64_t> l_data64_clk_region;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_perv_sbe_cmn_array_init_module: Entering ...");
 
     i_regions.extractToRight<5, 11>(l_regions);
 
@@ -253,7 +253,7 @@ fapi2::ReturnCode p9_perv_sbe_cmn_array_init_module(const
         FAPI_TRY(fapi2::putScom(i_target_chiplets, PERV_BIST, 0));
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_perv_sbe_cmn_array_init_module: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -274,7 +274,7 @@ fapi2::ReturnCode p9_perv_sbe_cmn_regions_setup_16(const
     fapi2::buffer<uint32_t> l_read_attr = 0;
     fapi2::buffer<uint32_t> l_read_attr_invert = 0;
     fapi2::buffer<uint32_t> l_read_attr_shift1_right = 0;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_perv_sbe_cmn_regions_setup_16: Entering ...");
 
     FAPI_DBG("Reading ATTR_PG");
     FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PG, i_target_chip, l_read_attr));
@@ -298,7 +298,7 @@ fapi2::ReturnCode p9_perv_sbe_cmn_regions_setup_16(const
         o_regions_value = (i_regions_value & l_read_attr_shift1_right);
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_perv_sbe_cmn_regions_setup_16: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -320,7 +320,7 @@ fapi2::ReturnCode p9_perv_sbe_cmn_regions_setup_64(const
     fapi2::buffer<uint32_t> l_read_attr_invert = 0;
     fapi2::buffer<uint32_t> l_read_attr_shift1_right = 0;
     fapi2::buffer<uint64_t> l_temp = 0;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_perv_sbe_cmn_regions_setup_64: Entering ...");
 
     FAPI_DBG("Reading ATTR_PG");
     FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PG, i_target_chiplet, l_read_attr));
@@ -344,7 +344,7 @@ fapi2::ReturnCode p9_perv_sbe_cmn_regions_setup_64(const
         o_regions_value = (i_regions_value & l_read_attr_shift1_right);
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_perv_sbe_cmn_regions_setup_64: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -376,7 +376,7 @@ fapi2::ReturnCode p9_perv_sbe_cmn_scan0_module(const
     fapi2::buffer<uint16_t> l_scan_types;
     fapi2::buffer<uint64_t> l_data64;
     int l_timeout = 0;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_perv_sbe_cmn_scan0_module: Entering ...");
 
     i_regions.extractToRight<5, 11>(l_regions);
     i_scan_types.extractToRight<4, 12>(l_scan_types);
@@ -463,7 +463,7 @@ fapi2::ReturnCode p9_perv_sbe_cmn_scan0_module(const
         FAPI_TRY(fapi2::putScom(i_target_chiplets, PERV_SCAN_REGION_TYPE, 0));
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_perv_sbe_cmn_scan0_module: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_arrayinit.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_arrayinit.C
index 8f6e2d0c..8c39e131 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_arrayinit.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_arrayinit.C
@@ -65,7 +65,7 @@ fapi2::ReturnCode p9_sbe_arrayinit(const
     fapi2::buffer<uint16_t> l_regions;
     fapi2::buffer<uint32_t> l_attr_pg;
     fapi2::buffer<uint8_t> l_attr_read;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_arrayinit: Entering ...");
 
     FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_SDISN_SETUP, i_target_chip, l_attr_read));
 
@@ -91,7 +91,7 @@ fapi2::ReturnCode p9_sbe_arrayinit(const
         FAPI_TRY(p9_sbe_arrayinit_sdisn_setup(l_chplt_trgt, l_attr_read, false));
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_arrayinit: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -111,7 +111,7 @@ static fapi2::ReturnCode p9_sbe_arrayinit_scan0_and_arrayinit_module_function(
 {
     bool l_read_reg = false;
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_arrayinit_scan0_and_arrayinit_module_function: Entering ...");
 
     FAPI_DBG("Check for chiplet enable");
     //Getting NET_CTRL0 register value
@@ -130,7 +130,7 @@ static fapi2::ReturnCode p9_sbe_arrayinit_scan0_and_arrayinit_module_function(
                                               SCAN_TYPES_EXCEPT_TIME_GPTR_REPR));
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_arrayinit_scan0_and_arrayinit_module_function: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -149,7 +149,7 @@ static fapi2::ReturnCode p9_sbe_arrayinit_sdisn_setup(const
         const bool i_set)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_arrayinit_sdisn_setup: Entering ...");
 
     if ( i_attr )
     {
@@ -171,7 +171,7 @@ static fapi2::ReturnCode p9_sbe_arrayinit_sdisn_setup(const
         }
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_arrayinit_sdisn_setup: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C
index 6355b15a..bc394532 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C
@@ -49,7 +49,7 @@ fapi2::ReturnCode p9_sbe_attr_setup(const
     fapi2::buffer<uint64_t> l_data64;
     bool sbe_slave_chip = false;
     fapi2::buffer<uint64_t> l_read_device_reg = 0;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_attr_setup: Entering ...");
 
     FAPI_DBG("Read Scratch8 for validity of Scratch register");
     //Getting SCRATCH_REGISTER_8 register value
@@ -230,7 +230,7 @@ fapi2::ReturnCode p9_sbe_attr_setup(const
         }
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_attr_setup: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_init.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_init.C
index ef6d585a..fb29c239 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_init.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_init.C
@@ -41,7 +41,7 @@ fapi2::ReturnCode p9_sbe_chiplet_init(const
 {
     bool l_read_reg = false;
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering..");
+    FAPI_INF("p9_sbe_chiplet_init: Entering..");
 
     FAPI_DBG("Check  for XSTOP Bit");
     //Getting INTERRUPT_TYPE_REG register value
@@ -54,7 +54,7 @@ fapi2::ReturnCode p9_sbe_chiplet_init(const
                 .set_READ_CHECKSTOP(l_read_reg),
                 "ERROR:CHECKSTOP BIT GET SET ");
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_init: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_initf.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_initf.C
index 8d16aa06..aa1934e0 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_initf.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_initf.C
@@ -37,7 +37,7 @@
 fapi2::ReturnCode p9_sbe_chiplet_pll_initf(const
         fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chip)
 {
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_pll_initf: Entering ...");
 
     for (auto l_chplt_trgt :  i_target_chip.getChildren<fapi2::TARGET_TYPE_PERV>
          (static_cast<fapi2::TargetFilter>(fapi2::TARGET_FILTER_XBUS |
@@ -112,6 +112,6 @@ fapi2::ReturnCode p9_sbe_chiplet_pll_initf(const
     }
 
 fapi_try_exit:
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_pll_initf: Exiting ...");
     return fapi2::current_err;
 }
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_setup.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_setup.C
index a811ac7b..270a1802 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_setup.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_setup.C
@@ -79,7 +79,7 @@ fapi2::ReturnCode p9_sbe_chiplet_pll_setup(const
         fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chip)
 {
     uint8_t l_read_attr = 0;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_pll_setup: Entering ...");
 
     for (auto l_chplt_trgt : i_target_chip.getChildren<fapi2::TARGET_TYPE_PERV>
          (fapi2::TARGET_FILTER_ALL_MC, fapi2::TARGET_STATE_FUNCTIONAL))
@@ -199,7 +199,7 @@ fapi2::ReturnCode p9_sbe_chiplet_pll_setup(const
         }
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_pll_setup: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -214,7 +214,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_pll_setup_check_pci_pll_lock(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chip)
 {
     fapi2::buffer<uint64_t> l_read_reg;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_pll_setup_check_pci_pll_lock: Entering ...");
 
     FAPI_DBG("Check  PLL lock");
     //Getting PLL_LOCK_REG register value
@@ -226,7 +226,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_pll_setup_check_pci_pll_lock(
                 .set_PLL_READ(l_read_reg),
                 "ERROR:PLL LOCK NOT SET");
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_pll_setup_check_pci_pll_lock: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -241,7 +241,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_pll_setup_check_pll_lock(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chip)
 {
     fapi2::buffer<uint64_t> l_read_reg;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_pll_setup_check_pll_lock: Entering ...");
 
     FAPI_DBG("Check  PLL lock");
     //Getting PLL_LOCK_REG register value
@@ -253,7 +253,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_pll_setup_check_pll_lock(
                 .set_PLL_READ(l_read_reg),
                 "ERROR:PLL LOCK NOT SET");
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_pll_setup_check_pll_lock: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -268,7 +268,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_pll_setup_function(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chiplet)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_pll_setup_function: Entering ...");
 
     FAPI_DBG("Drop PLL Bypass");
     //Setting NET_CTRL0 register value
@@ -288,7 +288,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_pll_setup_function(
     //ERROR_REG = 0xFFFFFFFFFFFFFFFF
     FAPI_TRY(fapi2::putScom(i_target_chiplet, PERV_ERROR_REG, 0xFFFFFFFFFFFFFFFF));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_pll_setup_function: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -303,7 +303,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_pll_setup_mc_dcc_bypass(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chip)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_pll_setup_mc_dcc_bypass: Entering ...");
 
     FAPI_DBG("Drop DCC bypass");
     //Setting NET_CTRL1 register value
@@ -312,7 +312,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_pll_setup_mc_dcc_bypass(
     l_data64.clearBit<PERV_1_NET_CTRL1_CLK_DCC_BYPASS_EN>();
     FAPI_TRY(fapi2::putScom(i_target_chip, PERV_NET_CTRL1_WAND, l_data64));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_pll_setup_mc_dcc_bypass: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -327,7 +327,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_pll_setup_mc_pdly_bypass(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chiplet)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_pll_setup_mc_pdly_bypass: Entering ...");
 
     FAPI_DBG("Drop PDLY bypass");
     //Setting NET_CTRL1 register value
@@ -336,7 +336,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_pll_setup_mc_pdly_bypass(
     l_data64.clearBit<PERV_1_NET_CTRL1_CLK_PDLY_BYPASS_EN>();
     FAPI_TRY(fapi2::putScom(i_target_chiplet, PERV_NET_CTRL1_WAND, l_data64));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_pll_setup_mc_pdly_bypass: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -351,7 +351,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_pll_setup_pll_reset(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chip)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_pll_setup_pll_reset: Entering ...");
 
     FAPI_DBG("Drop PLL Reset");
     //Setting NET_CTRL0 register value
@@ -361,7 +361,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_pll_setup_pll_reset(
 
     fapi2::delay(NS_DELAY, SIM_CYCLE_DELAY);
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_pll_setup_pll_reset: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -376,7 +376,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_pll_setup_pll_test_enable(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chiplet)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_pll_setup_pll_test_enable: Entering ...");
 
     FAPI_DBG("Release PLL test enable for except pcie");
     //Setting NET_CTRL0 register value
@@ -384,7 +384,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_pll_setup_pll_test_enable(
     l_data64.clearBit<PERV_1_NET_CTRL0_PLL_TEST_EN>();  //NET_CTRL0.PLL_TEST_EN = 0
     FAPI_TRY(fapi2::putScom(i_target_chiplet, PERV_NET_CTRL0_WAND, l_data64));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_pll_setup_pll_test_enable: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -400,7 +400,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_pll_setup_strt_pci_nsl_drp_synclk_mux(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chiplet)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_pll_setup_strt_pci_nsl_drp_synclk_mux: Entering ...");
 
     FAPI_DBG("call module clock start stop");
     FAPI_TRY(p9_sbe_common_clock_start_stop(i_target_chiplet, CLOCK_CMD,
@@ -413,7 +413,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_pll_setup_strt_pci_nsl_drp_synclk_mux(
     l_data64.setBit<PERV_1_CPLT_CTRL0_TC_UNIT_SYNCCLK_MUXSEL_DC>();
     FAPI_TRY(fapi2::putScom(i_target_chiplet, PERV_CPLT_CTRL0_CLEAR, l_data64));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_pll_setup_strt_pci_nsl_drp_synclk_mux: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_reset.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_reset.C
index a09c709b..d63d89bb 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_reset.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_reset.C
@@ -138,7 +138,7 @@ fapi2::ReturnCode p9_sbe_chiplet_reset(const
     fapi2::buffer<uint8_t> l_attr_vitl_setup;
     fapi2::buffer<uint8_t> l_attr_hang_cnt6_setup;
     fapi2::TargetState l_target_state = fapi2::TARGET_STATE_FUNCTIONAL;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset: Entering ...");
 
     FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_VITL_CLK_SETUP, i_target_chip,
                            l_attr_vitl_setup));
@@ -407,7 +407,7 @@ fapi2::ReturnCode p9_sbe_chiplet_reset(const
         FAPI_TRY(p9_sbe_chiplet_reset_scan0_call(l_target_cplt));
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -436,7 +436,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_all_cplt_hang_cnt_setup(
     const uint8_t i_reg6_val)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_all_cplt_hang_cnt_setup: Entering ...");
 
     //Setting HANG_PULSE_0_REG register value (Setting all fields)
     if (i_reg0_val != 0xff)
@@ -508,7 +508,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_all_cplt_hang_cnt_setup(
         FAPI_TRY(fapi2::putScom(i_target_cplt, PERV_HANG_PULSE_6_REG, l_data64));
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_all_cplt_hang_cnt_setup: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -522,7 +522,7 @@ fapi_try_exit:
 static fapi2::ReturnCode p9_sbe_chiplet_reset_all_cplt_net_cntl_setup(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_cplt)
 {
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_all_cplt_net_cntl_setup: Entering ...");
 
     //Setting NET_CTRL0 register value
     //NET_CTRL0 = p9SbeChipletReset::NET_CNTL0_HW_INIT_VALUE
@@ -533,7 +533,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_all_cplt_net_cntl_setup(
     FAPI_TRY(fapi2::putScom(i_target_cplt, PERV_NET_CTRL1,
                             p9SbeChipletReset::NET_CNTL1_HW_INIT_VALUE));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_all_cplt_net_cntl_setup:Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -550,7 +550,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_clk_mux_MC(
     const fapi2::buffer<uint32_t> i_clk_mux_value)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_clk_mux_MC: Entering ...");
 
     //Setting NET_CTRL1 register value
     FAPI_TRY(fapi2::getScom(i_target_chiplet, PERV_NET_CTRL1, l_data64));
@@ -558,7 +558,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_clk_mux_MC(
     l_data64.writeBit<PERV_1_NET_CTRL1_PLL_CLKIN_SEL>(i_clk_mux_value.getBit<3>());
     FAPI_TRY(fapi2::putScom(i_target_chiplet, PERV_NET_CTRL1, l_data64));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_clk_mux_MC: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -573,7 +573,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_clk_mux_call(
     const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chiplet)
 {
     fapi2::buffer<uint32_t> l_read_attr;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_clk_mux_call: Entering ...");
 
     FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CLOCK_PLL_MUX, i_target_chiplet,
                            l_read_attr));
@@ -606,7 +606,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_clk_mux_call(
         FAPI_TRY(p9_sbe_chiplet_reset_clk_mux_pcie(l_target_cplt, l_read_attr));
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_clk_mux_call: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -625,7 +625,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_clk_mux_obus(
 {
     uint8_t l_attr_unit_pos = 0;
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_clk_mux_obus: Entering ...");
 
     FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_UNIT_POS, i_target_chiplet,
                            l_attr_unit_pos));
@@ -674,7 +674,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_clk_mux_obus(
         FAPI_TRY(fapi2::putScom(i_target_chiplet, PERV_NET_CTRL1, l_data64));
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_clk_mux_obus: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -693,7 +693,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_clk_mux_pcie(
 {
     uint8_t l_attr_unit_pos = 0;
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_clk_mux_pcie: Entering ...");
 
     FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_UNIT_POS, i_target_chiplet,
                            l_attr_unit_pos));
@@ -717,7 +717,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_clk_mux_pcie(
         FAPI_TRY(fapi2::putScom(i_target_chiplet, PERV_NET_CTRL1, l_data64));
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_clk_mux_pcie: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -735,7 +735,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_clk_mux_xbus(
     const fapi2::buffer<uint32_t> i_clk_mux_value)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_clk_mux_xbus: Entering ...");
 
     //Setting NET_CTRL1 register value
     FAPI_TRY(fapi2::getScom(i_target_chiplet, PERV_NET_CTRL1, l_data64));
@@ -743,7 +743,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_clk_mux_xbus(
     l_data64.writeBit<PERV_1_NET_CTRL1_PLL_CLKIN_SEL>(i_clk_mux_value.getBit<8>());
     FAPI_TRY(fapi2::putScom(i_target_chiplet, PERV_NET_CTRL1, l_data64));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_clk_mux_xbus: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -758,7 +758,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_div_clk_bypass(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chiplet)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_div_clk_bypass: Entering ...");
 
     FAPI_DBG("drop clk_div_bypass_en");
     //Setting NET_CTRL1 register value
@@ -767,7 +767,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_div_clk_bypass(
     l_data64.clearBit<PERV_1_NET_CTRL1_CLK_DIV_BYPASS_EN>();
     FAPI_TRY(fapi2::putScom(i_target_chiplet, PERV_NET_CTRL1_WAND, l_data64));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_div_clk_bypass: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -784,7 +784,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_enable_listen_to_sync(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chiplet,
     const bool i_enable)
 {
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_enable_listen_to_sync: Entering ...");
 
     //Setting SYNC_CONFIG register value
     //SYNC_CONFIG = i_enable? p9SbeChipletReset::SYNC_CONFIG_DEFAULT : p9SbeChipletReset::SYNC_CONFIG_4TO1
@@ -792,7 +792,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_enable_listen_to_sync(
                             i_enable ? p9SbeChipletReset::SYNC_CONFIG_DEFAULT :
                             p9SbeChipletReset::SYNC_CONFIG_4TO1));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_enable_listen_to_sync: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -807,7 +807,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_hsspowergate(
     const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chip)
 {
     fapi2::buffer<uint64_t> l_read_reg;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_hsspowergate: Entering ...");
 
     //Getting ROOT_CTRL2 register value
     FAPI_TRY(fapi2::getScom(i_target_chip, PERV_ROOT_CTRL2_SCOM,
@@ -820,7 +820,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_hsspowergate(
     //PIB.ROOT_CTRL2 = l_read_reg
     FAPI_TRY(fapi2::putScom(i_target_chip, PERV_ROOT_CTRL2_SCOM, l_read_reg));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_hsspowergate: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -837,7 +837,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_mc_async_reset_setup(
     const bool i_drop)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_mc_async_reset_setup: Entering ...");
 
     if ( i_drop )
     {
@@ -861,7 +861,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_mc_async_reset_setup(
         }
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_mc_async_reset_setup: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -880,7 +880,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_mc_setup(const
         const uint64_t i_mc_grp2_val,
         const uint64_t i_mc_grp3_val)
 {
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_mc_setup: Entering ...");
 
     //Setting MULTICAST_GROUP_1 register value
     //MULTICAST_GROUP_1 (register) = i_mc_grp1_val
@@ -903,7 +903,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_mc_setup(const
                                 i_mc_grp3_val));
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_mc_setup: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -918,7 +918,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_mc_setup_cache(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chiplet)
 {
     uint32_t l_attr_pg = 0;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_mc_setup_cache: Entering ...");
 
     FAPI_DBG("Reading ATTR_PG");
     FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PG, i_target_chiplet, l_attr_pg));
@@ -951,7 +951,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_mc_setup_cache(
                                 p9SbeChipletReset::MCGR_CNFG_SETTING_GROUP6));
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_mc_setup_cache: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -973,7 +973,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_nest_hang_cnt_setup(
     const uint8_t l_n2 = 0x04;
     const uint8_t l_n3 = 0x05;
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_nest_hang_cnt_setup: Entering ...");
 
     // Collecting partial good and chiplet unit position attribute
     FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_UNIT_POS, i_target_cplt,
@@ -1056,7 +1056,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_nest_hang_cnt_setup(
         FAPI_TRY(fapi2::putScom(i_target_cplt, PERV_HANG_PULSE_4_REG, l_data64));
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_nest_hang_cnt_setup: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -1071,7 +1071,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_nest_ob_async_reset(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chiplet)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_nest_ob_async_reset: Entering ...");
 
     //Setting NET_CTRL0 register value
     l_data64.flush<1>();
@@ -1079,7 +1079,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_nest_ob_async_reset(
     l_data64.clearBit<PERV_1_NET_CTRL0_CLK_ASYNC_RESET>();
     FAPI_TRY(fapi2::putScom(i_target_chiplet, PERV_NET_CTRL0_WAND, l_data64));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_nest_ob_async_reset: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -1096,7 +1096,7 @@ p9_sbe_chiplet_reset_net_ctrl_lvltrans_fence_pcb_ep_reset(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chiplet)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_net_ctrl_lvltrans_fence_pcb_ep_reset: Entering ...");
 
     FAPI_DBG("Drop lvltrans fence");
     //Setting NET_CTRL0 register value
@@ -1112,7 +1112,7 @@ p9_sbe_chiplet_reset_net_ctrl_lvltrans_fence_pcb_ep_reset(
     l_data64.clearBit<PERV_1_NET_CTRL0_PCB_EP_RESET>();
     FAPI_TRY(fapi2::putScom(i_target_chiplet, PERV_NET_CTRL0_WAND, l_data64));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_net_ctrl_lvltrans_fence_pcb_ep_reset: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -1128,7 +1128,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_opcg_cnfg(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chiplet)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_opcg_cnfg: Entering ...");
 
     //Setting OPCG_ALIGN register value
     l_data64 =
@@ -1142,7 +1142,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_opcg_cnfg(
     (p9SbeChipletReset::SCAN_RATIO_0X3);  //OPCG_ALIGN.SCAN_RATIO = p9SbeChipletReset::SCAN_RATIO_0X3
     FAPI_TRY(fapi2::putScom(i_target_chiplet, PERV_OPCG_ALIGN, l_data64));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_opcg_cnfg: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -1157,7 +1157,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_opcg_cnfg_scan_ratio(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_cplt)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_opcg_cnfg_scan_ratio: Entering ...");
 
     FAPI_DBG("Set scan ratio to 1:1 as long as PLL is in bypass mode");
     //Setting OPCG_ALIGN register value
@@ -1166,7 +1166,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_opcg_cnfg_scan_ratio(
     (p9SbeChipletReset::SCAN_RATIO_0X0);  //OPCG_ALIGN.SCAN_RATIO = p9SbeChipletReset::SCAN_RATIO_0X0
     FAPI_TRY(fapi2::putScom(i_target_cplt, PERV_OPCG_ALIGN, l_data64));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_opcg_cnfg_scan_ratio: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -1183,7 +1183,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_pll_setup(
     const bool i_enable)
 {
     fapi2::buffer<uint64_t> l_data;;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_pll_setup: Entering ...");
 
     if ( i_enable )
     {
@@ -1209,7 +1209,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_pll_setup(
         }
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_pll_setup: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -1224,7 +1224,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_scan0_call(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chip)
 {
     fapi2::buffer<uint16_t> l_regions;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_scan0_call: Entering ...");
 
     FAPI_TRY(p9_perv_sbe_cmn_regions_setup_16(i_target_chip,
              p9SbeChipletReset::REGIONS_EXCEPT_VITAL, l_regions));
@@ -1237,7 +1237,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_scan0_call(
     FAPI_TRY(p9_perv_sbe_cmn_scan0_module(i_target_chip, l_regions,
                                           p9SbeChipletReset::SCAN_TYPES_EXCEPT_TIME_GPTR_REPR));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_scan0_call: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -1254,7 +1254,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_setup(const
     // Local variable and constant definition
     const uint64_t l_error_default_value = 0xFFFFFFFFFFFFFFFFull;
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_setup: Entering ...");
 
     // EP Reset all chiplet with in multicasting group
     //Setting NET_CTRL0 register value
@@ -1268,7 +1268,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_setup(const
     FAPI_TRY(fapi2::putScom(i_target_chiplet, PERV_ERROR_REG,
                             l_error_default_value));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_setup: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -1283,7 +1283,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_setup_iop_logic(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chip)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_chiplet_reset_setup_iop_logic: Entering ...");
 
     //Setting CPLT_CONF1 register value
     l_data64.flush<0>();
@@ -1299,7 +1299,7 @@ static fapi2::ReturnCode p9_sbe_chiplet_reset_setup_iop_logic(
     l_data64.setBit<29>();  //CPLT_CONF1.TC_IOP_SYS_RESET_PMA = 0b1
     FAPI_TRY(fapi2::putScom(i_target_chip, PERV_CPLT_CONF1_OR, l_data64));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_chiplet_reset_setup_iop_logic:Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_common.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_common.C
index 3ef92312..7bb47164 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_common.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_common.C
@@ -59,7 +59,7 @@ fapi2::ReturnCode p9_sbe_common_align_chiplets(const
 {
     fapi2::buffer<uint64_t> l_data64;
     int l_timeout = 0;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_common_align_chiplets: Entering ...");
 
     FAPI_DBG("For all chiplets: exit flush");
     //Setting CPLT_CTRL0 register value
@@ -124,7 +124,7 @@ fapi2::ReturnCode p9_sbe_common_align_chiplets(const
     l_data64.setBit<PERV_1_CPLT_CTRL0_CTRL_CC_FORCE_ALIGN_DC>();
     FAPI_TRY(fapi2::putScom(i_target_chiplets, PERV_CPLT_CTRL0_CLEAR, l_data64));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_common_align_chiplets: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -154,7 +154,7 @@ fapi2::ReturnCode p9_sbe_common_check_cc_status_function(
     fapi2::buffer<uint16_t> l_nsl_clkregion_status;
     fapi2::buffer<uint16_t> l_ary_clkregion_status;
     fapi2::buffer<uint16_t> l_regions;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_common_check_cc_status_function: Entering ...");
 
     l_reg_sl = i_clock_types.getBit<5>();
     l_reg_nsl = i_clock_types.getBit<6>();
@@ -269,7 +269,7 @@ fapi2::ReturnCode p9_sbe_common_check_cc_status_function(
         }
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_common_check_cc_status_function: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -283,7 +283,7 @@ fapi2::ReturnCode p9_sbe_common_check_checkstop_function(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chiplet)
 {
     fapi2::buffer<uint64_t> l_read_reg;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_common_check_checkstop_function: Entering ...");
 
     FAPI_DBG("Check checkstop register");
     //Getting XFIR register value
@@ -295,7 +295,7 @@ fapi2::ReturnCode p9_sbe_common_check_checkstop_function(
                 .set_READ_ALL_CHECKSTOP(l_read_reg),
                 "ERROR: COMBINE ALL CHECKSTOP ERROR");
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_common_check_checkstop_function: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -317,7 +317,7 @@ fapi2::ReturnCode p9_sbe_common_check_status(const fapi2::buffer<uint64_t>
         const fapi2::buffer<uint8_t> i_clock_cmd,
         fapi2::buffer<uint64_t>& o_exp_clock_status)
 {
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_common_check_status: Entering ...");
 
     if ( (i_reg) && (i_clock_cmd == 0b01) )
     {
@@ -335,7 +335,7 @@ fapi2::ReturnCode p9_sbe_common_check_status(const fapi2::buffer<uint64_t>
         }
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_common_check_status: Exiting ...");
 
     return fapi2::FAPI2_RC_SUCCESS;
 
@@ -374,7 +374,7 @@ fapi2::ReturnCode p9_sbe_common_clock_start_stop(const
     bool l_reg_ary = false;
     fapi2::buffer<uint64_t> l_data64;
     int l_timeout = 0;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_common_clock_start_stop: Entering ...");
 
     i_regions.extractToRight<53, 11>(l_regions);
     i_clock_types.extractToRight<5, 3>(l_reg_all);
@@ -503,7 +503,7 @@ fapi2::ReturnCode p9_sbe_common_clock_start_stop(const
                     "CLOCK RUNNING STATUS IS NOT MATCHING WITH EXPECTED VALUE FOR ARRAY TYPE");
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_common_clock_start_stop: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -524,7 +524,7 @@ fapi2::ReturnCode p9_sbe_common_cplt_ctrl_action_function(
     fapi2::buffer <uint16_t> l_cplt_ctrl_init;
     fapi2::buffer<uint32_t> l_attr_pg;
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_common_cplt_ctrl_action_function: Entering ...");
 
     l_attr_pg = i_attr_pg;
     l_attr_pg.invert();
@@ -550,7 +550,7 @@ fapi2::ReturnCode p9_sbe_common_cplt_ctrl_action_function(
     l_data64.setBit<PERV_1_CPLT_CTRL0_TC_UNIT_SYNCCLK_MUXSEL_DC>();
     FAPI_TRY(fapi2::putScom(i_target_chiplet, PERV_CPLT_CTRL0_CLEAR, l_data64));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_common_cplt_ctrl_action_function: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -565,7 +565,7 @@ fapi2::ReturnCode p9_sbe_common_flushmode(const
         fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chiplet)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_common_flushmode: Entering ...");
 
     FAPI_DBG("Clear flush_inhibit to go in to flush mode");
     //Setting CPLT_CTRL0 register value
@@ -574,7 +574,7 @@ fapi2::ReturnCode p9_sbe_common_flushmode(const
     l_data64.setBit<PERV_1_CPLT_CTRL0_CTRL_CC_FLUSHMODE_INH_DC>();
     FAPI_TRY(fapi2::putScom(i_target_chiplet, PERV_CPLT_CTRL0_CLEAR, l_data64));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_common_flushmode: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -591,7 +591,7 @@ fapi2::ReturnCode p9_sbe_common_get_pg_vector(const
         fapi2::buffer<uint64_t>& o_pg_vector)
 {
     fapi2::buffer<uint8_t> l_read_attrunitpos;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_common_get_pg_vector: Entering ...");
 
     FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_UNIT_POS, i_target_chip,
                            l_read_attrunitpos));
@@ -621,7 +621,7 @@ fapi2::ReturnCode p9_sbe_common_get_pg_vector(const
         o_pg_vector.setBit<4>();
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_common_get_pg_vector: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -636,7 +636,7 @@ fapi2::ReturnCode p9_sbe_common_set_scan_ratio(const
         fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chiplets)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_common_set_scan_ratio: Entering ...");
 
     //Setting OPCG_ALIGN register value
     FAPI_TRY(fapi2::getScom(i_target_chiplets, PERV_OPCG_ALIGN, l_data64));
@@ -644,7 +644,7 @@ fapi2::ReturnCode p9_sbe_common_set_scan_ratio(const
     (0xE0);  //OPCG_ALIGN.SCAN_RATIO = 0xE0
     FAPI_TRY(fapi2::putScom(i_target_chiplets, PERV_OPCG_ALIGN, l_data64));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_common_set_scan_ratio: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_initf.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_initf.C
index cffca0b4..8896a979 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_initf.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_initf.C
@@ -39,7 +39,7 @@ fapi2::ReturnCode p9_sbe_gptr_time_initf(const
 {
     uint8_t l_attr_chip_unit_pos = 0; //actual value is read in FAPI_ATTR_GET below
 
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_gptr_time_initf: Entering ...");
 
     for (auto l_chplt_trgt : i_target_chip.getChildren<fapi2::TARGET_TYPE_MCBIST>
          (fapi2::TARGET_STATE_FUNCTIONAL))
@@ -275,7 +275,7 @@ fapi2::ReturnCode p9_sbe_gptr_time_initf(const
     }
 
 fapi_try_exit:
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_gptr_time_initf: Exiting ...");
     return fapi2::current_err;
 
 }
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_io_initf.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_io_initf.C
index 50167b78..fbe703ce 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_io_initf.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_io_initf.C
@@ -37,7 +37,7 @@
 
 fapi2::ReturnCode p9_sbe_io_initf(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chip)
 {
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_io_initf: Entering ...");
     uint8_t l_attr_chip_unit_pos = 0;
 
     for (auto l_chplt_trgt : i_target_chip.getChildren<fapi2::TARGET_TYPE_PERV>(fapi2::TARGET_STATE_FUNCTIONAL))
@@ -123,6 +123,6 @@ fapi2::ReturnCode p9_sbe_io_initf(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CH
     }
 
 fapi_try_exit:
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_io_initf: Exiting ...");
     return fapi2::current_err;
 }
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_lpc_init.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_lpc_init.C
index 244b7f96..fbf1a3ad 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_lpc_init.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_lpc_init.C
@@ -40,7 +40,7 @@ fapi2::ReturnCode p9_sbe_lpc_init(const
                                   fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chip)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_DBG("Entering ...");
+    FAPI_DBG("p9_sbe_lpc_init: Entering ...");
 
     // set LPC clock mux select to internal clock
     //Setting CPLT_CTRL0 register value
@@ -59,7 +59,7 @@ fapi2::ReturnCode p9_sbe_lpc_init(const
     FAPI_TRY(fapi2::putScom(i_target_chip, PERV_N3_CPLT_CONF1_OR, l_data64));
     FAPI_TRY(fapi2::putScom(i_target_chip, PERV_N3_CPLT_CONF1_CLEAR, l_data64));
 
-    FAPI_DBG("Exiting ...");
+    FAPI_DBG("p9_sbe_lpc_init: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_enable_ridi.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_enable_ridi.C
index e182e965..4364e234 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_enable_ridi.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_enable_ridi.C
@@ -7,7 +7,7 @@
 /*                                                                        */
 /* EKB Project                                                            */
 /*                                                                        */
-/* COPYRIGHT 2015                                                         */
+/* COPYRIGHT 2015,2016                                                    */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -44,7 +44,7 @@ fapi2::ReturnCode p9_sbe_nest_enable_ridi(const
     auto l_perv_functional_vector =
         i_target_chip.getChildren<fapi2::TARGET_TYPE_PERV>
         (fapi2::TARGET_STATE_FUNCTIONAL);
-    FAPI_DBG("Entering ...");
+    FAPI_DBG("p9_sbe_nest_enable_ridi: Entering ...");
 
     for (auto l_chplt_trgt : l_perv_functional_vector)
     {
@@ -65,7 +65,7 @@ fapi2::ReturnCode p9_sbe_nest_enable_ridi(const
         FAPI_TRY(p9_sbe_nest_enable_ridi_net_ctrl_action_function(l_chplt_trgt));
     }
 
-    FAPI_DBG("Exiting ...");
+    FAPI_DBG("p9_sbe_nest_enable_ridi: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -81,7 +81,7 @@ static fapi2::ReturnCode p9_sbe_nest_enable_ridi_net_ctrl_action_function(
 {
     bool l_read_reg = false;
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_DBG("Entering ...");
+    FAPI_DBG("p9_sbe_nest_enable_ridi_net_ctrl_action_function: Entering ...");
 
     FAPI_INF("Check for chiplet enable");
     //Getting NET_CTRL0 register value
@@ -99,7 +99,7 @@ static fapi2::ReturnCode p9_sbe_nest_enable_ridi_net_ctrl_action_function(
         FAPI_TRY(fapi2::putScom(i_target_chiplet, PERV_NET_CTRL0_WOR, l_data64));
     }
 
-    FAPI_DBG("Exiting ...");
+    FAPI_DBG("p9_sbe_nest_enable_ridi_net_ctrl_action_function: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_startclocks.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_startclocks.C
index 34f6619a..4ff09844 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_startclocks.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_startclocks.C
@@ -79,7 +79,7 @@ fapi2::ReturnCode p9_sbe_nest_startclocks(const
     fapi2::buffer<uint64_t> l_n3_clock_regions;
     fapi2::buffer<uint16_t> l_ccstatus_regions;
     fapi2::buffer<uint16_t> l_n3_ccstatus_regions;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_nest_startclocks: Entering ...");
 
     FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_N3_FLUSH_MODE, i_target_chip,
                            l_read_flush_attr));
@@ -258,7 +258,7 @@ fapi2::ReturnCode p9_sbe_nest_startclocks(const
         }
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_nest_startclocks: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -275,7 +275,7 @@ static fapi2::ReturnCode p9_sbe_nest_startclocks_N3_fence_drop(
     const fapi2::buffer<uint64_t> i_pg_vector)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_nest_startclocks_N3_fence_drop: Entering ...");
 
     if ( i_pg_vector.getBit<0>() == 1 )
     {
@@ -286,7 +286,7 @@ static fapi2::ReturnCode p9_sbe_nest_startclocks_N3_fence_drop(
         FAPI_TRY(fapi2::putScom(i_target_chip, PERV_NET_CTRL0_WAND, l_data64));
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_nest_startclocks_N3_fence_drop: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -302,11 +302,11 @@ static fapi2::ReturnCode p9_sbe_nest_startclocks_get_attr_pg(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chip,
     fapi2::buffer<uint32_t>& o_attr_pg)
 {
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_nest_startclocks_get_attr_pg: Entering ...");
 
     FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PG, i_target_chip, o_attr_pg));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_nest_startclocks_get_attr_pg: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -324,7 +324,7 @@ static fapi2::ReturnCode p9_sbe_nest_startclocks_mc_fence_drop(
 {
     uint8_t l_read_attrunitpos = 0;
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_nest_startclocks_mc_fence_drop: Entering ...");
 
     FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_UNIT_POS, i_target_chip,
                            l_read_attrunitpos));
@@ -353,7 +353,7 @@ static fapi2::ReturnCode p9_sbe_nest_startclocks_mc_fence_drop(
         }
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_nest_startclocks_mc_fence_drop: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -370,7 +370,7 @@ static fapi2::ReturnCode p9_sbe_nest_startclocks_nest_fence_drop(
     const fapi2::buffer<uint64_t> i_pg_vector)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_nest_startclocks_nest_fence_drop: Entering ...");
 
     if ( i_pg_vector.getBit<4>() == 1 )
     {
@@ -381,7 +381,7 @@ static fapi2::ReturnCode p9_sbe_nest_startclocks_nest_fence_drop(
         FAPI_TRY(fapi2::putScom(i_target_chip, PERV_NET_CTRL0_WAND, l_data64));
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_nest_startclocks_nest_fence_drop: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_initf.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_initf.C
index 2a740225..259bc49b 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_initf.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_initf.C
@@ -36,7 +36,7 @@
 fapi2::ReturnCode p9_sbe_npll_initf(const
                                     fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chip)
 {
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_npll_initf: Entering ...");
 
     uint8_t l_read_attr = 0;
     const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM> FAPI_SYSTEM;
@@ -80,6 +80,6 @@ fapi2::ReturnCode p9_sbe_npll_initf(const
              "Error from putRing (perv_pll_bndy, ringID: %d)", ringID);
 
 fapi_try_exit:
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_npll_initf: Exiting ...");
     return fapi2::current_err;
 }
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_setup.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_setup.C
index bf3f762e..23aa16a8 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_setup.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_setup.C
@@ -52,7 +52,7 @@ fapi2::ReturnCode p9_sbe_npll_setup(const
     uint8_t l_read_attr = 0;
     fapi2::buffer<uint64_t> l_data64_root_ctrl8;
     fapi2::buffer<uint64_t> l_data64_perv_ctrl0;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_npll_setup: Entering ...");
 
     FAPI_DBG("Reading ROOT_CTRL8 register value");
     //Getting ROOT_CTRL8 register value
@@ -228,7 +228,7 @@ fapi2::ReturnCode p9_sbe_npll_setup(const
     FAPI_TRY(fapi2::putScom(i_target_chip, PERV_PERV_CTRL0_SCOM,
                             l_data64_perv_ctrl0));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_npll_setup: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_repr_initf.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_repr_initf.C
index 0310f305..ae814f43 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_repr_initf.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_repr_initf.C
@@ -37,7 +37,7 @@ fapi2::ReturnCode p9_sbe_repr_initf(const
                                     fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chip)
 {
     uint8_t l_attr_chip_unit_pos = 0;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_repr_initf: Entering ...");
 
     for (auto l_chplt_trgt : i_target_chip.getChildren<fapi2::TARGET_TYPE_MCBIST>(fapi2::TARGET_STATE_FUNCTIONAL))
     {
@@ -164,7 +164,7 @@ fapi2::ReturnCode p9_sbe_repr_initf(const
     }
 
 fapi_try_exit:
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_repr_initf: Exiting ...");
     return fapi2::current_err;
 
 }
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_startclock_chiplets.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_startclock_chiplets.C
index eef4fb29..59242fb4 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_startclock_chiplets.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_startclock_chiplets.C
@@ -80,7 +80,7 @@ fapi2::ReturnCode p9_sbe_startclock_chiplets(const
     fapi2::buffer<uint64_t> l_regions;
     fapi2::buffer<uint8_t> l_attr_obus_ratio;
     fapi2::buffer<uint32_t> l_attr_pg;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_startclock_chiplets: Entering ...");
 
     FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_OBUS_RATIO_VALUE, i_target_chiplets,
                            l_attr_obus_ratio));
@@ -166,7 +166,7 @@ fapi2::ReturnCode p9_sbe_startclock_chiplets(const
         FAPI_TRY(p9_sbe_common_flushmode(l_trgt_chplt));
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_startclock_chiplets: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -182,11 +182,11 @@ static fapi2::ReturnCode p9_sbe_startclock_chiplets_get_attr_pg(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chip,
     fapi2::buffer<uint32_t>& o_attr_pg)
 {
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_startclock_chiplets_get_attr_pg: Entering ...");
 
     FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PG, i_target_chip, o_attr_pg));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_startclock_chiplets_get_attr_pg: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -203,7 +203,7 @@ static fapi2::ReturnCode p9_sbe_startclock_chiplets_ob_fence_drop(
     const fapi2::buffer<uint64_t> i_pg_vector)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_startclock_chiplets_ob_fence_drop: Entering ...");
 
     FAPI_INF("Drop chiplet fence");
 
@@ -216,7 +216,7 @@ static fapi2::ReturnCode p9_sbe_startclock_chiplets_ob_fence_drop(
         FAPI_TRY(fapi2::putScom(i_target_chip, PERV_NET_CTRL0_WAND, l_data64));
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_startclock_chiplets_ob_fence_drop: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -233,7 +233,7 @@ static fapi2::ReturnCode p9_sbe_startclock_chiplets_pci_fence_drop(
     const fapi2::buffer<uint64_t> i_pg_vector)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_startclock_chiplets_pci_fence_drop: Entering ...");
 
     FAPI_INF("Drop chiplet fence");
 
@@ -246,7 +246,7 @@ static fapi2::ReturnCode p9_sbe_startclock_chiplets_pci_fence_drop(
         FAPI_TRY(fapi2::putScom(i_target_chip, PERV_NET_CTRL0_WAND, l_data64));
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_startclock_chiplets_pci_fence_drop: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -263,14 +263,14 @@ static fapi2::ReturnCode p9_sbe_startclock_chiplets_set_ob_ratio(
     const uint8_t i_attr)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_startclock_chiplets_set_ob_ratio: Entering ...");
 
     //Setting CPLT_CONF1 register value
     FAPI_TRY(fapi2::getScom(i_target_chip, PERV_CPLT_CONF1, l_data64));
     l_data64.insertFromRight<16, 2>(i_attr);  //CPLT_CONF1.TC_OB_RATIO_DC = i_attr
     FAPI_TRY(fapi2::putScom(i_target_chip, PERV_CPLT_CONF1, l_data64));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_startclock_chiplets_set_ob_ratio: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -285,14 +285,14 @@ static fapi2::ReturnCode p9_sbe_startclock_chiplets_sync_config(
     const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_target_chiplet)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_startclock_chiplets_sync_config: Entering ...");
 
     //Setting SYNC_CONFIG register value
     FAPI_TRY(fapi2::getScom(i_target_chiplet, PERV_SYNC_CONFIG, l_data64));
     l_data64.setBit<4>();  //SYNC_CONFIG.LISTEN_TO_SYNC_PULSE_DIS = 0b1
     FAPI_TRY(fapi2::putScom(i_target_chiplet, PERV_SYNC_CONFIG, l_data64));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_startclock_chiplets_sync_config: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -309,7 +309,7 @@ static fapi2::ReturnCode p9_sbe_startclock_chiplets_xb_fence_drop(
     const fapi2::buffer<uint64_t> i_pg_vector)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_startclock_chiplets_xb_fence_drop: Entering ...");
 
     FAPI_INF("Drop chiplet fence");
 
@@ -322,7 +322,7 @@ static fapi2::ReturnCode p9_sbe_startclock_chiplets_xb_fence_drop(
         FAPI_TRY(fapi2::putScom(i_target_chip, PERV_NET_CTRL0_WAND, l_data64));
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_startclock_chiplets_xb_fence_drop: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_arrayinit.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_arrayinit.C
index 0f35e474..1e117c24 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_arrayinit.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_arrayinit.C
@@ -64,7 +64,7 @@ fapi2::ReturnCode p9_sbe_tp_arrayinit(const
     fapi2::buffer<uint16_t> l_regions;
     fapi2::buffer<uint8_t> l_attr_read;
 
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_tp_arrayinit: Entering ...");
 
     FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_SDISN_SETUP, i_target_chip, l_attr_read));
 
@@ -104,7 +104,7 @@ fapi2::ReturnCode p9_sbe_tp_arrayinit(const
     //PIB.PIBMEM_REPAIR_REGISTER_0 = 0x8000000000000000
     FAPI_TRY(fapi2::putScom(i_target_chip, PU_PIBMEM_REPAIR_REGISTER_0, PIBMEM_INCLUDE_ABIST));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_tp_arrayinit: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -123,7 +123,7 @@ static fapi2::ReturnCode p9_sbe_tp_arrayinit_sdisn_setup(
     const bool i_set)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_tp_arrayinit_sdisn_setup: Entering ...");
 
     if ( i_attr )
     {
@@ -145,7 +145,7 @@ static fapi2::ReturnCode p9_sbe_tp_arrayinit_sdisn_setup(
         }
     }
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_tp_arrayinit_sdisn_setup: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init1.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init1.C
index 6b5801d9..e97e1a8d 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init1.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init1.C
@@ -50,7 +50,7 @@ fapi2::ReturnCode p9_sbe_tp_chiplet_init1(const
 {
     fapi2::buffer<uint16_t> l_regions;
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_tp_chiplet_init1: Entering ...");
 
     FAPI_DBG("Release PCB Reset");
     //Setting ROOT_CTRL0 register value
@@ -104,7 +104,7 @@ fapi2::ReturnCode p9_sbe_tp_chiplet_init1(const
                          fapi2::TARGET_STATE_FUNCTIONAL)[0], l_regions,
                  SCAN_TYPES_EXCEPT_TIME_GPTR_REPR));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_tp_chiplet_init1: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init2.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init2.C
index e6bdc3fe..54ad0e8b 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init2.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init2.C
@@ -38,10 +38,10 @@ fapi2::ReturnCode p9_sbe_tp_chiplet_init2(const
         fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chip)
 {
 
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_tp_chiplet_init2: Entering ...");
 
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_tp_chiplet_init2: Exiting ...");
 
     return fapi2::FAPI2_RC_SUCCESS;
 }
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init3.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init3.C
index 0586e44e..6656aed2 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init3.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init3.C
@@ -72,7 +72,7 @@ fapi2::ReturnCode p9_sbe_tp_chiplet_init3(const
                 fapi2::TARGET_STATE_FUNCTIONAL)[0];
     fapi2::buffer<uint64_t> l_data64;
     int l_timeout = 0;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_tp_chiplet_init3: Entering ...");
 
     FAPI_DBG("Reading ATTR_PFET_OFF_CONTROLS");
     FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PFET_OFF_CONTROLS, i_target_chip,
@@ -210,7 +210,7 @@ fapi2::ReturnCode p9_sbe_tp_chiplet_init3(const
                 fapi2::CALIBRATION_NOT_DONE(),
                 "Calibration not done, bit16 not set");
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_tp_chiplet_init3: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -226,7 +226,7 @@ static fapi2::ReturnCode p9_sbe_tp_chiplet_init3_clock_test2(
 {
     fapi2::buffer<uint64_t> l_read ;
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_tp_chiplet_init3_clock_test2: Entering ...");
 
     FAPI_DBG("unfence 281D");
     //Setting ROOT_CTRL0 register value
@@ -305,7 +305,7 @@ static fapi2::ReturnCode p9_sbe_tp_chiplet_init3_clock_test2(
 
 #endif
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_tp_chiplet_init3_clock_test2: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -323,7 +323,7 @@ static fapi2::ReturnCode p9_sbe_tp_chiplet_init3_region_fence_setup(
     fapi2::buffer <uint32_t> l_attr_pg;
     fapi2::buffer <uint16_t> l_attr_pg_data;
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_tp_chiplet_init3_region_fence_setup: Entering ...");
 
     FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PG, i_target_chiplet, l_attr_pg));
 
@@ -339,7 +339,7 @@ static fapi2::ReturnCode p9_sbe_tp_chiplet_init3_region_fence_setup(
     l_data64.insertFromRight<4, 11>(l_attr_pg_data);
     FAPI_TRY(fapi2::putScom(i_target_chiplet, PERV_CPLT_CTRL1_CLEAR, l_data64));
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_tp_chiplet_init3_region_fence_setup: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_reset.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_reset.C
index 549df0cb..60258e28 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_reset.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_reset.C
@@ -39,7 +39,7 @@
 fapi2::ReturnCode p9_sbe_tp_chiplet_reset(const
         fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chip)
 {
-    FAPI_DBG("Entering ...");
+    FAPI_DBG("p9_sbe_tp_chiplet_reset: Entering ...");
 
     FAPI_DBG("Initializing Hangcounter 6 for PRV Cplt");
     //Setting HANG_PULSE_6_REG register value
@@ -47,7 +47,7 @@ fapi2::ReturnCode p9_sbe_tp_chiplet_reset(const
     FAPI_TRY(fapi2::putScom(i_target_chip, PERV_TP_HANG_PULSE_6_REG,
                             HANG_PULSE_VALUE));
 
-    FAPI_DBG("Exiting ...");
+    FAPI_DBG("p9_sbe_tp_chiplet_reset: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_enable_ridi.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_enable_ridi.C
index 5ffcdf73..4f63f1fe 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_enable_ridi.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_enable_ridi.C
@@ -7,7 +7,7 @@
 /*                                                                        */
 /* EKB Project                                                            */
 /*                                                                        */
-/* COPYRIGHT 2015                                                         */
+/* COPYRIGHT 2015,2016                                                    */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -40,7 +40,7 @@ fapi2::ReturnCode p9_sbe_tp_enable_ridi(const
                                         fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chip)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_DBG("Entering ...");
+    FAPI_DBG("p9_sbe_tp_enable_ridi: Entering ...");
 
     FAPI_INF("Enable Recievers, Drivers DI1 & DI2");
     //Setting ROOT_CTRL1 register value
@@ -50,7 +50,7 @@ fapi2::ReturnCode p9_sbe_tp_enable_ridi(const
     l_data64.setBit<21>();  //PIB.ROOT_CTRL1.TP_DI2_DC_B = 1
     FAPI_TRY(fapi2::putScom(i_target_chip, PERV_ROOT_CTRL1_SCOM, l_data64));
 
-    FAPI_DBG("Exiting ...");
+    FAPI_DBG("p9_sbe_tp_enable_ridi: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_initf.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_initf.C
index 0820dd4d..a3ce4d5a 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_initf.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_initf.C
@@ -36,7 +36,7 @@
 fapi2::ReturnCode p9_sbe_tp_gptr_time_initf(const
         fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chip)
 {
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_tp_gptr_time_initf: Entering ...");
 
     FAPI_DBG("Scan perv_gptr ring");
     FAPI_TRY(fapi2::putRing(i_target_chip, perv_gptr),
@@ -58,6 +58,6 @@ fapi2::ReturnCode p9_sbe_tp_gptr_time_initf(const
              "Error from putRing (perv_time)");
 
 fapi_try_exit:
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_tp_gptr_time_initf: Exiting ...");
     return fapi2::current_err;
 }
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_initf.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_initf.C
index 20904e26..20c78a8c 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_initf.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_initf.C
@@ -37,7 +37,7 @@
 fapi2::ReturnCode p9_sbe_tp_initf(const
                                   fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chip)
 {
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_tp_initf: Entering ...");
 
     FAPI_DBG("Scan perv_fure ring");
     FAPI_TRY(fapi2::putRing(i_target_chip, perv_fure),
@@ -52,6 +52,6 @@ fapi2::ReturnCode p9_sbe_tp_initf(const
              "Error from putRing (perv_ana_func)");
 
 fapi_try_exit:
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_tp_initf: Exiting ...");
     return fapi2::current_err;
 }
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_repr_initf.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_repr_initf.C
index 1876b6e2..3147604f 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_repr_initf.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_repr_initf.C
@@ -36,7 +36,7 @@
 fapi2::ReturnCode p9_sbe_tp_repr_initf(const
                                        fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chip)
 {
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_tp_repr_initf: Entering ...");
 
     FAPI_DBG("Scan perv_repr ring");
     FAPI_TRY(fapi2::putRing(i_target_chip, perv_repr),
@@ -47,6 +47,6 @@ fapi2::ReturnCode p9_sbe_tp_repr_initf(const
              "Error from putRing (occ_repr)");
 
 fapi_try_exit:
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_tp_repr_initf: Exiting ...");
     return fapi2::current_err;
 }
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_switch_gears.C b/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_switch_gears.C
index 2974f9c5..7c066ad2 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_switch_gears.C
+++ b/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_switch_gears.C
@@ -53,7 +53,7 @@ fapi2::ReturnCode p9_sbe_tp_switch_gears(const
         fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chip)
 {
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_tp_switch_gears: Entering ...");
 
 #ifdef __PPE__
 
@@ -74,7 +74,7 @@ fapi2::ReturnCode p9_sbe_tp_switch_gears(const
 fapi_try_exit:
 #endif
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_tp_switch_gears: Exiting ...");
 
     return fapi2::current_err;
 
@@ -91,7 +91,7 @@ fapi2::ReturnCode p9_sbe_tp_switch_gears_check_magicnumber(
     fapi2::buffer<uint8_t> l_read_attr = 0;
     int l_timeout = 0;
     fapi2::buffer<uint64_t> l_data64;
-    FAPI_INF("Entering ...");
+    FAPI_INF("p9_sbe_tp_switch_gears_check_magicnumber: Entering ...");
 
     FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_BACKUP_SEEPROM_SELECT, i_target_chip,
                            l_read_attr));
@@ -147,7 +147,7 @@ fapi2::ReturnCode p9_sbe_tp_switch_gears_check_magicnumber(
                 fapi2::MAGIC_NUMBER_NOT_VALID(),
                 "ERROR: Magic number not matching");
 
-    FAPI_INF("Exiting ...");
+    FAPI_INF("p9_sbe_tp_switch_gears_check_magicnumber: Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;