Update setup_fw_boot_config() to read out actual values from attributes

Change-Id: I29ae48ff18293c8f6ccc163228ce06b00d97e8e1
Original-Change-Id: I2574f01fceb79fb0d3234010581aab92d48ce409
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68248
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: JEREMY R. NEATON <jrneaton@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/71773
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>

2 files changed, 55 insertions, 39 deletions

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 adcd12f6a..2865af091 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
@@ -49,26 +49,10 @@ extern "C"
     ///
     fapi2::ReturnCode exp_omi_train(const fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP>& i_target)
     {
-        // TODO:RTC197867 Update these constants to read out actual values from attributes
-        constexpr uint8_t MANUFACTURING_MODE_OFF = 0x00;
-        constexpr uint8_t NO_LOOPBACK_TESTING = 0x00;
-        constexpr uint8_t OPENCAPI_TRANSPORT_LAYER = 0x00;
-        constexpr uint8_t IMMEDIATE_DL_LAYER_BOOT = 0x00;
-        constexpr uint8_t FULL_BOOT_MODE = 0x00;
-        constexpr uint8_t LANE_MODE_8 = 0x01;
-        constexpr uint8_t SERDES_25600MBPS = 0x03;
         std::vector<uint8_t> l_data;
 
         // Gets the data setup
-        FAPI_TRY(mss::exp::omi::train::setup_fw_boot_config(i_target,
-                 MANUFACTURING_MODE_OFF,
-                 NO_LOOPBACK_TESTING,
-                 OPENCAPI_TRANSPORT_LAYER,
-                 IMMEDIATE_DL_LAYER_BOOT,
-                 FULL_BOOT_MODE,
-                 LANE_MODE_8,
-                 SERDES_25600MBPS,
-                 l_data));
+        FAPI_TRY(mss::exp::omi::train::setup_fw_boot_config(i_target, l_data));
 
         // 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
diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/omi/exp_omi_utils.C b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/omi/exp_omi_utils.C
index c98b3efec..a3717ff4c 100644
--- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/omi/exp_omi_utils.C
+++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/omi/exp_omi_utils.C
@@ -47,39 +47,71 @@ namespace train
 {
 
 ///
-/// @brief Sets up the OMI training
+/// @brief Get the FW_BOOT_CONFIG from attributes
 /// @param[in] i_target target on which the code is operating
-/// @param[in] i_manufacturing_mode manufacturing mode control
-/// @param[in] i_loopback_testing loopback testing control
-/// @param[in] i_transport_layer transport layer configuration
-/// @param[in] i_dl_layer DL layer boot mode
-/// @param[in] i_boot_mode true if step-by-step mode
-/// @param[in] i_lane_mode lane mode configuration
-/// @param[in] i_serdes serdes frequency
 /// @param[out] o_data data for the FW_BOOT_CONFIG
 /// @return fapi2::ReturnCode - FAPI2_RC_SUCCESS iff get is OK
 ///
 fapi2::ReturnCode setup_fw_boot_config( const fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP>& i_target,
-                                        const uint8_t i_manufacturing_mode,
-                                        const uint8_t i_loopback_testing,
-                                        const uint8_t i_transport_layer,
-                                        const uint8_t i_dl_layer,
-                                        const uint8_t i_boot_mode,
-                                        const uint8_t i_lane_mode,
-                                        const uint8_t i_serdes,
                                         std::vector<uint8_t>& o_data )
 {
+    // Variables
+    uint8_t l_fw_mode = 0;
+    uint8_t l_loopback_test = 0;
+    uint8_t l_transport_layer = 0;
+    uint8_t l_dl_layer_boot_mode = 0;
+    uint8_t l_boot_mode = 0;
+    uint8_t l_lane_mode = 0;
+    uint8_t l_serdes_freq = 0;
+
+    // Read the EXP_FW_BOOT_CONFIG from the attributes
+    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_MSS_OCMB_EXP_BOOT_CONFIG_FW_MODE,
+                           i_target,
+                           l_fw_mode),
+             "Error from FAPI_ATTR_GET (ATTR_MSS_OCMB_EXP_BOOT_CONFIG_FW_MODE) on %s", mss::c_str(i_target));
+
+    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_MSS_OCMB_EXP_BOOT_CONFIG_OPENCAPI_LOOPBACK_TEST,
+                           i_target,
+                           l_loopback_test),
+             "Error from FAPI_ATTR_GET (ATTR_MSS_OCMB_EXP_BOOT_CONFIG_OPENCAPI_LOOPBACK_TEST) on %s", mss::c_str(i_target));
+
+    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_MSS_OCMB_EXP_BOOT_CONFIG_TRANSPORT_LAYER,
+                           i_target,
+                           l_transport_layer),
+             "Error from FAPI_ATTR_GET (ATTR_MSS_OCMB_EXP_BOOT_CONFIG_TRANSPORT_LAYER) on %s", mss::c_str(i_target));
+
+    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_MSS_OCMB_EXP_BOOT_CONFIG_DL_LAYER_BOOT_MODE,
+                           i_target,
+                           l_dl_layer_boot_mode),
+             "Error from FAPI_ATTR_GET (ATTR_MSS_OCMB_EXP_BOOT_CONFIG_DL_LAYER_BOOT_MODE) on %s", mss::c_str(i_target));
+
+    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_MSS_OCMB_EXP_BOOT_CONFIG_BOOT_MODE,
+                           i_target,
+                           l_boot_mode),
+             "%s Error from FAPI_ATTR_GET (ATTR_MSS_OCMB_EXP_BOOT_CONFIG_BOOT_MODE) on %s", mss::c_str(i_target));
+
+    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_MSS_OCMB_EXP_BOOT_CONFIG_LANE_MODE,
+                           i_target,
+                           l_lane_mode),
+             "Error from FAPI_ATTR_GET (ATTR_MSS_OCMB_EXP_BOOT_CONFIG_LANE_MODE) on %s", mss::c_str(i_target));
+
+    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_MSS_OCMB_EXP_BOOT_CONFIG_SERDES_FREQUENCY,
+                           i_target,
+                           l_serdes_freq),
+             "Error from FAPI_ATTR_GET (ATTR_MSS_OCMB_EXP_BOOT_CONFIG_SERDES_FREQUENCY) on %s", mss::c_str(i_target));
+
+
     // Clears o_data, just in case
     o_data.clear();
     o_data.assign(mss::exp::i2c::FW_BOOT_CONFIG_BYTE_LEN, 0);
 
-    FAPI_TRY(mss::exp::i2c::boot_cfg::set_serdes_freq( i_target, o_data, i_serdes ));
-    FAPI_TRY(mss::exp::i2c::boot_cfg::set_lane_mode( i_target, o_data, i_lane_mode ));
-    FAPI_TRY(mss::exp::i2c::boot_cfg::set_boot_mode( i_target, o_data, i_boot_mode ));
-    FAPI_TRY(mss::exp::i2c::boot_cfg::set_dl_layer_boot_mode( i_target, o_data, i_dl_layer ));
-    FAPI_TRY(mss::exp::i2c::boot_cfg::set_transport_layer( i_target, o_data, i_transport_layer ));
-    FAPI_TRY(mss::exp::i2c::boot_cfg::set_loopback_test( i_target, o_data, i_loopback_testing ));
-    FAPI_TRY(mss::exp::i2c::boot_cfg::set_fw_mode( i_target, o_data, i_manufacturing_mode ));
+    FAPI_TRY(mss::exp::i2c::boot_cfg::set_serdes_freq( i_target, o_data, l_serdes_freq ));
+    FAPI_TRY(mss::exp::i2c::boot_cfg::set_lane_mode( i_target, o_data, l_lane_mode ));
+    FAPI_TRY(mss::exp::i2c::boot_cfg::set_boot_mode( i_target, o_data, l_boot_mode ));
+    FAPI_TRY(mss::exp::i2c::boot_cfg::set_dl_layer_boot_mode( i_target, o_data, l_dl_layer_boot_mode ));
+    FAPI_TRY(mss::exp::i2c::boot_cfg::set_transport_layer( i_target, o_data, l_transport_layer ));
+    FAPI_TRY(mss::exp::i2c::boot_cfg::set_loopback_test( i_target, o_data, l_loopback_test ));
+    FAPI_TRY(mss::exp::i2c::boot_cfg::set_fw_mode( i_target, o_data, l_fw_mode ));
 
 fapi_try_exit:
     return fapi2::current_err;