diff options
| -rw-r--r-- | src/include/usr/diag/mdia/mdia.H | 65 | ||||
| -rw-r--r-- | src/include/usr/diag/mdia/mdiamevent.H | 52 | ||||
| -rwxr-xr-x | src/usr/diag/mdia/mdiamonitor.C | 5 | ||||
| -rw-r--r-- | src/usr/diag/mdia/mdiasm.C | 24 | ||||
| -rw-r--r-- | src/usr/diag/mdia/test/mdiatestsm.H | 7 | ||||
| -rw-r--r-- | src/usr/diag/prdf/plat/prdfPlatServices_ipl.C | 1 |
6 files changed, 50 insertions, 104 deletions
diff --git a/src/include/usr/diag/mdia/mdia.H b/src/include/usr/diag/mdia/mdia.H index 67f85e9a6..826ddb637 100644 --- a/src/include/usr/diag/mdia/mdia.H +++ b/src/include/usr/diag/mdia/mdia.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2016 */ +/* [+] 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. */ @@ -33,34 +35,6 @@ namespace MDIA { -struct MaintCommandEvent; - -/** - * @brief MaintCommandEventType - maint command event types - */ -enum MaintCommandEventType -{ - /** - * @brief COMMAND_COMPLETE - command finished at end of last rank - */ - COMMAND_COMPLETE, - - /** - * @brief COMMAND_STOPPED - command finished at end of other rank - */ - COMMAND_STOPPED, - - /** - * @brief SKIP_MBA - stop testing mba - */ - SKIP_MBA, - - /** - * @brief RESET_TIMER - command done but expect long analysis - */ - RESET_TIMER, -}; - /** * @brief runStep istep dispatcher entry point. * @@ -90,6 +64,37 @@ errlHndl_t runStep(const TARGETING::TargetHandleList & i_targetList); void waitingForMaintCmdEvents(bool & o_waiting); /** + * @brief MaintCommandEventType - maint command event types + */ +enum MaintCommandEventType +{ + /** The command reached the end of the address range. */ + COMMAND_COMPLETE, + + /** A fault is found during analysis and no further testing is needed. */ + STOP_TESTING, + + /** PRD detected an error and needs time to complete analysis. */ + RESET_TIMER, +}; + +/** + * @brief MaintCommandEvent maint command event + */ +struct MaintCommandEvent +{ + /** + * @brief type the type associated with the event + */ + MaintCommandEventType type; + + /** + * @brief target the target associated with the event + */ + TARGETING::TargetHandle_t target; +}; + +/** * @brief processEvent prd callback * * called by prd to inform memory diagnostics of attention @@ -105,5 +110,7 @@ void waitingForMaintCmdEvents(bool & o_waiting); * @post message processed */ errlHndl_t processEvent(MaintCommandEvent & i_event); + } + #endif diff --git a/src/include/usr/diag/mdia/mdiamevent.H b/src/include/usr/diag/mdia/mdiamevent.H deleted file mode 100644 index f27fe249b..000000000 --- a/src/include/usr/diag/mdia/mdiamevent.H +++ /dev/null @@ -1,52 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/include/usr/diag/mdia/mdiamevent.H $ */ -/* */ -/* OpenPOWER HostBoot Project */ -/* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ -/* */ -/* Licensed under the Apache License, Version 2.0 (the "License"); */ -/* you may not use this file except in compliance with the License. */ -/* You may obtain a copy of the License at */ -/* */ -/* http://www.apache.org/licenses/LICENSE-2.0 */ -/* */ -/* Unless required by applicable law or agreed to in writing, software */ -/* distributed under the License is distributed on an "AS IS" BASIS, */ -/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */ -/* implied. See the License for the specific language governing */ -/* permissions and limitations under the License. */ -/* */ -/* IBM_PROLOG_END_TAG */ -#ifndef __MDIA_MDIAMEVENT_H -#define __MDIA_MDIAMEVENT_H - -#include <diag/mdia/mdia.H> - -/** - * @file mdiamevent.H - * @brief mdia maint command event - */ - -namespace MDIA -{ - -/** - * @brief MaintCommandEvent maint command event - */ -struct MaintCommandEvent -{ - /** - * @brief type the type associated with the event - */ - MaintCommandEventType type; - - /** - * @brief target the target associated with the event - */ - TARGETING::TargetHandle_t target; -}; -} -#endif diff --git a/src/usr/diag/mdia/mdiamonitor.C b/src/usr/diag/mdia/mdiamonitor.C index bc7c0dc59..fedd7a1d3 100755 --- a/src/usr/diag/mdia/mdiamonitor.C +++ b/src/usr/diag/mdia/mdiamonitor.C @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2016 */ +/* [+] 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. */ @@ -24,7 +26,6 @@ #include <targeting/common/util.H> #include <targeting/common/target.H> #include <vector> -#include <diag/mdia/mdiamevent.H> #include "mdiamonitor.H" #include "mdiasm.H" #include "mdiatrace.H" diff --git a/src/usr/diag/mdia/mdiasm.C b/src/usr/diag/mdia/mdiasm.C index 0b108a3a5..f93b29e29 100644 --- a/src/usr/diag/mdia/mdiasm.C +++ b/src/usr/diag/mdia/mdiasm.C @@ -34,7 +34,6 @@ #include "mdiamonitor.H" #include <errl/errlmanager.H> #include <stdio.h> -#include <mdia/mdiamevent.H> #include <hbotcompid.H> //#include <fapi.H> TODO RTC 145132 //#include <fapiPlatHwpInvoker.H> TODO RTC 145132 @@ -1129,8 +1128,7 @@ bool StateMachine::processMaintCommandEvent(const MaintCommandEvent & i_event) // If shutdown is requested and we're not in MNFG mode // skip testing on all MBAs if(( INITSERVICE::isShutdownRequested() ) && - (( COMMAND_COMPLETE == eventType ) || - ( COMMAND_STOPPED == eventType )) && + ( COMMAND_COMPLETE == eventType ) && ! (( MNFG_FLAG_ENABLE_EXHAUSTIVE_PATTERN_TEST & iv_globals.mfgPolicy) || ( MNFG_FLAG_ENABLE_STANDARD_PATTERN_TEST @@ -1143,7 +1141,7 @@ bool StateMachine::processMaintCommandEvent(const MaintCommandEvent & i_event) get_huid(getTarget(wfp)), cmd, i_event.type, iv_globals.mfgPolicy); - eventType = SKIP_MBA; + eventType = STOP_TESTING; } #ifdef CONFIG_BMC_IPMI @@ -1160,8 +1158,9 @@ bool StateMachine::processMaintCommandEvent(const MaintCommandEvent & i_event) #endif switch(eventType) + { case COMMAND_COMPLETE: - { + // command stopped or complete at end of last rank wfp.restartCommand = false; @@ -1177,26 +1176,17 @@ bool StateMachine::processMaintCommandEvent(const MaintCommandEvent & i_event) wfp.data = NULL; break; - case COMMAND_STOPPED: - // command stopped at end of some other rank + case STOP_TESTING: - flags = START_NEXT_CMD; - wfp.restartCommand = true; - - break; - - case SKIP_MBA: - - // stop testing on this mba + // stop testing on this target wfp.status = COMPLETE; - // done with this maint command + // done with this command flags = DELETE_CMD | STOP_CMD | START_NEXT_CMD; wfp.data = NULL; - break; case RESET_TIMER: diff --git a/src/usr/diag/mdia/test/mdiatestsm.H b/src/usr/diag/mdia/test/mdiatestsm.H index bbec80107..cc4a23fcb 100644 --- a/src/usr/diag/mdia/test/mdiatestsm.H +++ b/src/usr/diag/mdia/test/mdiatestsm.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2016 */ +/* [+] 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. */ @@ -32,7 +34,6 @@ #include <cxxtest/TestSuite.H> #include "../mdiasm.H" #include "../mdiasmimpl.H" -#include <diag/mdia/mdiamevent.H> #include <targeting/common/utilFilter.H> #include "../mdiatrace.H" #include "../mdiamonitor.H" @@ -333,7 +334,7 @@ class MdiaSmTest : public CxxTest::TestSuite if(StateMachine::workItemIsAsync(tmp) != it->expected) { - TS_FAIL("unexpected result from " + TS_FAIL("unexpected result from " "StateMachine::workItemIsAsync: %d", it->workItem); } } diff --git a/src/usr/diag/prdf/plat/prdfPlatServices_ipl.C b/src/usr/diag/prdf/plat/prdfPlatServices_ipl.C index edad4f39a..9de6c2300 100644 --- a/src/usr/diag/prdf/plat/prdfPlatServices_ipl.C +++ b/src/usr/diag/prdf/plat/prdfPlatServices_ipl.C @@ -40,7 +40,6 @@ //#include <prdfCenDqBitmap.H> TODO RTC 136126 #include <diag/mdia/mdia.H> -#include <diag/mdia/mdiamevent.H> #include <config.h> using namespace TARGETING; |
