diff options
| author | Andre Marin <aamarin@us.ibm.com> | 2017-01-04 17:31:30 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-01-12 15:38:22 -0500 |
| commit | 04de5bff9299162049d141192cb395116a5c6437 (patch) | |
| tree | cd8b9955b393d0faf09147292ce7944893ca886c /src | |
| parent | 6d8dd3b17e703e5e6106f2ceea4f646fb9b152fc (diff) | |
| download | talos-hostboot-04de5bff9299162049d141192cb395116a5c6437.tar.gz talos-hostboot-04de5bff9299162049d141192cb395116a5c6437.zip | |
Remove static keyword from polling vectors due to thread error.
Change-Id: Ie3c72d8102e4d5b197757bd0672067e5fd3daf0f
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/34386
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Brian R. Silver <bsilver@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: JACOB L. HARVEY <jlharvey@us.ibm.com>
Dev-Ready: Brian R. Silver <bsilver@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/34407
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
5 files changed, 14 insertions, 12 deletions
diff --git a/src/import/chips/p9/procedures/hwp/memory/lab/sdk/example/C/mss_lab_sfwrite.C b/src/import/chips/p9/procedures/hwp/memory/lab/sdk/example/C/mss_lab_sfwrite.C index da8a157f4..b31883c39 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lab/sdk/example/C/mss_lab_sfwrite.C +++ b/src/import/chips/p9/procedures/hwp/memory/lab/sdk/example/C/mss_lab_sfwrite.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -113,7 +113,7 @@ int main(int i_argc, char* i_argv[]) fapi2::buffer<uint64_t> l_status; // A small vector of addresses to poll during the polling loop - static const std::vector<mss::poll_probe<fapi2::TARGET_TYPE_MCBIST>> l_probes = + const std::vector<mss::poll_probe<fapi2::TARGET_TYPE_MCBIST>> l_probes = { {fapi2_mcbist_target, "mcbist current address", MCBIST_MCBMCATQ}, }; diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.C b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.C index 7e55f42fd..fdd875467 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -357,7 +357,7 @@ fapi2::ReturnCode poll( const fapi2::Target<T>& i_target, const program<T>& i_pr static const uint64_t l_in_progress = fapi2::buffer<uint64_t>().setBit<TT::MCBIST_IN_PROGRESS>(); // A small vector of addresses to poll during the polling loop - static const std::vector<mss::poll_probe<fapi2::TARGET_TYPE_MCBIST>> l_probes = + const std::vector<mss::poll_probe<fapi2::TARGET_TYPE_MCBIST>> l_probes = { {i_target, "mcbist current address", MCBIST_MCBMCATQ}, }; diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/poll.H b/src/import/chips/p9/procedures/hwp/memory/lib/utils/poll.H index 016f7ea33..b57a03fa9 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/poll.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/utils/poll.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -154,8 +154,10 @@ struct poll_parameters /// as poll() does not return a fapi2::ReturnCode /// template< fapi2::TargetType T, typename L, fapi2::TargetType P = fapi2::TARGET_TYPE_MCA > -inline bool poll(const fapi2::Target<T>& i_target, const uint64_t i_addr, - const poll_parameters i_params, L i_fn, +inline bool poll(const fapi2::Target<T>& i_target, + const uint64_t i_addr, + const poll_parameters i_params, + L i_fn, const std::vector< poll_probe<P> >& i_probes = std::vector< poll_probe<P> >() ) { fapi2::buffer<uint64_t> l_reg; @@ -170,7 +172,7 @@ inline bool poll(const fapi2::Target<T>& i_target, const uint64_t i_addr, for ( size_t l_poll_limit = i_params.iv_poll_count; l_poll_limit > 0; --l_poll_limit ) { // Output anything in the probes - for (auto p : i_probes) + for (const auto& p : i_probes) { fapi2::buffer<uint64_t> l_data; FAPI_TRY( mss::getScom(p.iv_target, p.iv_register, l_data) ); diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C index f101d6d3f..8efc158b4 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -79,7 +79,7 @@ extern "C" fapi2::buffer<uint64_t> l_status; // A small vector of addresses to poll during the polling loop - static const std::vector<mss::poll_probe<fapi2::TARGET_TYPE_MCBIST>> l_probes = + const std::vector<mss::poll_probe<fapi2::TARGET_TYPE_MCBIST>> l_probes = { {i_target, "mcbist current address", MCBIST_MCBMCATQ}, }; diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C index d52a2cb76..793a7999b 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -72,7 +72,7 @@ fapi2::ReturnCode p9_mss_scrub( const fapi2::Target<TARGET_TYPE_MCBIST>& i_targe fapi2::buffer<uint64_t> l_status; // A small vector of addresses to poll during the polling loop - static const std::vector<mss::poll_probe<fapi2::TARGET_TYPE_MCBIST>> l_probes = + const std::vector<mss::poll_probe<fapi2::TARGET_TYPE_MCBIST>> l_probes = { {i_target, "mcbist current address", MCBIST_MCBMCATQ}, }; |
