summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/import/chips/p9/procedures/hwp/memory/lab/sdk/example/C/mss_lab_sfwrite.C6
-rw-r--r--src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C5
-rw-r--r--src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.H4
-rw-r--r--src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C2
-rw-r--r--src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C10
-rw-r--r--src/usr/diag/mdia/mdiasm.C16
-rw-r--r--src/usr/diag/prdf/plat/prdfPlatServices.C8
-rw-r--r--src/usr/diag/prdf/plat/prdfPlatServices_ipl.C4
-rw-r--r--src/usr/diag/prdf/plat/prdfPlatServices_rt.C8
9 files changed, 36 insertions, 27 deletions
diff --git a/src/import/chips/p9/procedures/hwp/memory/lab/sdk/example/C/mss_lab_sfwrite.C b/src/import/chips/p9/procedures/hwp/memory/lab/sdk/example/C/mss_lab_sfwrite.C
index b31883c39..866091439 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lab/sdk/example/C/mss_lab_sfwrite.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lab/sdk/example/C/mss_lab_sfwrite.C
@@ -104,8 +104,8 @@ int main(int i_argc, char* i_argv[])
// retrieve the Cronus string representing the fapi2 target
mss::logf(mss::DEBUG, "MCBIST C_str: %s", mss::c_str(fapi2_mcbist_target));
- rc = memdiags::sf_init(fapi2_mcbist_target, mss::mcbist::PATTERN_5);
- mss::lab::is_ok(rc, "memdiags::sf_init failed");
+ rc = mss::memdiags::sf_init(fapi2_mcbist_target, mss::mcbist::PATTERN_5);
+ mss::lab::is_ok(rc, "mss::memdiags::sf_init failed");
// Just for giggles, poll here looking for the FIR bit ...
{
@@ -128,7 +128,7 @@ int main(int i_argc, char* i_argv[])
},
l_probes);
- mss::lab::is_ok(l_poll_results == true, "memdiags::sf_write timedout");
+ mss::lab::is_ok(l_poll_results == true, "mss::memdiags::sf_write timedout");
}
mss::log(mss::DEBUG, "Finished");
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C
index 09ab4f568..ae057621e 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C
@@ -53,6 +53,9 @@ using fapi2::TARGET_TYPE_SYSTEM;
using fapi2::FAPI2_RC_SUCCESS;
using fapi2::FAPI2_RC_INVALID_PARAMETER;
+namespace mss
+{
+
namespace memdiags
{
@@ -746,3 +749,5 @@ fapi_try_exit:
}
}
+
+}
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.H b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.H
index 9ce8ad0aa..09322b4b5 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.H
@@ -43,6 +43,9 @@
#include <lib/mcbist/patterns.H>
#include <lib/mcbist/settings.H>
+namespace mss
+{
+
namespace memdiags
{
@@ -398,4 +401,5 @@ fapi2::ReturnCode continue_cmd( const fapi2::Target<T>& i_target,
} // namespace
+} // namespace
#endif
diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C
index e5b082077..9b0bb9874 100644
--- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C
+++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C
@@ -122,7 +122,7 @@ extern "C"
// We start the sf_init (write 0's) and it'll tickle the MCBIST complete FIR. PRD will see that
// and start a background scrub.
- FAPI_TRY( memdiags::sf_init(i_target, mss::mcbist::PATTERN_0) );
+ FAPI_TRY( mss::memdiags::sf_init(i_target, mss::mcbist::PATTERN_0) );
// If we're in the sim, we want to poll for the FIR bit. I don't think this ever really happens
// unless we're expressly testing this API.
diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C
index 11ad22d99..02a1cd282 100644
--- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C
+++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C
@@ -109,7 +109,7 @@ fapi2::ReturnCode p9_mss_scrub( const fapi2::Target<TARGET_TYPE_MCBIST>& i_targe
// to call sf_init (0's)
// TK we need to check FIR given the way this is right now, we should adjust with better stop
// conditions when we learn more about what we want to find in the lab
- FAPI_TRY( memdiags::sf_init(i_target, mss::mcbist::PATTERN_0) );
+ FAPI_TRY( mss::memdiags::sf_init(i_target, mss::mcbist::PATTERN_0) );
// Poll for completion.
l_poll_results = mss::poll(i_target, MCBIST_MCBISTFIRQ, l_poll_parameters,
@@ -131,10 +131,10 @@ fapi2::ReturnCode p9_mss_scrub( const fapi2::Target<TARGET_TYPE_MCBIST>& i_targe
FAPI_TRY ( mss::reset_reorder_queue_settings(i_target) );
// Start background scrub
- FAPI_TRY ( memdiags::background_scrub( i_target,
- mss::mcbist::stop_conditions(),
- mss::mcbist::speed::BG_SCRUB,
- mss::mcbist::address() ) );
+ FAPI_TRY ( mss::memdiags::background_scrub( i_target,
+ mss::mcbist::stop_conditions(),
+ mss::mcbist::speed::BG_SCRUB,
+ mss::mcbist::address() ) );
// Unmask firs after background scrub is started
FAPI_TRY ( mss::unmask::after_background_scrub( i_target ) );
diff --git a/src/usr/diag/mdia/mdiasm.C b/src/usr/diag/mdia/mdiasm.C
index 5ce9a6f15..19eb12703 100644
--- a/src/usr/diag/mdia/mdiasm.C
+++ b/src/usr/diag/mdia/mdiasm.C
@@ -593,15 +593,15 @@ void StateMachine::processCommandTimeout(const MonitorIDs & i_monitorIDs)
else
{
fapi2::Target<fapi2::TARGET_TYPE_MCBIST> fapiMcbist(target);
- FAPI_INVOKE_HWP( err, memdiags::stop, fapiMcbist );
+ FAPI_INVOKE_HWP( err, mss::memdiags::stop, fapiMcbist );
if ( nullptr != err )
{
- MDIA_ERR("sm: memdiags::stop failed");
+ MDIA_ERR("sm: mss::memdiags::stop failed");
errlCommit(err, MDIA_COMP_ID);
}
- //memdiags::stop will set the command complete attention so
+ //mss::memdiags::stop will set the command complete attention so
//we need to clear those
bitMask = ~bitMask;
@@ -1156,7 +1156,7 @@ errlHndl_t StateMachine::doMaintCommand(WorkFlowProperties & i_wfp)
{
case START_RANDOM_PATTERN:
- FAPI_INVOKE_HWP( err, memdiags::sf_init, fapiMcbist,
+ FAPI_INVOKE_HWP( err, mss::memdiags::sf_init, fapiMcbist,
mss::mcbist::PATTERN_RANDOM );
MDIA_FAST("sm: random init %p on: %x", fapiMcbist,
get_huid(target));
@@ -1177,7 +1177,7 @@ errlHndl_t StateMachine::doMaintCommand(WorkFlowProperties & i_wfp)
stopCond.set_pause_on_nce_hard(mss::ON);
}
- FAPI_INVOKE_HWP( err, memdiags::sf_read, fapiMcbist,
+ FAPI_INVOKE_HWP( err, mss::memdiags::sf_read, fapiMcbist,
stopCond );
MDIA_FAST("sm: scrub %p on: %x", fapiMcbist,
get_huid(target));
@@ -1192,7 +1192,7 @@ errlHndl_t StateMachine::doMaintCommand(WorkFlowProperties & i_wfp)
case START_PATTERN_6:
case START_PATTERN_7:
- FAPI_INVOKE_HWP( err, memdiags::sf_init, fapiMcbist,
+ FAPI_INVOKE_HWP( err, mss::memdiags::sf_init, fapiMcbist,
workItem );
MDIA_FAST("sm: init %p on: %x", fapiMcbist,
get_huid(target));
@@ -1420,11 +1420,11 @@ bool StateMachine::processMaintCommandEvent(const MaintCommandEvent & i_event)
MDIA_FAST("sm: stopping command: %p", target);
fapi2::Target<fapi2::TARGET_TYPE_MCBIST> fapiMcbist(target);
- FAPI_INVOKE_HWP( err, memdiags::stop, fapiMcbist );
+ FAPI_INVOKE_HWP( err, mss::memdiags::stop, fapiMcbist );
if(nullptr != err)
{
- MDIA_ERR("sm: memdiags::stop failed");
+ MDIA_ERR("sm: mss::memdiags::stop failed");
errlCommit(err, MDIA_COMP_ID);
}
}
diff --git a/src/usr/diag/prdf/plat/prdfPlatServices.C b/src/usr/diag/prdf/plat/prdfPlatServices.C
index 700d12410..230bde80f 100644
--- a/src/usr/diag/prdf/plat/prdfPlatServices.C
+++ b/src/usr/diag/prdf/plat/prdfPlatServices.C
@@ -363,12 +363,12 @@ uint32_t startBgScrub<TYPE_MCA>( ExtensibleChip * i_mcaChip,
// Start the background scrub command.
errlHndl_t errl = nullptr;
- FAPI_INVOKE_HWP( errl, memdiags::background_scrub, fapiTrgt, stopCond,
+ FAPI_INVOKE_HWP( errl, mss::memdiags::background_scrub, fapiTrgt, stopCond,
scrubSpeed, saddr );
if ( nullptr != errl )
{
- PRDF_ERR( PRDF_FUNC "memdiags::background_scrub(0x%08x,%d) failed",
+ PRDF_ERR( PRDF_FUNC "mss::memdiags::background_scrub(0x%08x,%d) failed",
mcbChip->getHuid(), i_rank.getMaster() );
PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT );
o_rc = FAIL; break;
@@ -427,12 +427,12 @@ uint32_t __startTdScrub_mca( ExtensibleChip * i_mcaChip,
// Start targeted scrub command.
errlHndl_t errl;
- FAPI_INVOKE_HWP( errl, memdiags::targeted_scrub, fapiTrgt, i_stopCond,
+ FAPI_INVOKE_HWP( errl, mss::memdiags::targeted_scrub, fapiTrgt, i_stopCond,
i_saddr, i_eaddr, mss::mcbist::NONE );
if ( nullptr != errl )
{
- PRDF_ERR( PRDF_FUNC "memdiags::targeted_scrub(0x%08x) failed",
+ PRDF_ERR( PRDF_FUNC "mss::memdiags::targeted_scrub(0x%08x) failed",
mcbChip->getHuid() );
PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT );
o_rc = FAIL; break;
diff --git a/src/usr/diag/prdf/plat/prdfPlatServices_ipl.C b/src/usr/diag/prdf/plat/prdfPlatServices_ipl.C
index 3b4aa0e7f..fa1a5bd8b 100644
--- a/src/usr/diag/prdf/plat/prdfPlatServices_ipl.C
+++ b/src/usr/diag/prdf/plat/prdfPlatServices_ipl.C
@@ -263,11 +263,11 @@ uint32_t startSfRead<TYPE_MCA>( ExtensibleChip * i_mcaChip,
// Start the super fast read command.
errlHndl_t errl;
- FAPI_INVOKE_HWP( errl, memdiags::sf_read, fapiTrgt, stopCond, saddr );
+ FAPI_INVOKE_HWP( errl, mss::memdiags::sf_read, fapiTrgt, stopCond, saddr );
if ( nullptr != errl )
{
- PRDF_ERR( PRDF_FUNC "memdiags::sf_read(0x%08x,%d) failed",
+ PRDF_ERR( PRDF_FUNC "mss::memdiags::sf_read(0x%08x,%d) failed",
mcbChip->getHuid(), i_rank.getMaster() );
PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT );
o_rc = FAIL; break;
diff --git a/src/usr/diag/prdf/plat/prdfPlatServices_rt.C b/src/usr/diag/prdf/plat/prdfPlatServices_rt.C
index a53a361bf..b5d8636e7 100644
--- a/src/usr/diag/prdf/plat/prdfPlatServices_rt.C
+++ b/src/usr/diag/prdf/plat/prdfPlatServices_rt.C
@@ -138,11 +138,11 @@ uint32_t stopBgScrub<TYPE_MCBIST>( ExtensibleChip * i_chip )
fapi2::Target<fapi2::TARGET_TYPE_MCBIST> fapiTrgt ( i_chip->getTrgt() );
errlHndl_t errl;
- FAPI_INVOKE_HWP( errl, memdiags::stop, fapiTrgt );
+ FAPI_INVOKE_HWP( errl, mss::memdiags::stop, fapiTrgt );
if ( nullptr != errl )
{
- PRDF_ERR( PRDF_FUNC "memdiags::stop(0x%08x) failed", i_chip->getHuid());
+ PRDF_ERR( PRDF_FUNC "mss::memdiags::stop(0x%08x) failed", i_chip->getHuid());
PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT );
rc = FAIL;
}
@@ -191,11 +191,11 @@ uint32_t resumeBgScrub<TYPE_MCBIST>( ExtensibleChip * i_chip )
// Resume the command on the next address.
errlHndl_t errl;
- FAPI_INVOKE_HWP( errl, memdiags::continue_cmd, fapiTrgt );
+ FAPI_INVOKE_HWP( errl, mss::memdiags::continue_cmd, fapiTrgt );
if ( nullptr != errl )
{
- PRDF_ERR( PRDF_FUNC "memdiags::continue_cmd(0x%08x) failed",
+ PRDF_ERR( PRDF_FUNC "mss::memdiags::continue_cmd(0x%08x) failed",
i_chip->getHuid() );
PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT );
o_rc = FAIL; break;
OpenPOWER on IntegriCloud