summaryrefslogtreecommitdiffstats
path: root/src/usr/isteps
diff options
context:
space:
mode:
authorChristian Geddes <crgeddes@us.ibm.com>2019-10-29 10:48:26 -0500
committerDaniel M Crowell <dcrowell@us.ibm.com>2019-10-31 11:39:37 -0500
commit9c4be0da9b51bbaa8e71cf20acc68368a39b5c75 (patch)
treed9310905558cf2be34368fba2f816976c4e25542 /src/usr/isteps
parent8ea9d8d3d83c8f2ac2567fd63465f85c2d981fda (diff)
downloadtalos-hostboot-9c4be0da9b51bbaa8e71cf20acc68368a39b5c75.tar.gz
talos-hostboot-9c4be0da9b51bbaa8e71cf20acc68368a39b5c75.zip
Only call memdiags on Explorer ocmb chips
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>
Diffstat (limited to 'src/usr/isteps')
-rw-r--r--src/usr/isteps/istep14/call_mss_memdiag.C24
1 files changed, 15 insertions, 9 deletions
diff --git a/src/usr/isteps/istep14/call_mss_memdiag.C b/src/usr/isteps/istep14/call_mss_memdiag.C
index 6ad840e68..4c4c6b5b2 100644
--- a/src/usr/isteps/istep14/call_mss_memdiag.C
+++ b/src/usr/isteps/istep14/call_mss_memdiag.C
@@ -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;
@@ -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
OpenPOWER on IntegriCloud