diff options
author | crgeddes <crgeddes@us.ibm.com> | 2015-12-10 15:55:51 -0600 |
---|---|---|
committer | WILLIAM G. HOFFA <wghoffa@us.ibm.com> | 2016-02-26 08:49:33 -0600 |
commit | 581462957e6df9ea663914fabf65f9f77b4e4bfa (patch) | |
tree | 26602a2bccd1a3bfdc95d8c935ae74cecd155aed /src/usr/isteps | |
parent | a9e3b39d8520ff5c0356e85d4ce27ebf8f9a5fef (diff) | |
download | talos-hostboot-581462957e6df9ea663914fabf65f9f77b4e4bfa.tar.gz talos-hostboot-581462957e6df9ea663914fabf65f9f77b4e4bfa.zip |
Basic Hostboot platform support for FAPI2
Allows clean compile and link of FAPI2 procedures and a subset of the
platform functional support
RTC:123290
Change-Id: I9faa3bea86d1b43bca0a7eaca3869b45cc0b0d54
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/23046
Tested-by: Jenkins Server
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: WILLIAM G. HOFFA <wghoffa@us.ibm.com>
Diffstat (limited to 'src/usr/isteps')
-rw-r--r-- | src/usr/isteps/istep07/call_mss_freq.C | 3 | ||||
-rw-r--r-- | src/usr/isteps/istep07/call_mss_volt.C | 142 | ||||
-rw-r--r-- | src/usr/isteps/istep21/call_host_start_payload.C | 3 |
3 files changed, 74 insertions, 74 deletions
diff --git a/src/usr/isteps/istep07/call_mss_freq.C b/src/usr/isteps/istep07/call_mss_freq.C index 2ba73a9f7..20df3f06b 100644 --- a/src/usr/isteps/istep07/call_mss_freq.C +++ b/src/usr/isteps/istep07/call_mss_freq.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015 */ +/* Contributors Listed Below - COPYRIGHT 2015,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -54,7 +54,6 @@ using namespace ISTEP; using namespace ISTEP_ERROR; using namespace ERRORLOG; using namespace TARGETING; -using namespace fapi; // // Wrapper function to call mss_freq diff --git a/src/usr/isteps/istep07/call_mss_volt.C b/src/usr/isteps/istep07/call_mss_volt.C index c6ef47aa8..33671fec5 100644 --- a/src/usr/isteps/istep07/call_mss_volt.C +++ b/src/usr/isteps/istep07/call_mss_volt.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015 */ +/* Contributors Listed Below - COPYRIGHT 2015,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -59,75 +59,77 @@ using namespace ISTEP_ERROR; using namespace ERRORLOG; using namespace TARGETING; -// helper function to call multiple mss_volt_hwps -void call_mss_volt_hwp (std::vector<TARGETING::ATTR_VMEM_ID_type>& i_VmemList, - TARGETING::TargetHandleList& i_membufTargetList, - IStepError& io_StepError, - fapi::ReturnCode(*mss_volt_hwp)(std::vector<fapi::Target>&)) -{ - /* @TODO: RTC:133830 Add wrapper back when ready - errlHndl_t l_err; - //for each unique VmemId filter it out of the list of membuf targets - //to create a subsetlist of membufs with just that vmemid - std::vector<TARGETING::ATTR_VMEM_ID_type>::iterator l_vmem_iter; - for (l_vmem_iter = i_VmemList.begin(); - l_vmem_iter != i_VmemList.end(); - ++l_vmem_iter) - { - // declare a vector of fapi targets to pass to mss_volt procedures - std::vector<fapi::Target> l_membufFapiTargets; - - for (TargetHandleList::const_iterator - l_membuf_iter = i_membufTargetList.begin(); - l_membuf_iter != i_membufTargetList.end(); - ++l_membuf_iter) - { - // make a local copy of the target for ease of use - const TARGETING::Target* l_membuf_target = *l_membuf_iter; - if (l_membuf_target->getAttr<ATTR_VMEM_ID>()==*l_vmem_iter) - { - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "===== add to fapi::Target vector vmem_id=0x%08X " - "target HUID %.8X", - l_membuf_target->getAttr<ATTR_VMEM_ID>(), - TARGETING::get_huid(l_membuf_target)); - - fapi::Target l_membuf_fapi_target(fapi::TARGET_TYPE_MEMBUF_CHIP, - (const_cast<TARGETING::Target*>(l_membuf_target)) ); - - l_membufFapiTargets.push_back( l_membuf_fapi_target ); - } - } - - //now have the a list of fapi membufs with just the one VmemId - //call the HWP on the list of fapi targets - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "===== mss_volt HWP( vector )" ); - - FAPI_INVOKE_HWP(l_err, mss_volt_hwp, l_membufFapiTargets); - - // process return code. - if ( l_err ) - { - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "ERROR 0x%.8X: mss_volt HWP( ) ", - l_err->reasonCode()); - - // Create IStep error log and cross reference to error that occurred - io_StepError.addErrorDetails( l_err ); - - // Commit Error - errlCommit( l_err, HWPF_COMP_ID ); - - } - else - { - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "SUCCESS : mss_volt_dimm_count HWP( )" ); - } - } - */ -} +// // helper function to call multiple mss_volt_hwps +// void call_mss_volt_hwp ( +// std::vector<TARGETING::ATTR_VMEM_ID_type>& i_VmemList, +// TARGETING::TargetHandleList& i_membufTargetList, +// IStepError& io_StepError, +// fapi2::ReturnCode(*mss_volt_hwp)( +// std::vector<fapi::Target>&)) +// { +// /* @TODO: RTC:133830 Add wrapper back when ready +// errlHndl_t l_err; +// //for each unique VmemId filter it out of the list of membuf targets +// //to create a subsetlist of membufs with just that vmemid +// std::vector<TARGETING::ATTR_VMEM_ID_type>::iterator l_vmem_iter; +// for (l_vmem_iter = i_VmemList.begin(); +// l_vmem_iter != i_VmemList.end(); +// ++l_vmem_iter) +// { +// // declare a vector of fapi targets to pass to mss_volt procedures +// std::vector<fapi::Target> l_membufFapiTargets; +// +// for (TargetHandleList::const_iterator +// l_membuf_iter = i_membufTargetList.begin(); +// l_membuf_iter != i_membufTargetList.end(); +// ++l_membuf_iter) +// { +// // make a local copy of the target for ease of use +// const TARGETING::Target* l_membuf_target = *l_membuf_iter; +// if (l_membuf_target->getAttr<ATTR_VMEM_ID>()==*l_vmem_iter) +// { +// TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, +// "===== add to fapi::Target vector vmem_id=0x%08X " +// "target HUID %.8X", +// l_membuf_target->getAttr<ATTR_VMEM_ID>(), +// TARGETING::get_huid(l_membuf_target)); +// +// fapi::Target l_membuf_fapi_target(fapi::TARGET_TYPE_MEMBUF_CHIP, +// (const_cast<TARGETING::Target*>(l_membuf_target)) ); +// +// l_membufFapiTargets.push_back( l_membuf_fapi_target ); +// } +// } +// +// //now have the a list of fapi membufs with just the one VmemId +// //call the HWP on the list of fapi targets +// TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, +// "===== mss_volt HWP( vector )" ); +// +// FAPI_INVOKE_HWP(l_err, mss_volt_hwp, l_membufFapiTargets); +// +// // process return code. +// if ( l_err ) +// { +// TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, +// "ERROR 0x%.8X: mss_volt HWP( ) ", +// l_err->reasonCode()); +// +// // Create IStep error log and cross reference to error that occurred +// io_StepError.addErrorDetails( l_err ); +// +// // Commit Error +// errlCommit( l_err, HWPF_COMP_ID ); +// +// } +// else +// { +// TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, +// "SUCCESS : mss_volt_dimm_count HWP( )" ); +// } +// } +// */ +// } // // Wrapper function to call mss_volt diff --git a/src/usr/isteps/istep21/call_host_start_payload.C b/src/usr/isteps/istep21/call_host_start_payload.C index 47c03879b..f3760ede6 100644 --- a/src/usr/isteps/istep21/call_host_start_payload.C +++ b/src/usr/isteps/istep21/call_host_start_payload.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015 */ +/* Contributors Listed Below - COPYRIGHT 2015,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -56,7 +56,6 @@ using namespace ERRORLOG; using namespace ISTEP; using namespace ISTEP_ERROR; using namespace TARGETING; -using namespace fapi; namespace ISTEP_21 { |