summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcrgeddes <crgeddes@us.ibm.com>2016-09-28 12:48:46 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2016-10-03 00:40:36 -0400
commit68f57b270c3c19d1accfcbb62e2464d1133e4ed9 (patch)
tree0035f251d27303f9a27fa6c890e3838b9ef737b2
parent81c81ab1c6c4ba5e0b8ca1ab42f9d8efc4e42659 (diff)
downloadtalos-hostboot-68f57b270c3c19d1accfcbb62e2464d1133e4ed9.tar.gz
talos-hostboot-68f57b270c3c19d1accfcbb62e2464d1133e4ed9.zip
Temporary fix to allow target discovery during MPIPL
Techically we should not be discovering targets all over again, we want the exact same thing that was given from the first IPL (IE ignore and deconfigs that happened between). In order to run MPIPL on a standalone model we need another mechanism to get the targeting data. That mechanism doesn't exist yet so we will just do another discovery for now. Change-Id: I8193534f74c4f3fc2dcc795b705b5184e702c60d RTC: 157651 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30425 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Martin Gloff <mgloff@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
-rw-r--r--src/usr/isteps/istep06/host_discover_targets.C13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/usr/isteps/istep06/host_discover_targets.C b/src/usr/isteps/istep06/host_discover_targets.C
index 10ae1fac7..1bab0216c 100644
--- a/src/usr/isteps/istep06/host_discover_targets.C
+++ b/src/usr/isteps/istep06/host_discover_targets.C
@@ -166,8 +166,17 @@ void* host_discover_targets( void *io_pArgs )
TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
"host_discover_targets: MPIPL mode");
- // Sync attributes from Fsp
- l_err = TARGETING::syncAllAttributesFromFsp();
+ if(INITSERVICE::spBaseServicesEnabled())
+ {
+ // Sync attributes from Fsp
+ l_err = TARGETING::syncAllAttributesFromFsp();
+ }
+ else
+ {
+ //TODO RTC:157651 we need this to be reading from the FSP
+ // For now just discover targets the normal way
+ l_err = HWAS::discoverTargets();
+ }
}
else
{
OpenPOWER on IntegriCloud