diff options
author | Stephen Glancy <sglancy@us.ibm.com> | 2019-04-01 13:56:39 -0400 |
---|---|---|
committer | Christian R. Geddes <crgeddes@us.ibm.com> | 2019-04-22 11:22:39 -0500 |
commit | ac6b97d1a4ffbd006f15e79e2b85d8089c05238b (patch) | |
tree | f2c1d21cb29a431a89a9c31eedec0600c336e684 | |
parent | 3c3ab2bd4c3cbee67eb518bcce214234d8f071f3 (diff) | |
download | talos-hostboot-ac6b97d1a4ffbd006f15e79e2b85d8089c05238b.tar.gz talos-hostboot-ac6b97d1a4ffbd006f15e79e2b85d8089c05238b.zip |
Adds git commit data to p9a/exp procedures
Change-Id: I1df5fcb9661b3aca592c742efb13b82e5f519624
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75330
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: ANDRE A. MARIN <aamarin@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75347
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: Christian R. Geddes <crgeddes@us.ibm.com>
13 files changed, 78 insertions, 7 deletions
diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_check_for_ready.C b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_check_for_ready.C index 6a7b0d894..54c67f1b3 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_check_for_ready.C +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_check_for_ready.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2018 */ +/* Contributors Listed Below - COPYRIGHT 2018,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -38,6 +38,7 @@ #include <exp_check_for_ready.H> #include <lib/i2c/exp_i2c.H> #include <generic/memory/lib/utils/poll.H> +#include <generic/memory/mss_git_data_helper.H> extern "C" { @@ -48,6 +49,8 @@ extern "C" /// fapi2::ReturnCode exp_check_for_ready(const fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP>& i_target) { + mss::display_git_commit_info("exp_check_for_ready"); + // Using default parameters mss::poll_parameters l_poll_params; diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_draminit.C b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_draminit.C index 78d941db2..1a7abba82 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_draminit.C +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_draminit.C @@ -40,6 +40,8 @@ #include <lib/exp_draminit_utils.H> #include <lib/phy/exp_train_display.H> #include <lib/phy/exp_train_handler.H> +#include <lib/shared/exp_consts.H> +#include <generic/memory/mss_git_data_helper.H> extern "C" { @@ -50,6 +52,8 @@ extern "C" /// fapi2::ReturnCode exp_draminit(const fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP>& i_target) { + mss::display_git_commit_info("exp_draminit"); + uint32_t l_crc = 0; user_input_msdg l_phy_params; diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_draminit_mc.C b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_draminit_mc.C index be2d4e36f..24ecaee7e 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_draminit_mc.C +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_draminit_mc.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2018 */ +/* Contributors Listed Below - COPYRIGHT 2018,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -40,6 +40,7 @@ #include <generic/memory/lib/utils/count_dimm.H> #include <lib/mc/exp_port.H> +#include <generic/memory/mss_git_data_helper.H> extern "C" { @@ -50,6 +51,8 @@ extern "C" /// fapi2::ReturnCode exp_draminit_mc( const fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP>& i_target ) { + mss::display_git_commit_info("exp_draminit_mc"); + FAPI_INF("%s Start exp_draminit MC", mss::c_str(i_target)); diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_omi_init.C b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_omi_init.C index 27b9f403a..241f7e9a2 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_omi_init.C +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_omi_init.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2018 */ +/* Contributors Listed Below - COPYRIGHT 2018,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -38,6 +38,7 @@ #include <chips/common/utils/chipids.H> #include <mss_explorer_attribute_getters.H> #include <mss_p9a_attribute_getters.H> +#include <generic/memory/mss_git_data_helper.H> /// /// @brief Verify we know how to talk to the connected device @@ -602,6 +603,8 @@ fapi_try_exit: /// fapi2::ReturnCode exp_omi_init(const fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP>& i_target) { + mss::display_git_commit_info("exp_omi_init"); + FAPI_DBG("Start"); FAPI_TRY(omiDeviceVerify(i_target)); FAPI_TRY(omiSetUpstreamTemplates(i_target)); diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_omi_setup.C b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_omi_setup.C index e17271c93..0dde08b88 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_omi_setup.C +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_omi_setup.C @@ -37,6 +37,7 @@ #include <generic/memory/lib/utils/c_str.H> #include <lib/exp_attribute_accessors_manual.H> #include <lib/omi/exp_omi_utils.H> +#include <generic/memory/mss_git_data_helper.H> extern "C" { @@ -48,6 +49,8 @@ extern "C" /// fapi2::ReturnCode exp_omi_setup( const fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP>& i_target) { + mss::display_git_commit_info("exp_omi_setup"); + // Declares variables fapi2::buffer<uint64_t> l_data; bool l_is_enterprise = false; diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_omi_train.C b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_omi_train.C index 2865af091..3e5e81236 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_omi_train.C +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_omi_train.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2018 */ +/* Contributors Listed Below - COPYRIGHT 2018,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -38,6 +38,7 @@ #include <lib/omi/exp_omi_utils.H> #include <lib/i2c/exp_i2c.H> #include <exp_omi_train.H> +#include <generic/memory/mss_git_data_helper.H> extern "C" { @@ -49,6 +50,8 @@ extern "C" /// fapi2::ReturnCode exp_omi_train(const fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP>& i_target) { + mss::display_git_commit_info("exp_omi_train"); + std::vector<uint8_t> l_data; // Gets the data setup diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_scominit.C b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_scominit.C index 3c6767a94..e3e01d788 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_scominit.C +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_scominit.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2018 */ +/* Contributors Listed Below - COPYRIGHT 2018,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -38,6 +38,7 @@ #include <generic/memory/lib/utils/count_dimm.H> #include <generic/memory/lib/utils/find.H> #include <explorer_scom.H> +#include <generic/memory/mss_git_data_helper.H> extern "C" { @@ -49,6 +50,8 @@ extern "C" /// fapi2::ReturnCode exp_scominit( const fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP>& i_target) { + mss::display_git_commit_info("exp_scominit"); + if (mss::count_dimm(i_target) == 0) { FAPI_INF("... skipping mss_scominit %s - no DIMM ...", mss::c_str(i_target)); diff --git a/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_eff_config.C b/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_eff_config.C index 75d23c6af..49c7c4e56 100644 --- a/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_eff_config.C +++ b/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_eff_config.C @@ -44,6 +44,7 @@ #include <lib/eff_config/explorer_attr_engine_traits.H> #include <lib/freq/axone_freq_traits.H> #include <lib/freq/axone_sync.H> +#include <generic/memory/mss_git_data_helper.H> /// /// @brief Configure the attributes for each controller @@ -52,6 +53,8 @@ /// fapi2::ReturnCode p9a_mss_eff_config( const fapi2::Target<fapi2::TARGET_TYPE_MEM_PORT>& i_target ) { + mss::display_git_commit_info("p9a_mss_eff_config"); + // Workaround until DIMM level attrs work uint8_t l_ranks[mss::exp::MAX_DIMM_PER_PORT] = {}; diff --git a/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_freq.C b/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_freq.C index 342523d5a..6646ba5c4 100644 --- a/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_freq.C +++ b/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_freq.C @@ -47,6 +47,7 @@ #include <generic/memory/lib/spd/spd_facade.H> #include <generic/memory/lib/utils/count_dimm.H> #include <generic/memory/lib/utils/freq/gen_mss_freq.H> +#include <generic/memory/mss_git_data_helper.H> /// /// @brief Calculate and save off DIMM frequencies @@ -55,6 +56,8 @@ /// fapi2::ReturnCode p9a_mss_freq( const fapi2::Target<fapi2::TARGET_TYPE_MEM_PORT>& i_target ) { + mss::display_git_commit_info("p9a_mss_freq"); + // If there are no DIMM, we can just get out. if (mss::count_dimm(i_target) == 0) { diff --git a/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_volt.C b/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_volt.C index a7b1d4b38..090f8f455 100644 --- a/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_volt.C +++ b/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_volt.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2018 */ +/* Contributors Listed Below - COPYRIGHT 2018,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -44,6 +44,7 @@ // mss lib #include <generic/memory/lib/utils/c_str.H> #include <generic/memory/lib/utils/voltage/gen_mss_volt.H> +#include <generic/memory/mss_git_data_helper.H> /// /// @brief Calculate and save off rail voltages @@ -52,6 +53,8 @@ /// fapi2::ReturnCode p9a_mss_volt( const std::vector< fapi2::Target<fapi2::TARGET_TYPE_MEM_PORT> >& i_targets ) { + mss::display_git_commit_info("p9a_mss_volt"); + for (const auto& l_port : i_targets) { FAPI_TRY( (mss::setup_voltage_rail_values<mss::mc_type::EXPLORER, mss::spd::device_type::DDR4>(l_port)), diff --git a/src/import/chips/p9a/procedures/hwp/memory/p9a_omi_train.C b/src/import/chips/p9a/procedures/hwp/memory/p9a_omi_train.C index 70202d95f..f26f85a87 100644 --- a/src/import/chips/p9a/procedures/hwp/memory/p9a_omi_train.C +++ b/src/import/chips/p9a/procedures/hwp/memory/p9a_omi_train.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2018 */ +/* Contributors Listed Below - COPYRIGHT 2018,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -47,6 +47,7 @@ #include <generic/memory/lib/utils/find.H> #include <generic/memory/lib/utils/shared/mss_generic_consts.H> #include <lib/mc/omi.H> +#include <generic/memory/mss_git_data_helper.H> /// @@ -56,6 +57,8 @@ /// fapi2::ReturnCode p9a_omi_train( const fapi2::Target<fapi2::TARGET_TYPE_OMI>& i_target) { + mss::display_git_commit_info("p9a_omi_train"); + FAPI_INF("%s Start p9a_omi_train", mss::c_str(i_target)); const auto l_mc = mss::find_target<fapi2::TARGET_TYPE_MC>(i_target); diff --git a/src/import/chips/p9a/procedures/hwp/memory/p9a_omi_train_check.C b/src/import/chips/p9a/procedures/hwp/memory/p9a_omi_train_check.C index 50119a44d..8a010bded 100644 --- a/src/import/chips/p9a/procedures/hwp/memory/p9a_omi_train_check.C +++ b/src/import/chips/p9a/procedures/hwp/memory/p9a_omi_train_check.C @@ -44,6 +44,7 @@ #include <generic/memory/lib/utils/buffer_ops.H> #include <generic/memory/lib/utils/shared/mss_generic_consts.H> #include <lib/mc/omi.H> +#include <generic/memory/mss_git_data_helper.H> /// /// @brief Check the omi status in Axone side @@ -52,6 +53,8 @@ /// fapi2::ReturnCode p9a_omi_train_check( const fapi2::Target<fapi2::TARGET_TYPE_OMI>& i_target) { + mss::display_git_commit_info("p9a_omi_train_check"); + FAPI_INF("%s Start p9a_omi_train_check", mss::c_str(i_target)); // Const diff --git a/src/import/generic/memory/mss_git_data_helper.H b/src/import/generic/memory/mss_git_data_helper.H index c20a62ab0..ef09834fa 100644 --- a/src/import/generic/memory/mss_git_data_helper.H +++ b/src/import/generic/memory/mss_git_data_helper.H @@ -22,3 +22,37 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ +/// +/// @file mss_git_data_helper.H +/// @brief Helper file to print out the git data +/// +// *HWP HWP Owner: Andre Marin <aamarin@us.ibm.com> +// *HWP HWP Backup: Stephen Glancy <sglancy@us.ibm.com> +// *HWP Team: Memory +// *HWP Level: 3 +// *HWP Consumed by: HB:FSP + +#ifndef _MSS_GIT_DATA_HELPER_ +#define _MSS_GIT_DATA_HELPER_ + +#ifndef __HOSTBOOT_MODULE + #include <generic/memory/mss_git_data.H> +#endif + +namespace mss +{ + +/// +/// @brief Prints out the git commit data +/// @pram[in] i_print additional print information to be added to the print statement +/// +inline void display_git_commit_info(const char* i_print) +{ +#ifndef __HOSTBOOT_MODULE + FAPI_INF("%s Git commit ID: %s", i_print, GIT_COMMIT_ID.c_str()); +#endif +} + +} // ns mss + +#endif |