summaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
authorDzuy Nguyen <dzuy@us.ibm.com>2017-07-26 09:13:19 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2017-08-08 15:15:18 -0400
commitb8f38769717f64f99bc3cbfae43d94d83c9223ee (patch)
treef3465f74ae46959c7de49de8762110beee7e78ae /src/usr
parent75333b1d93a30e2337fb5580357ff32733d28db3 (diff)
downloadtalos-hostboot-b8f38769717f64f99bc3cbfae43d94d83c9223ee.tar.gz
talos-hostboot-b8f38769717f64f99bc3cbfae43d94d83c9223ee.zip
Uncomment FAPI_INVOKE_HWP p9_io_[xo]bus_image_build when HWP bug is resolved
Change-Id: I0203676be7396a0ba83f5642abe0c68f074c9c14 RTC: 176314 CMVC-Prereq: 1030705 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43633 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Martin Gloff <mgloff@us.ibm.com> Reviewed-by: Matt Derksen <mderkse1@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr')
-rw-r--r--src/usr/isteps/istep16/call_host_load_io_ppe.C38
1 files changed, 14 insertions, 24 deletions
diff --git a/src/usr/isteps/istep16/call_host_load_io_ppe.C b/src/usr/isteps/istep16/call_host_load_io_ppe.C
index 3d193bf74..2f0b59f15 100644
--- a/src/usr/isteps/istep16/call_host_load_io_ppe.C
+++ b/src/usr/isteps/istep16/call_host_load_io_ppe.C
@@ -124,29 +124,25 @@ void* call_host_load_io_ppe (void *io_pArgs)
// Get all OBUS targets
TARGETING::TargetHandleList l_obusTargetList;
getAllChiplets(l_obusTargetList, TYPE_OBUS);
- // Get all XBUS targets
- TARGETING::TargetHandleList l_xbusTargetList;
- getAllChiplets(l_xbusTargetList, TYPE_XBUS);
+ // Get all PROC targets for XBUS
+ TARGETING::TargetHandleList l_procTargetList;
+ getAllChips(l_procTargetList, TYPE_PROC);
// Loop through OBUS
for (const auto & l_obusTarget: l_obusTargetList)
{
-
const fapi2::Target<fapi2::TARGET_TYPE_OBUS>
l_obusFapi2Target(
(const_cast<TARGETING::Target*>(l_obusTarget)));
-
TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
"Running p9_io_obus_image_build HWP on "
"OBUS target %.8X",
TARGETING::get_huid(l_obusTarget));
-// TODO RTC 176314
-#if 0
FAPI_INVOKE_HWP( l_err,
p9_io_obus_image_build,
- l_obusTarget,
+ l_obusFapi2Target,
reinterpret_cast<void*>(l_pHcodeImage));
if(l_err)
@@ -161,28 +157,23 @@ void* call_host_load_io_ppe (void *io_pArgs)
l_stepError.addErrorDetails(l_err);
errlCommit(l_err, HWPF_COMP_ID);
}
-#endif
- }
+ } // end of looping through obus
- // Loop through XBUS
- for (const auto & l_xbusTarget: l_xbusTargetList)
+ // Loop through PROC (for XBUS)
+ for (const auto & l_procTarget: l_procTargetList)
{
-
- const fapi2::Target<fapi2::TARGET_TYPE_XBUS>
- l_xbusFapi2Target(
- (const_cast<TARGETING::Target*>(l_xbusTarget)));
-
+ const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>
+ l_procFapi2Target(
+ (const_cast<TARGETING::Target*>(l_procTarget)));
TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
"Running p9_io_xbus_image_build HWP on "
"XBUS target %.8X",
- TARGETING::get_huid(l_xbusTarget));
+ TARGETING::get_huid(l_procTarget));
-// TODO RTC 176314
-#if 0
FAPI_INVOKE_HWP( l_err,
p9_io_xbus_image_build,
- l_xbusTarget,
+ l_procFapi2Target,
reinterpret_cast<void*>(l_pHcodeImage));
if(l_err)
@@ -191,14 +182,13 @@ void* call_host_load_io_ppe (void *io_pArgs)
"ERROR 0x%.8X: returned from p9_io_xbus_image_build on "
"XBUS target %.8X, PLID=0x%x",
l_err->reasonCode(),
- TARGETING::get_huid(l_xbusTarget),
+ TARGETING::get_huid(l_procTarget),
l_err->plid());
l_stepError.addErrorDetails(l_err);
errlCommit(l_err, HWPF_COMP_ID);
}
-#endif
- } // end of looping through Obus pairs
+ } // end of looping through xbus
} while( 0 );
#ifdef CONFIG_SECUREBOOT
OpenPOWER on IntegriCloud