diff options
author | Mark Pizzutillo <Mark.Pizzutillo@ibm.com> | 2019-07-15 15:48:20 -0500 |
---|---|---|
committer | Daniel M Crowell <dcrowell@us.ibm.com> | 2019-07-19 09:12:33 -0500 |
commit | 3a513ca00ae74a46de34d5e95abbd43adbc7a32e (patch) | |
tree | 25450e359341099e9ead5f93432f2757cf2e3f0b /src/import/chips/ocmb | |
parent | a911c8a49df0a750838050aa139918c9b786ee03 (diff) | |
download | talos-hostboot-3a513ca00ae74a46de34d5e95abbd43adbc7a32e.tar.gz talos-hostboot-3a513ca00ae74a46de34d5e95abbd43adbc7a32e.zip |
Split omi setup & train for new DL_TRAIN cmd
JIRA EDBC-473
Change-Id: I2a80981143b7d64fedf4be195e6bb093078f855b
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/80388
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Dev-Ready: Mark Pizzutillo <mark.pizzutillo@ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: ANDRE A. MARIN <aamarin@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Jennifer A Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/80537
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/import/chips/ocmb')
3 files changed, 19 insertions, 2 deletions
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 2dbacb2ae..94247b21b 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 <lib/i2c/exp_i2c.H> #include <generic/memory/mss_git_data_helper.H> #include <generic/memory/lib/mss_generic_attribute_getters.H> @@ -58,6 +59,18 @@ extern "C" uint8_t l_edpl_disable = 0; bool l_is_enterprise = false; bool l_is_half_dimm = false; + std::vector<uint8_t> l_boot_config_data; + uint8_t l_dl_layer_boot_mode = fapi2::ENUM_ATTR_MSS_OCMB_EXP_BOOT_CONFIG_DL_LAYER_BOOT_MODE_NON_DL_TRAINING; + + // Gets the data setup + FAPI_TRY(mss::exp::omi::train::setup_fw_boot_config(i_target, l_boot_config_data)); + + // Sanity check: set dl_layer_boot_mode to NON DL TRAINING (0b00 == default) + FAPI_TRY(mss::exp::i2c::boot_cfg::set_dl_layer_boot_mode( i_target, l_boot_config_data, l_dl_layer_boot_mode )); + + // Issues the command and checks for completion + // Note: This does not kick off OMI training + FAPI_TRY(mss::exp::i2c::boot_config(i_target, l_boot_config_data)); // Gets the configuration information from attributes FAPI_TRY(mss::enterprise_mode(i_target, l_is_enterprise)); 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 3e5e81236..81b2a601a 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 @@ -53,10 +53,14 @@ extern "C" mss::display_git_commit_info("exp_omi_train"); std::vector<uint8_t> l_data; + uint8_t l_dl_layer_boot_mode = fapi2::ENUM_ATTR_MSS_OCMB_EXP_BOOT_CONFIG_DL_LAYER_BOOT_MODE_ONLY_DL_TRAINING; // Gets the data setup FAPI_TRY(mss::exp::omi::train::setup_fw_boot_config(i_target, l_data)); + // Sets DL_TRAIN field + FAPI_TRY(mss::exp::i2c::boot_cfg::set_dl_layer_boot_mode( i_target, l_data, l_dl_layer_boot_mode )); + // Issues the command and checks for completion // Note: the status check also checks for the OMI training completion, so after we run this command, we're good to go FAPI_TRY(mss::exp::i2c::boot_config(i_target, l_data)); diff --git a/src/import/chips/ocmb/explorer/procedures/xml/attribute_info/exp_omi_train.xml b/src/import/chips/ocmb/explorer/procedures/xml/attribute_info/exp_omi_train.xml index e60696f2e..c41f15ef0 100644 --- a/src/import/chips/ocmb/explorer/procedures/xml/attribute_info/exp_omi_train.xml +++ b/src/import/chips/ocmb/explorer/procedures/xml/attribute_info/exp_omi_train.xml @@ -97,8 +97,8 @@ </description> <valueType>uint8</valueType> <enum> - BOOT_RIGHT_AFTER_CONFIG = 0, - WAIT_FOR_HOST_CMD = 1 + NON_DL_TRAINING = 0, + ONLY_DL_TRAINING = 1 </enum> <platInit/> <initToZero/> |