diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/sbeio/sbe_fifodd.C | 30 | ||||
| -rw-r--r-- | src/usr/sbeio/sbe_psudd.C | 37 |
2 files changed, 0 insertions, 67 deletions
diff --git a/src/usr/sbeio/sbe_fifodd.C b/src/usr/sbeio/sbe_fifodd.C index 50dbd880d..5906452ec 100644 --- a/src/usr/sbeio/sbe_fifodd.C +++ b/src/usr/sbeio/sbe_fifodd.C @@ -41,7 +41,6 @@ #include "sbe_fifodd.H" #include <sbeio/sbe_ffdc_package_parser.H> #include <sbeio/sbe_ffdc_parser.H> -#include <initservice/initserviceif.H> #include <kernel/pagemgr.H> #include <fapi2.H> #include <set_sbe_error.H> @@ -133,35 +132,6 @@ errlHndl_t SbeFifo::performFifoChipOp(TARGETING::Target * i_target, mutex_unlock(&l_fifoOpMux); - if( errl && (SBEIO_FIFO == errl->moduleId()) ) - { - SBE_TRACF( "Forcing shutdown for FSP to collect FFDC" ); - - //commit the original error after pulling some data out - uint32_t orig_plid = errl->plid(); - uint32_t orig_rc = errl->reasonCode(); - uint32_t orig_mod = errl->moduleId(); - ERRORLOG::errlCommit( errl, SBEIO_COMP_ID ); - /*@ - * @errortype - * @moduleid SBEIO_FIFO - * @reasoncode SBEIO_HWSV_COLLECT_SBE_RC - * @userdata1 PLID of original error log - * @userdata2[00:31] Original RC - * @userdata2[32:63] Original Module Id - * - * @devdesc SBE error, force HWSV to collect FFDC - * @custdesc Firmware error communicating with boot device - */ - errl = new ErrlEntry(ERRL_SEV_UNRECOVERABLE, - SBEIO_FIFO, - SBEIO_HWSV_COLLECT_SBE_RC, - orig_plid, - TWO_UINT32_TO_UINT64(orig_rc,orig_mod)); - INITSERVICE::doShutdownWithError( SBEIO_HWSV_COLLECT_SBE_RC, - TARGETING::get_huid(i_target) ); - } - SBE_TRACD(EXIT_MRK "performFifoChipOp"); return errl; diff --git a/src/usr/sbeio/sbe_psudd.C b/src/usr/sbeio/sbe_psudd.C index 58a891e26..77b8f4824 100644 --- a/src/usr/sbeio/sbe_psudd.C +++ b/src/usr/sbeio/sbe_psudd.C @@ -37,7 +37,6 @@ #include <targeting/common/target.H> #include <errl/errlreasoncodes.H> #include <sbeio/sbeioreasoncodes.H> -#include <initservice/initserviceif.H> //@todo-RTC:149454-Remove #include <sbeio/sbe_ffdc_package_parser.H> #include <sbeio/sbe_psudd.H> #include <sbeio/sbe_ffdc_parser.H> @@ -165,42 +164,6 @@ errlHndl_t SbePsu::performPsuChipOp(TARGETING::Target * i_target, mutex_unlock(&l_psuOpMux); - if( errl && (SBEIO_PSU == errl->moduleId()) - // For this special case pass back errl without commiting or - // collecting FFDC/shutting down - && (SBE_PSU_SET_UNSECURE_MEMORY_REGION_CMD != i_pPsuRequest->command) - ) - { - SBE_TRACF( "Forcing shutdown for FSP to collect FFDC" ); - - //commit the original error after pulling some data out - uint32_t orig_plid = errl->plid(); - uint32_t orig_rc = errl->reasonCode(); - uint32_t orig_mod = errl->moduleId(); - ERRORLOG::errlCommit( errl, SBEIO_COMP_ID ); - /*@ - * @errortype - * @moduleid SBEIO_PSU - * @reasoncode SBEIO_HWSV_COLLECT_SBE_RC - * @userdata1 PLID of original error log - * @userdata2[00:31] Original RC - * @userdata2[32:63] Original Module Id - * - * @devdesc SBE error, force HWSV to collect FFDC - * @custdesc Firmware error communicating with boot device - */ - errl = new ErrlEntry(ERRL_SEV_UNRECOVERABLE, - SBEIO_PSU, - SBEIO_HWSV_COLLECT_SBE_RC, - orig_plid, - TWO_UINT32_TO_UINT64(orig_rc,orig_mod)); - MAGIC_INST_GET_SBE_TRACES( - i_target->getAttr<TARGETING::ATTR_POSITION>(), - SBEIO_HWSV_COLLECT_SBE_RC); - INITSERVICE::doShutdownWithError( SBEIO_HWSV_COLLECT_SBE_RC, - TARGETING::get_huid(i_target) ); - } - SBE_TRACD(EXIT_MRK "performPsuChipOp"); return errl; |
