Skip to content

Commit

Permalink
Only call memdiags on Explorer ocmb chips
Browse files Browse the repository at this point in the history
We should only call memdiags on the Explorer ocmb chips because
it will fail if we attempt to call it on the Gemini chips. Gemini
chips will boot fine without this step being called.

Change-Id: I50645db29b17d4dc93de9c1e5f7b419e5dea6f0d
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/86159
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Glenn Miles <milesg@ibm.com>
Reviewed-by: Ilya Smirnov <ismirno@us.ibm.com>
Reviewed-by: Nicholas E Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Roland Veloz <rveloz@us.ibm.com>
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
  • Loading branch information
crgeddes authored and dcrowell77 committed Oct 31, 2019
1 parent 8ea9d8d commit 9c4be0d
Showing 1 changed file with 15 additions and 9 deletions.
24 changes: 15 additions & 9 deletions src/usr/isteps/istep14/call_mss_memdiag.C
Expand Up @@ -45,6 +45,7 @@
// use PRD's version of memdiags instead of this cronus verison once its working
#ifdef CONFIG_AXONE
#include <exp_mss_memdiag.H>
#include <chipids.H> // for EXPLORER ID
#endif

using namespace ISTEP;
Expand Down Expand Up @@ -178,19 +179,24 @@ void* call_mss_memdiag (void* io_pArgs)
TargetHandleList trgtList; getAllChips( trgtList, TYPE_OCMB_CHIP );
for (const auto & l_ocmb_target : trgtList)
{
fapi2::Target <fapi2::TARGET_TYPE_OCMB_CHIP> l_fapi_ocmb_target(l_ocmb_target);
// Start Memory Diagnostics.
FAPI_INVOKE_HWP( errl, exp_mss_memdiag, l_fapi_ocmb_target );
if ( nullptr != errl )
uint32_t chipId = l_ocmb_target->getAttr< TARGETING::ATTR_CHIP_ID>();
// Only call memdiags on Explorer cards, it breaks when you run on Gemini
if (chipId == POWER_CHIPID::EXPLORER_16)
{
TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
"exp_mss_memdiag (0x%08x) "
"failed", get_huid(l_ocmb_target) );
break;
fapi2::Target <fapi2::TARGET_TYPE_OCMB_CHIP> l_fapi_ocmb_target(l_ocmb_target);
// Start Memory Diagnostics.
FAPI_INVOKE_HWP( errl, exp_mss_memdiag, l_fapi_ocmb_target );
if ( nullptr != errl )
{
TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
"exp_mss_memdiag (0x%08x) "
"failed", get_huid(l_ocmb_target) );
break;
}
}
}

}

}
#endif

Expand Down

0 comments on commit 9c4be0d

Please sign in to comment.