Add option to Mask off SBE bits on TP_LOCAL_FIR

Change-Id: Ib1c78eaa1f8b0ac855f51b46fa5b23746c5e9498
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/50399
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Matt K. Light <mklight@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/50401
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 33 insertions, 3 deletions

diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_revert_sbe_mcs_setup.C b/src/import/chips/p9/procedures/hwp/nest/p9_revert_sbe_mcs_setup.C
index e697ab62f..4dea18406 100644
--- a/src/import/chips/p9/procedures/hwp/nest/p9_revert_sbe_mcs_setup.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_revert_sbe_mcs_setup.C
@@ -196,14 +196,41 @@ fapi_try_exit:
     return fapi2::current_err;
 }
 
+fapi2::ReturnCode
+p9_mask_sbe_perv_firs(
+    const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target)
+{
+    FAPI_INF("p9_mask_sbe_perv_firs:: masking tp_lfir (0x104000A) bits 22:30");
+    fapi2::buffer<uint64_t> l_tp_local_firmask;
+    constexpr uint64_t literal_0x000003FE00000000 =  0x000003FE00000000;
+    l_tp_local_firmask.insert<0, 64, 0, uint64_t>(literal_0x000003FE00000000);
+
+    FAPI_TRY(fapi2::putScom(i_target,
+                            PERV_TP_LOCAL_FIR_MASK_OR,
+                            l_tp_local_firmask),
+             "Error from performing putScom on address = 0x%lx with value "
+             "= 0x%lx", PERV_TP_LOCAL_FIR_MASK_OR, literal_0x000003FE00000000);
+
+fapi_try_exit:
+    FAPI_INF("p9_mask_sbe_perv_firs:: End");
+    return fapi2::current_err;
+
+}
+
 
 // HWP entry point
 fapi2::ReturnCode
 p9_revert_sbe_mcs_setup(
-    const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target)
+    const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target,
+    bool i_maskPervSbeFirs)
 {
     FAPI_INF("Start");
 
+    if(i_maskPervSbeFirs)
+    {
+        p9_mask_sbe_perv_firs(i_target);
+    }
+
     fapi2::ATTR_SYSTEM_IPL_PHASE_Type l_ipl_phase;
     auto l_mcs_chiplets = i_target.getChildren<fapi2::TARGET_TYPE_MCS>(
                               fapi2::TARGET_STATE_PRESENT);
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_revert_sbe_mcs_setup.H b/src/import/chips/p9/procedures/hwp/nest/p9_revert_sbe_mcs_setup.H
index d88a644c4..a92f7c984 100644
--- a/src/import/chips/p9/procedures/hwp/nest/p9_revert_sbe_mcs_setup.H
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_revert_sbe_mcs_setup.H
@@ -57,7 +57,8 @@
 
 /// function pointer typedef definition for HWP call support
 typedef fapi2::ReturnCode (*p9_revert_sbe_mcs_setup_FP_t) (
-    const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&);
+    const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&,
+    bool);
 
 
 //------------------------------------------------------------------------------
@@ -72,10 +73,12 @@ extern "C"
 /// of hostboot execution
 ///
 /// @param[in] i_target Reference to processor chip target
+/// @param[in] i_maskPervSBEFirs tell func whether to mask SBE related pervasive fir bits
 /// @return fapi::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
 ///
     fapi2::ReturnCode p9_revert_sbe_mcs_setup(
-        const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target);
+        const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target,
+        bool i_maskPervSbeFirs);
 
 } // extern "C"