diff options
| author | Elizabeth Liner <eliner@us.ibm.com> | 2015-01-21 13:52:37 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-02-09 16:31:35 -0600 |
| commit | 6c30c657b02d720f38f655284e4c4d4ca85f02b0 (patch) | |
| tree | 0f51e2bedfe1dda198678136628357035470432a /src/usr/errl/errlentry.C | |
| parent | 806036d507c384ce3daa75b668f6af99d9a78378 (diff) | |
| download | talos-hostboot-6c30c657b02d720f38f655284e4c4d4ca85f02b0.tar.gz talos-hostboot-6c30c657b02d720f38f655284e4c4d4ca85f02b0.zip | |
Modified functions to not allow deconfig's during HBRT
Change-Id: Icf91982f1c590323df2c28afe7c6a3a38d8583ef
RTC:119076
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15276
Tested-by: Jenkins Server
Reviewed-by: STEPHEN M. CPREK <smcprek@us.ibm.com>
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/errl/errlentry.C')
| -rw-r--r-- | src/usr/errl/errlentry.C | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/usr/errl/errlentry.C b/src/usr/errl/errlentry.C index 57ca9a95a..2d604ceac 100644 --- a/src/usr/errl/errlentry.C +++ b/src/usr/errl/errlentry.C @@ -1089,7 +1089,7 @@ void ErrlEntry::deferredDeconfigure() ERRORLOG::theErrlManager::instance().getHwasProcessCalloutFn(); if (pFn != NULL) { - //check for defered deconfigure callouts + //check for deferred deconfigure callouts // look thru the errlog for any Callout UserDetail sections for(std::vector<ErrlUD*>::const_iterator it = iv_SectionVector.begin(); it != iv_SectionVector.end(); @@ -1102,9 +1102,18 @@ void ErrlEntry::deferredDeconfigure() (HWAS::HW_CALLOUT == reinterpret_cast<HWAS::callout_ud_t*>( (*it)->iv_pData)->type) && +#if __HOSTBOOT_RUNTIME + ((HWAS::DELAYED_DECONFIG == + reinterpret_cast<HWAS::callout_ud_t*>( + (*it)->iv_pData)->deconfigState) || + (HWAS::DECONFIG == + reinterpret_cast<HWAS::callout_ud_t*>( + (*it)->iv_pData)->deconfigState)) +#else (HWAS::DELAYED_DECONFIG == reinterpret_cast<HWAS::callout_ud_t*>( (*it)->iv_pData)->deconfigState) +#endif ) { // call HWAS function to register this action, @@ -1124,7 +1133,6 @@ void ErrlEntry::deferredDeconfigure() TRACDCOMP(g_trac_errl, INFO_MRK"errlEntry::deferredDeconfigure returning"); } - ////////////////////////////////////////////////////////////////////////////// // for use by ErrlManager |
