summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian R. Geddes <crgeddes@us.ibm.com>2018-10-30 18:03:11 -0500
committerSachin Gupta <sgupta2m@in.ibm.com>2018-11-01 01:28:17 -0500
commitd366d4d3fd4750660586c2fa983c12020406fa49 (patch)
treee65cb767eb6eca9a36a5a3ac34e5511c6949c12f
parent653af7c39dce220831622f350452b6c0d6bb4699 (diff)
downloadtalos-sbe-d366d4d3fd4750660586c2fa983c12020406fa49.tar.gz
talos-sbe-d366d4d3fd4750660586c2fa983c12020406fa49.zip
Revert "Clear INT_CQ related firs after completing sync_reset in MPIPL"
This reverts commit 9b1a1383bb554e9810f45717c3f44782c79411f3. Change-Id: I31b958d11dc1bbe058712e48831baa5945823af9 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68201 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com> Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com> Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68203 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
-rw-r--r--src/import/chips/p9/procedures/hwp/nest/p9_sbe_check_quiesce.C46
-rw-r--r--src/import/chips/p9/procedures/hwp/nest/p9_sbe_check_quiesce.H5
2 files changed, 0 insertions, 51 deletions
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_sbe_check_quiesce.C b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_check_quiesce.C
index 3b134c4d..a4296742 100644
--- a/src/import/chips/p9/procedures/hwp/nest/p9_sbe_check_quiesce.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_check_quiesce.C
@@ -810,8 +810,6 @@ extern "C" {
l_data.setBit<PU_INT_CQ_RST_CTL_SYNC_RESET>();
FAPI_TRY(fapi2::putScom(i_target, PU_INT_CQ_RST_CTL, l_data));
- FAPI_TRY(p9_clear_int_fir_regs(i_target), "error clearing int_cq firs");
-
fapi_try_exit:
FAPI_DBG("p9_intp_check_quiesce: Exiting...");
return fapi2::current_err;
@@ -820,50 +818,6 @@ extern "C" {
//---------------------------------------------------------------------------------
// NOTE: description in header
//---------------------------------------------------------------------------------
- fapi2::ReturnCode p9_clear_int_fir_regs(
- const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target)
- {
- // Number of register we need to read in order to clear INT_CQ firs
- const uint8_t l_numRegs = 20;
- const uint64_t l_fir_reg_addrs_to_read_to_clear[l_numRegs] =
- {
- PU_INT_PC_ERR0_WOF, PU_INT_PC_ERR0_FATAL,
- PU_INT_PC_ERR0_RECOV, PU_INT_PC_ERR0_INFO,
- PU_INT_PC_ERR1_WOF, PU_INT_PC_ERR1_FATAL,
- PU_INT_PC_ERR1_RECOV, PU_INT_PC_ERR1_INFO,
- PU_INT_PC_VPC_WOF_ERR, PU_INT_PC_VPC_FATAL_ERR,
- PU_INT_PC_VPC_RECOV_ERR, PU_INT_PC_VPC_INFO_ERR,
- PU_INT_VC_WOF_ERR_G0, PU_INT_VC_WOF_ERR_G1,
- PU_INT_VC_FATAL_ERR_G1, PU_INT_VC_FATAL_ERR_G0,
- PU_INT_VC_RECOV_ERR_G0, PU_INT_VC_RECOV_ERR_G1,
- PU_INT_VC_INFO_ERR_G0, PU_INT_VC_INFO_ERR_G1
- };
-
- fapi2::buffer<uint64_t> l_fir_clear_data(0);
-
- // Read from each register in order to clear it (per scomdef)
- // We don't care what was read out.
- for (uint8_t i = 0; i < l_numRegs; i++)
- {
- FAPI_TRY(fapi2::getScom(i_target, l_fir_reg_addrs_to_read_to_clear[i], l_fir_clear_data));
- }
-
- // Clean up data buffer incase data was read
- l_fir_clear_data.flush<0>();
-
- // clear PU_INT_CQ_WOF via write (any write to this reg should clear)
- FAPI_TRY(fapi2::putScom(i_target, PU_INT_CQ_WOF, l_fir_clear_data));
-
- // Write all 0's to PU_INT_CQ_FIR to get rid of any stale firs
- FAPI_TRY(fapi2::putScom(i_target, PU_INT_CQ_FIR, l_fir_clear_data));
-
- fapi_try_exit:
- return fapi2::current_err;
- }
-
- //---------------------------------------------------------------------------------
- // NOTE: description in header
- //---------------------------------------------------------------------------------
fapi2::ReturnCode p9_int_scrub_caches(
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target)
{
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_sbe_check_quiesce.H b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_check_quiesce.H
index fff31973..9d6e46c2 100644
--- a/src/import/chips/p9/procedures/hwp/nest/p9_sbe_check_quiesce.H
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_check_quiesce.H
@@ -130,11 +130,6 @@ extern "C" {
fapi2::ReturnCode p9_int_scrub_caches(
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target);
- /// @brief Helper function to clear out all INT_CQ firs
- /// @param[in] i_target => P9 chip target
- /// @return FAPI_RC_SUCCESS if the fir regs were cleared correctly
- fapi2::ReturnCode p9_clear_int_fir_regs(
- const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target);
} //extern "C"
#endif //_P9_SBE_CHECK_QUIESCE_H_
OpenPOWER on IntegriCloud