Move Explorer UNIT_TOP FIR unmasks into exp_omi_setup

Change-Id: Ie7317fe9b883f6939ecde6249a502b93a122ef34
CQ:SW498960
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/100872
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Sneha Kadam <sneha.kadam@ibm.com>
Dev-Ready: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: Amita Banchhor <amita.banchhor@ibm.com>
Reviewed-by: Mark Pizzutillo <mark.pizzutillo@ibm.com>
Reviewed-by: Edgar R Cordero <ecordero@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/100903
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-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>

Author: stermole

src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/fir/exp_unmask.C

@@ -261,9 +261,6 @@ fapi2::ReturnCode after_mc_omi_init<mss::mc_type::EXPLORER>(const fapi2::Target<
     fapi2::ReturnCode l_rc3 = fapi2::FAPI2_RC_SUCCESS;
     fapi2::ReturnCode l_rc4 = fapi2::FAPI2_RC_SUCCESS;
 
-    fapi2::buffer<uint64_t> l_global_fir_mask_reg;
-    fapi2::buffer<uint64_t> l_global_spa_attn_reg;
-
     mss::fir::reg<EXPLR_MMIO_MFIR> l_exp_mmio_mfir_reg(i_target, l_rc1);
     mss::fir::reg<EXPLR_TLXT_TLXFIRQ> l_exp_tlxt_fir_reg(i_target, l_rc2);
     mss::fir::reg<EXPLR_TP_MB_UNIT_TOP_LOCAL_FIR> l_exp_local_fir_reg(i_target, l_rc3);
@@ -278,23 +275,6 @@ fapi2::ReturnCode after_mc_omi_init<mss::mc_type::EXPLORER>(const fapi2::Target<
     FAPI_TRY(l_rc4, "for target %s unable to create fir::reg for EXPLR_DLX_MC_OMI_FIR_REG 0x%0x",
              mss::c_str(i_target), EXPLR_DLX_MC_OMI_FIR_REG);
 
-    // Pull global fir mask state and unmask bits per spec
-    FAPI_TRY(fapi2::getScom(i_target, EXPLR_TP_MB_UNIT_TOP_FIR_MASK, l_global_fir_mask_reg));
-    l_global_fir_mask_reg.clearBit<EXPLR_TP_MB_UNIT_TOP_XFIR_IN0>()
-    .clearBit<EXPLR_TP_MB_UNIT_TOP_XFIR_IN3>()
-    .clearBit<EXPLR_TP_MB_UNIT_TOP_XFIR_IN4>()
-    .clearBit<EXPLR_TP_MB_UNIT_TOP_XFIR_IN7>()
-    .clearBit<EXPLR_TP_MB_UNIT_TOP_XFIR_IN8>()
-    .clearBit<EXPLR_TP_MB_UNIT_TOP_XFIR_IN9>()
-    .clearBit<EXPLR_TP_MB_UNIT_TOP_XFIR_IN11>()
-    .clearBit<EXPLR_TP_MB_UNIT_TOP_XFIR_IN12>();
-    FAPI_TRY(fapi2::putScom(i_target, EXPLR_TP_MB_UNIT_TOP_FIR_MASK, l_global_fir_mask_reg));
-
-    // Pull global special attn state and unmask bits per spec
-    FAPI_TRY(fapi2::getScom(i_target, EXPLR_TP_MB_UNIT_TOP_SPA_MASK, l_global_spa_attn_reg));
-    l_global_spa_attn_reg.clearBit<EXPLR_TP_MB_UNIT_TOP_SPATTN_IN5>();
-    FAPI_TRY(fapi2::putScom(i_target, EXPLR_TP_MB_UNIT_TOP_SPA_MASK, l_global_spa_attn_reg));
-
     // Setup MMIO MFIR unmasks per spec
     FAPI_TRY(l_exp_mmio_mfir_reg.recoverable_error<EXPLR_MMIO_MFIR_SCOM_ERR>()
              .checkstop<EXPLR_MMIO_MFIR_FSM_PERR>()
@@ -425,6 +405,8 @@ fapi2::ReturnCode after_mc_omi_setup<mss::mc_type::EXPLORER>( const fapi2::Targe
     constexpr uint64_t MASK_ALL = ~0ull;
 
     fapi2::buffer<uint64_t> l_dl0_error_mask;
+    fapi2::buffer<uint64_t> l_global_fir_mask_reg;
+    fapi2::buffer<uint64_t> l_global_spa_attn_reg;
 
     fapi2::ReturnCode l_rc1 = fapi2::FAPI2_RC_SUCCESS;
     fapi2::ReturnCode l_rc2 = fapi2::FAPI2_RC_SUCCESS;
@@ -499,6 +481,23 @@ fapi2::ReturnCode after_mc_omi_setup<mss::mc_type::EXPLORER>( const fapi2::Targe
     .clearBit<EXPLR_DLX_DL0_ERROR_MASK_14>();
     FAPI_TRY(fapi2::putScom(i_target, EXPLR_DLX_DL0_ERROR_MASK, l_dl0_error_mask));
 
+    // Pull global fir mask state and unmask bits per spec
+    FAPI_TRY(fapi2::getScom(i_target, EXPLR_TP_MB_UNIT_TOP_FIR_MASK, l_global_fir_mask_reg));
+    l_global_fir_mask_reg.clearBit<EXPLR_TP_MB_UNIT_TOP_XFIR_IN0>()
+    .clearBit<EXPLR_TP_MB_UNIT_TOP_XFIR_IN3>()
+    .clearBit<EXPLR_TP_MB_UNIT_TOP_XFIR_IN4>()
+    .clearBit<EXPLR_TP_MB_UNIT_TOP_XFIR_IN7>()
+    .clearBit<EXPLR_TP_MB_UNIT_TOP_XFIR_IN8>()
+    .clearBit<EXPLR_TP_MB_UNIT_TOP_XFIR_IN9>()
+    .clearBit<EXPLR_TP_MB_UNIT_TOP_XFIR_IN11>()
+    .clearBit<EXPLR_TP_MB_UNIT_TOP_XFIR_IN12>();
+    FAPI_TRY(fapi2::putScom(i_target, EXPLR_TP_MB_UNIT_TOP_FIR_MASK, l_global_fir_mask_reg));
+
+    // Pull global special attn state and unmask bits per spec
+    FAPI_TRY(fapi2::getScom(i_target, EXPLR_TP_MB_UNIT_TOP_SPA_MASK, l_global_spa_attn_reg));
+    l_global_spa_attn_reg.clearBit<EXPLR_TP_MB_UNIT_TOP_SPATTN_IN5>();
+    FAPI_TRY(fapi2::putScom(i_target, EXPLR_TP_MB_UNIT_TOP_SPA_MASK, l_global_spa_attn_reg));
+
     return fapi2::FAPI2_RC_SUCCESS;
 
 fapi_try_exit: