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/runtime | |
| 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/runtime')
| -rw-r--r-- | src/usr/errl/runtime/rt_errlmanager.C | 14 | ||||
| -rw-r--r-- | src/usr/errl/runtime/test/rt_errltest.H | 9 |
2 files changed, 17 insertions, 6 deletions
diff --git a/src/usr/errl/runtime/rt_errlmanager.C b/src/usr/errl/runtime/rt_errlmanager.C index 783f8d2ed..fcb469e6e 100644 --- a/src/usr/errl/runtime/rt_errlmanager.C +++ b/src/usr/errl/runtime/rt_errlmanager.C @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2013,2014 */ +/* Contributors Listed Below - COPYRIGHT 2013,2015 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -266,14 +268,16 @@ bool rt_processCallout(errlHndl_t &io_errl, if(i_DeferredOnly) { if ((pCalloutUD->type == HWAS::HW_CALLOUT) && - (pCalloutUD->deconfigState == HWAS::DELAYED_DECONFIG)) + ((pCalloutUD->deconfigState == HWAS::DELAYED_DECONFIG) || + (pCalloutUD->deconfigState == HWAS::DECONFIG))) { pCalloutUD->deconfigState = HWAS::NO_DECONFIG; TRACFCOMP( g_trac_errl, ERR_MRK - "Runtime errorlog callout with DELAYED_DECONFIG not " - "allowed! Changed to NO_DECONFIG. plid: 0x%X", - io_errl->plid() ); + "Runtime errorlog callout with DELAYED_DECONFIG or " + "DECONFIG not allowed! Changed to NO_DECONFIG. " + " plid: 0x%X. Deconfig State: 0x%x", io_errl->plid(), + pCalloutUD->deconfigState); } } diff --git a/src/usr/errl/runtime/test/rt_errltest.H b/src/usr/errl/runtime/test/rt_errltest.H index fa8a352c7..0a98c07df 100644 --- a/src/usr/errl/runtime/test/rt_errltest.H +++ b/src/usr/errl/runtime/test/rt_errltest.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2014 */ +/* Contributors Listed Below - COPYRIGHT 2013,2015 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -308,6 +310,11 @@ public: HWAS::DELAYED_DECONFIG, HWAS::GARD_NULL); + errl->addHwCallout(pTarget, + HWAS::SRCI_PRIORITY_MED, + HWAS::DECONFIG, + HWAS::GARD_NULL); + errl->addHwCallout(TARGETING::MASTER_PROCESSOR_CHIP_TARGET_SENTINEL, HWAS::SRCI_PRIORITY_LOW, HWAS::NO_DECONFIG, |
