summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Geddes <crgeddes@us.ibm.com>2019-04-09 13:26:16 -0500
committerChristian R. Geddes <crgeddes@us.ibm.com>2019-04-15 12:11:26 -0500
commit4aa1ee7a5835745aa9a14da0e802fd2d4d6df138 (patch)
tree5ab43667f739c9b7081312fb3f8444bc556ff800
parent2b26420e72477835ffeacb2dab9970266ef07566 (diff)
downloadtalos-hostboot-4aa1ee7a5835745aa9a14da0e802fd2d4d6df138.tar.gz
talos-hostboot-4aa1ee7a5835745aa9a14da0e802fd2d4d6df138.zip
Fix compile bugs in axone_sync
There are a few #ifdef paths in this code that do not get tested in the EKB side. During testing on HB side we saw compile fails so this commit addresses those issues. Change-Id: Ied4fb8a6bd8b2c1bca6dab3e561c58c5cee1c4a0 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75777 Reviewed-by: Louis Stermole <stermole@us.ibm.com> Reviewed-by: ANDRE A. MARIN <aamarin@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com> Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com> Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75801 Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
-rw-r--r--src/import/chips/p9a/procedures/hwp/memory/lib/freq/axone_sync.C8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/import/chips/p9a/procedures/hwp/memory/lib/freq/axone_sync.C b/src/import/chips/p9a/procedures/hwp/memory/lib/freq/axone_sync.C
index 311e12cf7..8fd3c679b 100644
--- a/src/import/chips/p9a/procedures/hwp/memory/lib/freq/axone_sync.C
+++ b/src/import/chips/p9a/procedures/hwp/memory/lib/freq/axone_sync.C
@@ -227,16 +227,16 @@ fapi2::ReturnCode select_sync_mode(const std::map< fapi2::Target<fapi2::TARGET_T
// case we just bomb out.)
#ifdef __HOSTBOOT_MODULE
uint64_t l_max_dimm_speed = 0;
- fapi2::Target<TARGET_TYPE_MEM_PORT> l_fastest_port_target = i_freq_map.begin()->first;
+ fapi2::Target<fapi2::TARGET_TYPE_MEM_PORT> l_fastest_port_target = i_freq_map.begin()->first;
std::for_each(i_freq_map.begin(), i_freq_map.end(),
- [&l_max_dimm_speed](const std::pair<fapi2::Target<TARGET_TYPE_MEM_PORT>, uint64_t>& m)
+ [&l_max_dimm_speed, &l_fastest_port_target](const std::pair<fapi2::Target<fapi2::TARGET_TYPE_MEM_PORT>, uint64_t>& m)
{
l_max_dimm_speed = std::max(l_max_dimm_speed, m.second);
l_fastest_port_target = m.first;
});
std::for_each(i_freq_map.begin(), i_freq_map.end(),
- [&l_max_dimm_speed](const std::pair<fapi2::Target<TARGET_TYPE_MEM_PORT>, uint64_t>& m)
+ [&l_max_dimm_speed](const std::pair<fapi2::Target<fapi2::TARGET_TYPE_MEM_PORT>, uint64_t>& m)
{
deconfigure(m.first, m.second, l_max_dimm_speed);
});
@@ -265,10 +265,8 @@ fapi2::ReturnCode select_sync_mode(const std::map< fapi2::Target<fapi2::TARGET_T
return fapi2::FAPI2_RC_SUCCESS;
-#ifndef __HOSTBOOT_MODULE
fapi_try_exit:
return fapi2::current_err;
-#endif
}
}// mss
OpenPOWER on IntegriCloud