Changes in tod procedures to move blacklisted registers int our test procedure

instead of being in the utils that is included by tod_setup and tod_init

Change-Id: Id0d87a80deab348bc9b0e6058192a1d8ab2589c8
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38243
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: JOSHUA L. HANNAN <jlhannan@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38367
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

8 files changed, 173 insertions, 263 deletions

diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_tod_move_tod_to_tb.C b/src/import/chips/p9/procedures/hwp/nest/p9_tod_move_tod_to_tb.C
index 9ca0874cc..f41baeea8 100644
--- a/src/import/chips/p9/procedures/hwp/nest/p9_tod_move_tod_to_tb.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_tod_move_tod_to_tb.C
@@ -265,4 +265,154 @@ extern "C"
         return fapi2::current_err;
     }
 
+    fapi2::ReturnCode p9_tod_utils_get_tfmr_reg(
+        const fapi2::Target<fapi2::TARGET_TYPE_CORE>& i_target,
+        const uint8_t i_thread_num,
+        fapi2::buffer<uint64_t>& o_tfmr_val)
+    {
+        // mark HWP entry
+        FAPI_DBG("Entering ...\n");
+
+        fapi2::buffer<uint64_t> data;
+        fapi2::buffer<uint64_t> data2;
+
+        //Setting SPR_MODE to thread number
+        data.flush<0>().setBit<SPR_MODE_REG_MODE_SPRC_WR_EN>().setBit<SPR_MODE_REG_MODE_SPRC0_SEL>();
+        data2.flush<0>();
+
+        switch(i_thread_num)
+        {
+            case(0):
+                data.setBit<SPR_MODE_REG_MODE_SPRC_T0_SEL>();
+                data2.insertFromRight(SPRC_REG_SEL_TFMR_T0, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
+                break;
+
+            case(1):
+                data.setBit<SPR_MODE_REG_MODE_SPRC_T1_SEL>();
+                data2.insertFromRight(SPRC_REG_SEL_TFMR_T1, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
+                break;
+
+            case(2):
+                data.setBit<SPR_MODE_REG_MODE_SPRC_T2_SEL>();
+                data2.insertFromRight(SPRC_REG_SEL_TFMR_T2, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
+                break;
+
+            case(3):
+                data.setBit<SPR_MODE_REG_MODE_SPRC_T3_SEL>();
+                data2.insertFromRight(SPRC_REG_SEL_TFMR_T3, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
+                break;
+
+            case(4):
+                data.setBit<SPR_MODE_REG_MODE_SPRC_T4_SEL>();
+                data2.insertFromRight(SPRC_REG_SEL_TFMR_T4, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
+                break;
+
+            case(5):
+                data.setBit<SPR_MODE_REG_MODE_SPRC_T5_SEL>();
+                data2.insertFromRight(SPRC_REG_SEL_TFMR_T5, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
+                break;
+
+            case(6):
+                data.setBit<SPR_MODE_REG_MODE_SPRC_T6_SEL>();
+                data2.insertFromRight(SPRC_REG_SEL_TFMR_T6, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
+                break;
+
+            case(7):
+                data.setBit<SPR_MODE_REG_MODE_SPRC_T7_SEL>();
+                data2.insertFromRight(SPRC_REG_SEL_TFMR_T7, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
+                break;
+
+            default:
+                FAPI_ASSERT(true, fapi2::P9_INVALID_THREAD_NUM().set_TARGET(i_target).set_THREADNUMBER(i_thread_num),
+                            "Thread number error ");
+        }
+
+        FAPI_TRY(fapi2::putScom(i_target, C_SPR_MODE, data), "Error writing to EX_PERV_SPR_MODE");
+
+        FAPI_TRY(fapi2::putScom(i_target, C_SCOMC, data2), "Error writing to EX_PERV_L0_SCOM_SPRC");
+
+        //Reading SPRD for the thread's TMFR
+        FAPI_TRY(fapi2::getScom(i_target, 0x20010A81, o_tfmr_val), "Error getting EX_PERV_SPRD_L0");
+    fapi_try_exit:
+        FAPI_DBG("Exiting...");
+        return fapi2::current_err;
+    }
+
+    fapi2::ReturnCode p9_tod_utils_set_tfmr_reg(
+        const fapi2::Target<fapi2::TARGET_TYPE_CORE>& i_target,
+        const uint8_t i_thread_num,
+        fapi2::buffer<uint64_t>& i_tfmr_val)
+    {
+        // mark HWP entry
+        FAPI_DBG("Entering ...\n");
+
+        fapi2::buffer<uint64_t> data;
+        fapi2::buffer<uint64_t> data2;
+
+        //Setting SPR_MODE to thread number
+        //Setting SPRC to thread's TMFR
+        data.flush<0>().setBit<SPR_MODE_REG_MODE_SPRC_WR_EN>().setBit<SPR_MODE_REG_MODE_SPRC0_SEL>();
+        data2.flush<0>();
+
+        switch(i_thread_num)
+        {
+            case(0):
+                data.setBit<SPR_MODE_REG_MODE_SPRC_T0_SEL>();
+                data2.insertFromRight(SPRC_REG_SEL_TFMR_T0, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
+                break;
+
+            case(1):
+                data.setBit<SPR_MODE_REG_MODE_SPRC_T1_SEL>();
+                data2.insertFromRight(SPRC_REG_SEL_TFMR_T1, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
+                break;
+
+            case(2):
+                data.setBit<SPR_MODE_REG_MODE_SPRC_T2_SEL>();
+                data2.insertFromRight(SPRC_REG_SEL_TFMR_T2, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
+                break;
+
+            case(3):
+                data.setBit<SPR_MODE_REG_MODE_SPRC_T3_SEL>();
+                data2.insertFromRight(SPRC_REG_SEL_TFMR_T3, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
+                break;
+
+            case(4):
+                data.setBit<SPR_MODE_REG_MODE_SPRC_T4_SEL>();
+                data2.insertFromRight(SPRC_REG_SEL_TFMR_T4, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
+                break;
+
+            case(5):
+                data.setBit<SPR_MODE_REG_MODE_SPRC_T5_SEL>();
+                data2.insertFromRight(SPRC_REG_SEL_TFMR_T5, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
+                break;
+
+            case(6):
+                data.setBit<SPR_MODE_REG_MODE_SPRC_T6_SEL>();
+                data2.insertFromRight(SPRC_REG_SEL_TFMR_T6, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
+                break;
+
+            case(7):
+                data.setBit<SPR_MODE_REG_MODE_SPRC_T7_SEL>();
+                data2.insertFromRight(SPRC_REG_SEL_TFMR_T7, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
+                break;
+
+            default:
+                FAPI_ASSERT(true, fapi2::P9_INVALID_THREAD_NUM().set_TARGET(i_target).set_THREADNUMBER(i_thread_num),
+                            "Thread number error ");
+                break;
+        }
+
+        FAPI_TRY(fapi2::putScom(i_target, C_SPR_MODE, data), "Error doing putscom to EX_PERV_SPR_MODE");
+
+        FAPI_TRY(fapi2::putScom(i_target, C_SCOMC, data2), "Error doing putscom to EX_PERV_L0_SCOM_SPRC");
+
+        //Writing SPRD to set the thread's TMFR
+        FAPI_TRY(fapi2::putScom(i_target, 0x20010A81, i_tfmr_val), "Error doing putscom to EX_PERV_SPRD_L0");
+
+    fapi_try_exit:
+        FAPI_DBG("Exiting...");
+        return fapi2::current_err;
+    }
+
+
 } // extern "C"
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_tod_move_tod_to_tb.H b/src/import/chips/p9/procedures/hwp/nest/p9_tod_move_tod_to_tb.H
index 48d66fcea..7ebae8443 100644
--- a/src/import/chips/p9/procedures/hwp/nest/p9_tod_move_tod_to_tb.H
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_tod_move_tod_to_tb.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -78,6 +78,27 @@ extern "C" {
                                             const uint8_t i_thread_num,
                                             fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>* i_failingTodProc = NULL);
 
+
+    /// @brief Gets the value in the TFMR register
+    /// @param[in] i_target       => P9 chip target
+    /// @param[in] i_thread_num   => The thread number we want to run on
+    /// @param[out] o_tfmr_val    => Value that is in the TFMR register
+    /// @return FAPI_RC_SUCCESS if TFMR read is successful else FAPI or ECMD error is sent through
+    fapi2::ReturnCode p9_tod_utils_get_tfmr_reg(
+        const fapi2::Target<fapi2::TARGET_TYPE_CORE>& i_target,
+        const uint8_t i_thread_num,
+        fapi2::buffer<uint64_t>& o_tfmr_val);
+
+    /// @brief Sets the value in the TFMR register
+    /// @param[in] i_target => P9 chip target
+    /// @param[in] i_thread_num => The thread number we want to run on
+    /// @param[in] i_tfmr_val => Value that will be put in the TFMR register
+    /// @return FAPI_RC_SUCCESS if TFMR write is successful else FAPI or ECMD error is sent through
+    fapi2::ReturnCode p9_tod_utils_set_tfmr_reg(
+        const fapi2::Target<fapi2::TARGET_TYPE_CORE>& i_target,
+        const uint8_t i_thread_num,
+        fapi2::buffer<uint64_t>& i_tfmr_val);
+
 } //extern "C"
 
 #endif //_P9_TOD_MOVE_TOD_TO_TB_H_
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_tod_move_tod_to_tb.mk b/src/import/chips/p9/procedures/hwp/nest/p9_tod_move_tod_to_tb.mk
index 48a170630..f9b1d1f66 100644
--- a/src/import/chips/p9/procedures/hwp/nest/p9_tod_move_tod_to_tb.mk
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_tod_move_tod_to_tb.mk
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2016
+# Contributors Listed Below - COPYRIGHT 2016,2017
 # [+] International Business Machines Corp.
 #
 #
@@ -23,6 +23,5 @@
 #
 # IBM_PROLOG_END_TAG
 PROCEDURE=p9_tod_move_tod_to_tb
-OBJS+=p9_tod_utils.o
 $(call BUILD_PROCEDURE)
 
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_tod_save_config.mk b/src/import/chips/p9/procedures/hwp/nest/p9_tod_save_config.mk
index 0c15226cc..0175225dc 100644
--- a/src/import/chips/p9/procedures/hwp/nest/p9_tod_save_config.mk
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_tod_save_config.mk
@@ -23,6 +23,5 @@
 #
 # IBM_PROLOG_END_TAG
 PROCEDURE=p9_tod_save_config
-lib$(PROCEDURE)_DEPLIBS+=p9_tod_utils
 $(call BUILD_PROCEDURE)
 
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_tod_utils.C b/src/import/chips/p9/procedures/hwp/nest/p9_tod_utils.C
deleted file mode 100644
index 0560a5e5e..000000000
--- a/src/import/chips/p9/procedures/hwp/nest/p9_tod_utils.C
+++ /dev/null
@@ -1,203 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG                                                   */
-/* This is an automatically generated prolog.                             */
-/*                                                                        */
-/* $Source: src/import/chips/p9/procedures/hwp/nest/p9_tod_utils.C $      */
-/*                                                                        */
-/* OpenPOWER HostBoot Project                                             */
-/*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
-/*                                                                        */
-/*                                                                        */
-/* Licensed under the Apache License, Version 2.0 (the "License");        */
-/* you may not use this file except in compliance with the License.       */
-/* You may obtain a copy of the License at                                */
-/*                                                                        */
-/*     http://www.apache.org/licenses/LICENSE-2.0                         */
-/*                                                                        */
-/* Unless required by applicable law or agreed to in writing, software    */
-/* distributed under the License is distributed on an "AS IS" BASIS,      */
-/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
-/* implied. See the License for the specific language governing           */
-/* permissions and limitations under the License.                         */
-/*                                                                        */
-/* IBM_PROLOG_END_TAG                                                     */
-//--------------------------------------------------------------------------
-//
-//
-/// @file p9_tod_utils.C
-/// @brief Utilities and classes for the tod_init and tod_setup procedures
-///
-// *HWP HWP Owner Christina Graves clgraves@us.ibm.com
-// *HWP FW Owner: Thi Tran thi@us.ibm.com
-// *HWP Team: Nest
-// *HWP Level: 1
-// *HWP Consumed by: SBE
-//
-//--------------------------------------------------------------------------
-
-
-//--------------------------------------------------------------------------
-// Includes
-//--------------------------------------------------------------------------
-#include <p9_tod_utils.H>
-
-extern "C" {
-
-//--------------------------------------------------------------------------
-//  HWP entry point
-//--------------------------------------------------------------------------
-    fapi2::ReturnCode p9_tod_utils_get_tfmr_reg(
-        const fapi2::Target<fapi2::TARGET_TYPE_CORE>& i_target,
-        const uint8_t i_thread_num,
-        fapi2::buffer<uint64_t>& o_tfmr_val)
-    {
-        // mark HWP entry
-        FAPI_DBG("Entering ...\n");
-
-        fapi2::buffer<uint64_t> data;
-        fapi2::buffer<uint64_t> data2;
-
-        //FAPI_DBG("proc_tod_utils_get_tfmr_reg: Setting SPR_MODE to thread number");
-        data.flush<0>().setBit<SPR_MODE_REG_MODE_SPRC_WR_EN>().setBit<SPR_MODE_REG_MODE_SPRC0_SEL>();
-        data2.flush<0>();
-
-        switch(i_thread_num)
-        {
-            case(0):
-                data.setBit<SPR_MODE_REG_MODE_SPRC_T0_SEL>();
-                data2.insertFromRight(SPRC_REG_SEL_TFMR_T0, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
-                break;
-
-            case(1):
-                data.setBit<SPR_MODE_REG_MODE_SPRC_T1_SEL>();
-                data2.insertFromRight(SPRC_REG_SEL_TFMR_T1, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
-                break;
-
-            case(2):
-                data.setBit<SPR_MODE_REG_MODE_SPRC_T2_SEL>();
-                data2.insertFromRight(SPRC_REG_SEL_TFMR_T2, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
-                break;
-
-            case(3):
-                data.setBit<SPR_MODE_REG_MODE_SPRC_T3_SEL>();
-                data2.insertFromRight(SPRC_REG_SEL_TFMR_T3, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
-                break;
-
-            case(4):
-                data.setBit<SPR_MODE_REG_MODE_SPRC_T4_SEL>();
-                data2.insertFromRight(SPRC_REG_SEL_TFMR_T4, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
-                break;
-
-            case(5):
-                data.setBit<SPR_MODE_REG_MODE_SPRC_T5_SEL>();
-                data2.insertFromRight(SPRC_REG_SEL_TFMR_T5, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
-                break;
-
-            case(6):
-                data.setBit<SPR_MODE_REG_MODE_SPRC_T6_SEL>();
-                data2.insertFromRight(SPRC_REG_SEL_TFMR_T6, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
-                break;
-
-            case(7):
-                data.setBit<SPR_MODE_REG_MODE_SPRC_T7_SEL>();
-                data2.insertFromRight(SPRC_REG_SEL_TFMR_T7, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
-                break;
-
-            default:
-                FAPI_ASSERT(true, fapi2::P9_INVALID_THREAD_NUM().set_TARGET(i_target).set_THREADNUMBER(i_thread_num),
-                            "Thread number error ");
-        }
-
-        FAPI_TRY(fapi2::putScom(i_target, C_SPR_MODE, data), "Error writing to EX_PERV_SPR_MODE");
-
-        FAPI_TRY(fapi2::putScom(i_target, C_SCOMC, data2), "Error writing to EX_PERV_L0_SCOM_SPRC");
-
-        //FAPI_DBG("proc_tod_utils_get_tfmr_reg: Reading SPRD for T0's TMFR");
-        //FAPI_TRY(fapi2::getScom(i_target, 0x2E010A81, o_tfmr_val), "Error getting EX_PERV_SPRD_L0");
-        FAPI_TRY(fapi2::getScom(i_target, 0x20010A81, o_tfmr_val), "Error getting EX_PERV_SPRD_L0");
-
-    fapi_try_exit:
-        FAPI_DBG("Exiting...");
-        return fapi2::current_err;
-    }
-
-    fapi2::ReturnCode p9_tod_utils_set_tfmr_reg(
-        const fapi2::Target<fapi2::TARGET_TYPE_CORE>& i_target,
-        const uint8_t i_thread_num,
-        fapi2::buffer<uint64_t>& i_tfmr_val)
-    {
-        // mark HWP entry
-        FAPI_DBG("Entering ...\n");
-
-        fapi2::buffer<uint64_t> data;
-        fapi2::buffer<uint64_t> data2;
-
-        //FAPI_DBG("proc_tod_utils_set_tfmr_reg: Setting SPR_MODE to thread number");
-        //FAPI_DBG("proc_tod_utils_set_tfmr_reg: Setting SPRC to thread's TMFR");
-        data.flush<0>().setBit<SPR_MODE_REG_MODE_SPRC_WR_EN>().setBit<SPR_MODE_REG_MODE_SPRC0_SEL>();
-        data2.flush<0>();
-
-        switch(i_thread_num)
-        {
-            case(0):
-                data.setBit<SPR_MODE_REG_MODE_SPRC_T0_SEL>();
-                data2.insertFromRight(SPRC_REG_SEL_TFMR_T0, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
-                break;
-
-            case(1):
-                data.setBit<SPR_MODE_REG_MODE_SPRC_T1_SEL>();
-                data2.insertFromRight(SPRC_REG_SEL_TFMR_T1, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
-                break;
-
-            case(2):
-                data.setBit<SPR_MODE_REG_MODE_SPRC_T2_SEL>();
-                data2.insertFromRight(SPRC_REG_SEL_TFMR_T2, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
-                break;
-
-            case(3):
-                data.setBit<SPR_MODE_REG_MODE_SPRC_T3_SEL>();
-                data2.insertFromRight(SPRC_REG_SEL_TFMR_T3, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
-                break;
-
-            case(4):
-                data.setBit<SPR_MODE_REG_MODE_SPRC_T4_SEL>();
-                data2.insertFromRight(SPRC_REG_SEL_TFMR_T4, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
-                break;
-
-            case(5):
-                data.setBit<SPR_MODE_REG_MODE_SPRC_T5_SEL>();
-                data2.insertFromRight(SPRC_REG_SEL_TFMR_T5, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
-                break;
-
-            case(6):
-                data.setBit<SPR_MODE_REG_MODE_SPRC_T6_SEL>();
-                data2.insertFromRight(SPRC_REG_SEL_TFMR_T6, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
-                break;
-
-            case(7):
-                data.setBit<SPR_MODE_REG_MODE_SPRC_T7_SEL>();
-                data2.insertFromRight(SPRC_REG_SEL_TFMR_T7, SPRC_REG_SEL, SPRC_REG_SEL_LEN);
-                break;
-
-            default:
-                FAPI_ASSERT(true, fapi2::P9_INVALID_THREAD_NUM().set_TARGET(i_target).set_THREADNUMBER(i_thread_num),
-                            "Thread number error ");
-                break;
-        }
-
-        FAPI_TRY(fapi2::putScom(i_target, C_SPR_MODE, data), "Error doing putscom to EX_PERV_SPR_MODE");
-
-        FAPI_TRY(fapi2::putScom(i_target, C_SCOMC, data2), "Error doing putscom to EX_PERV_L0_SCOM_SPRC");
-
-        //FAPI_DBG("proc_tod_utils_set_tfmr_reg: Writing SPRD to set T0's TMFR");
-        //FAPI_TRY(fapi2::putScom(i_target, 0x2E010A81, i_tfmr_val), "Error doing putscom to EX_PERV_SPRD_L0");
-        FAPI_TRY(fapi2::putScom(i_target, 0x20010A81, i_tfmr_val), "Error doing putscom to EX_PERV_SPRD_L0");
-
-    fapi_try_exit:
-        FAPI_DBG("Exiting...");
-        return fapi2::current_err;
-    }
-
-} // extern "C"
-
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_tod_utils.H b/src/import/chips/p9/procedures/hwp/nest/p9_tod_utils.H
index 9162e963d..6870ebaed 100644
--- a/src/import/chips/p9/procedures/hwp/nest/p9_tod_utils.H
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_tod_utils.H
@@ -56,14 +56,6 @@
 // Structure definitions
 //-----------------------------------------------------------------------------------
 
-//function pointer typedef definition for HWP call support
-typedef fapi2::ReturnCode
-(*p9_tod_utils_get_tfmr_reg_FP_t) (const fapi2::Target<fapi2::TARGET_TYPE_CORE>&, const uint8_t,
-                                   fapi2::buffer<uint64_t>& );
-
-typedef fapi2::ReturnCode
-(*p9_tod_utils_set_tfmr_reg_FP_t) (const fapi2::Target<fapi2::TARGET_TYPE_CORE>*&, const uint8_t,
-                                   fapi2::buffer<uint64_t>& );
 //-----------------------------------------------------------------------------------
 // Constant definitions
 //-----------------------------------------------------------------------------------
@@ -367,26 +359,6 @@ extern "C" {
 // Function prototype
 //-----------------------------------------------------------------------------------
 
-/// @brief Gets the value in the TFMR register
-/// @param[in] i_target       => P9 chip target
-/// @param[in] i_thread_num   => The thread number we want to run on
-/// @param[out] o_tfmr_val    => Value that is in the TFMR register
-/// @return FAPI_RC_SUCCESS if TFMR read is successful else FAPI or ECMD error is sent through
-    fapi2::ReturnCode p9_tod_utils_get_tfmr_reg(
-        const fapi2::Target<fapi2::TARGET_TYPE_CORE>& i_target,
-        const uint8_t i_thread_num,
-        fapi2::buffer<uint64_t>& o_tfmr_val);
-
-/// @brief Sets the value in the TFMR register
-/// @param[in] i_target => P9 chip target
-/// @param[in] i_thread_num => The thread number we want to run on
-/// @param[in] i_tfmr_val => Value that will be put in the TFMR register
-/// @return FAPI_RC_SUCCESS if TFMR write is successful else FAPI or ECMD error is sent through
-    fapi2::ReturnCode p9_tod_utils_set_tfmr_reg(
-        const fapi2::Target<fapi2::TARGET_TYPE_CORE>& i_target,
-        const uint8_t i_thread_num,
-        fapi2::buffer<uint64_t>& i_tfmr_val);
-
 } //extern "C"
 
 #endif //_P9_TOD_UTILS_H_
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_tod_utils.mk b/src/import/chips/p9/procedures/hwp/nest/p9_tod_utils.mk
deleted file mode 100644
index 69fb1b776..000000000
--- a/src/import/chips/p9/procedures/hwp/nest/p9_tod_utils.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/import/chips/p9/procedures/hwp/nest/p9_tod_utils.mk $
-#
-# OpenPOWER HostBoot Project
-#
-# Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-PROCEDURE=p9_tod_utils
-$(call BUILD_PROCEDURE)
-
diff --git a/src/usr/isteps/istep18/makefile b/src/usr/isteps/istep18/makefile
index 39ed9f439..7137a00e2 100644
--- a/src/usr/isteps/istep18/makefile
+++ b/src/usr/isteps/istep18/makefile
@@ -49,7 +49,6 @@ OBJS += TodTopologyManager.o
 include ${ROOTPATH}/procedure.rules.mk
 include ${PROCEDURES_PATH}/p9_tod_init.mk
 include ${PROCEDURES_PATH}/p9_tod_setup.mk
-include ${PROCEDURES_PATH}/p9_tod_utils.mk
 include ${PROCEDURES_PATH}/p9_tod_save_config.mk
 include ${ROOTPATH}/config.mk