diff options
| author | Caleb Palmer <cnpalmer@us.ibm.com> | 2016-07-05 09:21:04 -0500 |
|---|---|---|
| committer | Stephen Cprek <smcprek@us.ibm.com> | 2016-07-18 15:32:36 -0500 |
| commit | 99bd8d04615d1a633a9adaaf64a58787ad753527 (patch) | |
| tree | 79ab68e3a9205d61b59b403f7b37ea3f0591f474 /src/usr/isteps/istep14 | |
| parent | 9384efdc6ccd1ee809177193ad232d918e6a7664 (diff) | |
| download | talos-hostboot-99bd8d04615d1a633a9adaaf64a58787ad753527.tar.gz talos-hostboot-99bd8d04615d1a633a9adaaf64a58787ad753527.zip | |
MDIA: Fix getMdiaTargetType bug
Change-Id: Ie5002720315b7166063086adaaee034310f0f3b8
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/26635
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/isteps/istep14')
| -rw-r--r-- | src/usr/isteps/istep14/call_mss_memdiag.C | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/usr/isteps/istep14/call_mss_memdiag.C b/src/usr/isteps/istep14/call_mss_memdiag.C index 0832705a7..2deb07102 100644 --- a/src/usr/isteps/istep14/call_mss_memdiag.C +++ b/src/usr/isteps/istep14/call_mss_memdiag.C @@ -29,7 +29,7 @@ #include <targeting/common/utilFilter.H> #include <diag/attn/attn.H> #include <diag/mdia/mdia.H> -#include <targeting/namedtarget.H> +#include <targeting/common/targetservice.H> using namespace ISTEP; using namespace ISTEP_ERROR; @@ -46,11 +46,12 @@ void* call_mss_memdiag (void* io_pArgs) TRACDCOMP(ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_memdiag entry"); + TARGETING::Target* masterproc = nullptr; + TARGETING::targetService().masterProcChipTargetHandle(masterproc); + #ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS // @TODO-RTC: 155065 // update firdata inputs for OCC - TARGETING::Target* masterproc = NULL; - TARGETING::targetService().masterProcChipTargetHandle(masterproc); l_errl = HBOCC::loadHostDataToSRAM(masterproc, PRDF::ALL_PROC_MEM_MASTER_CORE); assert(l_errl==NULL, @@ -60,13 +61,11 @@ void* call_mss_memdiag (void* io_pArgs) TARGETING::TargetHandleList l_targetList; TARGETING::TYPE targetType; - // we need to check the model of the master core + // we need to check the model of the master proc // if it is Cumulus then we will use TYPE_MBA for targetType // else it is Nimbus so then we will use TYPE_MCBIST for targetType - const TARGETING::Target* masterCore = TARGETING::getMasterCore(); - if ( TARGETING::MODEL_CUMULUS == - masterCore->getAttr<TARGETING::ATTR_MODEL>() ) + masterproc->getAttr<TARGETING::ATTR_MODEL>() ) { targetType = TARGETING::TYPE_MBA; } |
