summaryrefslogtreecommitdiffstats
path: root/src/usr/diag/mdia/mdiasm.C
diff options
context:
space:
mode:
Diffstat (limited to 'src/usr/diag/mdia/mdiasm.C')
-rw-r--r--src/usr/diag/mdia/mdiasm.C79
1 files changed, 50 insertions, 29 deletions
diff --git a/src/usr/diag/mdia/mdiasm.C b/src/usr/diag/mdia/mdiasm.C
index bb1c123cf..ba00de6b0 100644
--- a/src/usr/diag/mdia/mdiasm.C
+++ b/src/usr/diag/mdia/mdiasm.C
@@ -43,12 +43,12 @@
#include <errl/errludlogregister.H>
#include <initservice/istepdispatcherif.H>
#include <ipmi/ipmiwatchdog.H>
-#include <config.h>
#include <initservice/initserviceif.H>
#include <sys/time.h>
#include <p9c_mss_maint_cmds.H>
#include <dimmBadDqBitmapFuncs.H>
#include <sys/misc.h>
+#include <hwp_wrappers.H>
using namespace TARGETING;
using namespace ERRORLOG;
@@ -632,16 +632,17 @@ void StateMachine::processCommandTimeout(const MonitorIDs & i_monitorIDs)
// target type is MCBIST
else if ( TYPE_MCBIST == trgtType )
{
+ #ifndef CONFIG_AXONE
fapi2::Target<fapi2::TARGET_TYPE_MCBIST> fapiMcbist(target);
- FAPI_INVOKE_HWP( err, mss::memdiags::stop, fapiMcbist );
+ FAPI_INVOKE_HWP( err, nim_stop, fapiMcbist );
if ( nullptr != err )
{
- MDIA_ERR("sm: mss::memdiags::stop failed");
+ MDIA_ERR("sm: nim_stop failed");
errlCommit(err, MDIA_COMP_ID);
}
- //mss::memdiags::stop will set the command complete attention so
+ //nim_stop will set the command complete attention so
//we need to clear those
bitMask = ~bitMask;
@@ -654,22 +655,23 @@ void StateMachine::processCommandTimeout(const MonitorIDs & i_monitorIDs)
"0x%08X", firAddr, get_huid(target) );
errlCommit(err, MDIA_COMP_ID);
}
+ #endif
}
// target type is OCMB_CHIP
else if ( TYPE_OCMB_CHIP == trgtType )
{
- /* TODO RTC 201293 uncomment once we have hwp support
+ #ifdef CONFIG_AXONE
fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP>
fapiOcmb(target);
- FAPI_INVOKE_HWP( err, mss::memdiags::stop, fapiOcmb );
+ FAPI_INVOKE_HWP( err, exp_stop, fapiOcmb );
if ( nullptr != err )
{
- MDIA_ERR("sm: mss::memdiags::stop failed");
+ MDIA_ERR("sm: exp_stop failed");
errlCommit(err, MDIA_COMP_ID);
}
- // mss::memdiags::stop will set the command complete
+ // exp_stop will set the command complete
// attention so we need to clear those
bitMask = ~bitMask;
@@ -682,7 +684,7 @@ void StateMachine::processCommandTimeout(const MonitorIDs & i_monitorIDs)
"0x%08X", firAddr, get_huid(target) );
errlCommit(err, MDIA_COMP_ID);
}
- */
+ #endif
}
// Assert if unsupported type
else
@@ -782,7 +784,15 @@ void StateMachine::setup(const WorkFlowAssocMap & i_list)
p->timeoutCnt = 0;
p->data = NULL;
- p->chipUnit = it->first->getAttr<ATTR_CHIP_UNIT>();
+ if ( TYPE_OCMB_CHIP == it->first->getAttr<ATTR_TYPE>() )
+ {
+ // There is no chip unit attribute for OCMBs, so just use 0
+ p->chipUnit = 0;
+ }
+ else
+ {
+ p->chipUnit = it->first->getAttr<ATTR_CHIP_UNIT>();
+ }
iv_workFlowProperties.push_back(p);
}
@@ -1242,14 +1252,15 @@ errlHndl_t StateMachine::doMaintCommand(WorkFlowProperties & i_wfp)
//target type is MCBIST
else if (TYPE_MCBIST == trgtType)
{
+ #ifndef CONFIG_AXONE
fapi2::Target<fapi2::TARGET_TYPE_MCBIST> fapiMcbist(target);
- mss::mcbist::stop_conditions stopCond;
+ mss::mcbist::stop_conditions<mss::mc_type::NIMBUS> stopCond;
switch(workItem)
{
case START_RANDOM_PATTERN:
- FAPI_INVOKE_HWP( err, mss::memdiags::sf_init, fapiMcbist,
+ FAPI_INVOKE_HWP( err, nim_sf_init, fapiMcbist,
mss::mcbist::PATTERN_RANDOM );
MDIA_FAST("sm: random init %p on: %x", fapiMcbist,
get_huid(target));
@@ -1270,7 +1281,7 @@ errlHndl_t StateMachine::doMaintCommand(WorkFlowProperties & i_wfp)
stopCond.set_pause_on_nce_hard(mss::ON);
}
- FAPI_INVOKE_HWP( err, mss::memdiags::sf_read, fapiMcbist,
+ FAPI_INVOKE_HWP( err, nim_sf_read, fapiMcbist,
stopCond );
MDIA_FAST("sm: scrub %p on: %x", fapiMcbist,
get_huid(target));
@@ -1285,7 +1296,7 @@ errlHndl_t StateMachine::doMaintCommand(WorkFlowProperties & i_wfp)
case START_PATTERN_6:
case START_PATTERN_7:
- FAPI_INVOKE_HWP( err, mss::memdiags::sf_init, fapiMcbist,
+ FAPI_INVOKE_HWP( err, nim_sf_init, fapiMcbist,
workItem );
MDIA_FAST("sm: init %p on: %x", fapiMcbist,
get_huid(target));
@@ -1301,19 +1312,20 @@ errlHndl_t StateMachine::doMaintCommand(WorkFlowProperties & i_wfp)
MDIA_FAST("sm: Running Maint Cmd failed");
i_wfp.data = nullptr;
}
+ #endif
}
// target type is OCMB_CHIP
else if ( TYPE_OCMB_CHIP == trgtType )
{
- /* TODO RTC 201293 - uncomment with hwp support
+ #ifdef CONFIG_AXONE
fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP> fapiOcmb(target);
- mss::mcbist::stop_conditions stopCond;
+ mss::mcbist::stop_conditions<mss::mc_type::EXPLORER> stopCond;
switch(workItem)
{
case START_RANDOM_PATTERN:
- FAPI_INVOKE_HWP( err, mss::memdiags::sf_init, fapiOcmb,
+ FAPI_INVOKE_HWP( err, exp_sf_init, fapiOcmb,
mss::mcbist::PATTERN_RANDOM );
MDIA_FAST("sm: random init %p on: %x", fapiOcmb,
get_huid(target));
@@ -1334,7 +1346,7 @@ errlHndl_t StateMachine::doMaintCommand(WorkFlowProperties & i_wfp)
stopCond.set_pause_on_nce_hard(mss::ON);
}
- FAPI_INVOKE_HWP( err, mss::memdiags::sf_read, fapiOcmb,
+ FAPI_INVOKE_HWP( err, exp_sf_read, fapiOcmb,
stopCond );
MDIA_FAST( "sm: scrub %p on: %x", fapiOcmb,
get_huid(target) );
@@ -1349,7 +1361,7 @@ errlHndl_t StateMachine::doMaintCommand(WorkFlowProperties & i_wfp)
case START_PATTERN_6:
case START_PATTERN_7:
- FAPI_INVOKE_HWP( err, mss::memdiags::sf_init, fapiOcmb,
+ FAPI_INVOKE_HWP( err, exp_sf_init, fapiOcmb,
workItem );
MDIA_FAST( "sm: init %p on: %x", fapiOcmb,
get_huid(target) );
@@ -1365,7 +1377,7 @@ errlHndl_t StateMachine::doMaintCommand(WorkFlowProperties & i_wfp)
MDIA_FAST("sm: Running Maint Cmd failed");
i_wfp.data = nullptr;
}
- */
+ #endif
}
else
{
@@ -1571,37 +1583,39 @@ bool StateMachine::processMaintCommandEvent(const MaintCommandEvent & i_event)
//target type is MCBIST
else if ( TYPE_MCBIST == trgtType )
{
+ #ifndef CONFIG_AXONE
if(flags & STOP_CMD)
{
MDIA_FAST("sm: stopping command: %p", target);
fapi2::Target<fapi2::TARGET_TYPE_MCBIST> fapiMcbist(target);
- FAPI_INVOKE_HWP( err, mss::memdiags::stop, fapiMcbist );
+ FAPI_INVOKE_HWP( err, nim_stop, fapiMcbist );
if(nullptr != err)
{
- MDIA_ERR("sm: mss::memdiags::stop failed");
+ MDIA_ERR("sm: nim_stop failed");
errlCommit(err, MDIA_COMP_ID);
}
}
+ #endif
}
// target type is OCMB_CHIP
else if ( TYPE_OCMB_CHIP == trgtType )
{
+ #ifdef CONFIG_AXONE
if(flags & STOP_CMD)
{
MDIA_FAST("sm: stopping command: %p", target);
- /* TODO RTC 201293 - reenable with hwp support
fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP> fapiOcmb(target);
- FAPI_INVOKE_HWP( err, mss::memdiags::stop, fapiOcmb );
+ FAPI_INVOKE_HWP( err, exp_stop, fapiOcmb );
if(nullptr != err)
{
- MDIA_ERR("sm: mss::memdiags::stop failed");
+ MDIA_ERR("sm: exp_stop failed");
errlCommit(err, MDIA_COMP_ID);
}
- */
}
+ #endif
}
else
{
@@ -1665,10 +1679,12 @@ void StateMachine::reset()
mutex_unlock(&iv_mutex);
}
-void StateMachine::shutdown()
+errlHndl_t StateMachine::shutdown()
{
mutex_lock(&iv_mutex);
+ errlHndl_t l_errl = nullptr;
+
Util::ThreadPool<WorkItem> * tp = iv_tp;
CommandMonitor * monitor = iv_monitor;
@@ -1684,7 +1700,7 @@ void StateMachine::shutdown()
if(tp)
{
MDIA_FAST("Stopping threadPool...");
- tp->shutdown();
+ l_errl = tp->shutdown();
delete tp;
}
@@ -1696,11 +1712,16 @@ void StateMachine::shutdown()
}
MDIA_FAST("sm: ...shutdown complete");
+ return l_errl;
}
StateMachine::~StateMachine()
{
- shutdown();
+ errlHndl_t l_errl = shutdown();
+ if(l_errl)
+ {
+ errlCommit(l_errl, MDIA_COMP_ID);
+ }
sync_cond_destroy(&iv_cond);
mutex_destroy(&iv_mutex);
OpenPOWER on IntegriCloud