summaryrefslogtreecommitdiffstats
path: root/src/import/chips
diff options
context:
space:
mode:
authorSunil Kumar <skumar8j@in.ibm.com>2019-04-29 03:34:39 -0500
committerRaja Das <rajadas2@in.ibm.com>2019-07-26 01:00:04 -0500
commit1921f40c21364334af0284c617780c214672b2db (patch)
treee6cfa44a0e63c609a8b69baa9442c2373ab6186e /src/import/chips
parent03efd4591c9031e8ed28b6a39ccc00e27e773814 (diff)
downloadtalos-sbe-1921f40c21364334af0284c617780c214672b2db.tar.gz
talos-sbe-1921f40c21364334af0284c617780c214672b2db.zip
OCMB changes to suit PPE compilation.
Change-Id: I0af6035480b8369bbceb512950f7ce77155fb71e Original-Change-Id: If1146defe839abe50a35daa633d8bfc2e9aa1bdf Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/76637 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Reviewed-by: Christian R Geddes <crgeddes@us.ibm.com> Reviewed-by: MURULIDHAR NATARAJU <murulidhar@in.ibm.com> Reviewed-by: RAJA DAS <rajadas2@in.ibm.com> Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com> Reviewed-by: Jennifer A Stofer <stofer@us.ibm.com>
Diffstat (limited to 'src/import/chips')
-rw-r--r--src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/i2c/exp_i2c.H70
-rw-r--r--src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/i2c/exp_i2c_fields.H15
-rw-r--r--src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/i2c/exp_i2c_scom.H6
-rw-r--r--src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H13
-rw-r--r--src/import/chips/ocmb/explorer/procedures/xml/error_info/mss_exp_errors.xml3
5 files changed, 84 insertions, 23 deletions
diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/i2c/exp_i2c.H b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/i2c/exp_i2c.H
index 8e30c3f3..68d25da4 100644
--- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/i2c/exp_i2c.H
+++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/i2c/exp_i2c.H
@@ -38,12 +38,27 @@
#include <fapi2.H>
#include <i2c_access.H>
-
#include <vector>
-#include <lib/i2c/exp_i2c_fields.H>
-#include <generic/memory/lib/utils/pos.H>
-#include <generic/memory/lib/utils/endian_utils.H>
-#include <generic/memory/lib/utils/poll.H>
+
+#ifdef __PPE__
+ #include <exp_i2c_fields.H>
+ #include <endian_utils.H>
+#else
+ #include <generic/memory/lib/utils/poll.H>
+ #include <lib/i2c/exp_i2c_fields.H>
+ #include <generic/memory/lib/utils/pos.H>
+ #include <generic/memory/lib/utils/endian_utils.H>
+#endif
+
+
+//Macro
+#ifdef __PPE__
+ #define TARGIDFORMAT "0x%08X"
+ #define TARGID i_target.get()
+#else
+ #define TARGIDFORMAT "%s"
+ #define TARGID mss::c_str(i_target)
+#endif
namespace mss
{
@@ -83,13 +98,14 @@ inline fapi2::ReturnCode status_code( const fapi2::Target<fapi2::TARGET_TYPE_OCM
// Technically many cmds have their own status code decoding..but SUCCESS is always 0.
// If it's anything else we can just look up the status code
+
FAPI_ASSERT( l_status == status_codes::SUCCESS,
fapi2::MSS_EXP_I2C_FW_STATUS_CODE_FAILED().
set_TARGET(i_target).
set_STATUS_CODE(l_status).
set_CMD_ID(i_cmd_id),
- "Status code did not return SUCCESS (%d), received (%d) for %s",
- status_codes::SUCCESS, l_status, mss::c_str(i_target) );
+ "Status code did not return SUCCESS (%d), received (%d) for " TARGIDFORMAT ,
+ status_codes::SUCCESS, l_status, TARGID );
return fapi2::FAPI2_RC_SUCCESS;
@@ -112,6 +128,7 @@ inline void fw_status_setup(size_t& o_size,
o_cmd_id.push_back(FW_STATUS);
}
+#ifndef __PPE__
///
/// @brief EXP_FW_BYPASS_4SEC_TIMEOUT setup helper function
/// @param[out] o_cmd_id the explorer command ID
@@ -121,6 +138,7 @@ inline void fw_bypass_download_window_setup(std::vector<uint8_t>& o_cmd_id)
o_cmd_id.clear();
o_cmd_id.push_back(FW_BYPASS_4SEC_TIMEOUT);
}
+#endif
///
/// @brief get EXP_FW_STATUS bytes
@@ -190,7 +208,7 @@ inline fapi2::ReturnCode fw_status(const fapi2::Target<fapi2::TARGET_TYPE_OCMB_C
// This is a base function that will be utilized by the platform code
// As such, we don't want to pull in more libraries than we need to: it would cause extra dependencies
// So, we're decomposing the polling library below
- fapi2::ReturnCode l_rc = fapi2::FAPI2_RC_SUCCESS;
+ //fapi2::ReturnCode l_rc = fapi2::FAPI2_RC_SUCCESS;
bool l_busy = true;
uint8_t l_boot_stage = 0;
uint64_t l_loop = 0;
@@ -211,28 +229,28 @@ inline fapi2::ReturnCode fw_status(const fapi2::Target<fapi2::TARGET_TYPE_OCMB_C
FAPI_TRY( fapi2::delay( i_delay, 200) );
}
- FAPI_DBG("%s stopped on loop %u/%u", mss::c_str(i_target), l_loop, i_loops);
-
+ FAPI_DBG(TARGIDFORMAT " stopped on loop %u/%u", TARGID , l_loop, i_loops);
// Check that Explorer is not still in FW_BUSY state
+
FAPI_ASSERT( !l_busy,
fapi2::MSS_EXP_I2C_FW_STATUS_BUSY().
set_TARGET(i_target),
- "Polling timeout on FW_STATUS command (still FW_BUSY) for %s",
- mss::c_str(i_target) );
-
+ "Polling timeout on FW_STATUS command (still FW_BUSY) for " TARGIDFORMAT,
+ TARGID );
// Check that Explorer is in RUNTIME_FW boot stage
FAPI_ASSERT( (l_boot_stage == EXPECTED_BOOT_STAGE),
fapi2::MSS_EXP_I2C_WRONG_BOOT_STAGE().
set_TARGET(i_target).
set_BOOT_STAGE(l_boot_stage).
set_EXPECTED_BOOT_STAGE(EXPECTED_BOOT_STAGE),
- "Polling timeout on FW_STATUS command (wrong boot stage: 0x%01x, expected 0x%01x) for %s",
- l_boot_stage, EXPECTED_BOOT_STAGE, mss::c_str(i_target) );
+ "Polling timeout on FW_STATUS command (wrong boot stage: 0x%01x, expected 0x%01x) for " TARGIDFORMAT,
+ l_boot_stage, EXPECTED_BOOT_STAGE, TARGID );
fapi_try_exit:
return fapi2::current_err;
}
+#ifndef __PPE__
///
/// @brief EXP_FW_BOOT_CONFIG setup
/// @param[in,out] io_data the data to go to boot config
@@ -390,6 +408,7 @@ fapi_try_exit:
return fapi2::current_err;
}
+#endif
///
/// @brief Perform a register write operation on the given OCMB chip
/// @param[in] i_target the OCMB target
@@ -416,13 +435,21 @@ inline fapi2::ReturnCode fw_reg_write(const fapi2::Target<fapi2::TARGET_TYPE_OC
// currently are
// Byte 2:5 = Address
forceBE(i_addr, l_be_vector);
- l_cmd_vector.insert(l_cmd_vector.end(), l_be_vector.begin(), l_be_vector.end());
+
+ for(std::vector<uint8_t>::iterator it = l_be_vector.begin(); it != l_be_vector.end(); ++it)
+ {
+ l_cmd_vector.push_back(*it);
+ }
l_be_vector.clear();
forceBE(l_input_data, l_be_vector);
// Byte 6:9 = Data
- l_cmd_vector.insert(l_cmd_vector.end(), l_be_vector.begin(), l_be_vector.end());
+
+ for(std::vector<uint8_t>::iterator it = l_be_vector.begin(); it != l_be_vector.end(); ++it)
+ {
+ l_cmd_vector.push_back(*it);
+ }
// Use fapi2 putI2c interface to execute command
FAPI_TRY(fapi2::putI2c(i_target, l_cmd_vector),
@@ -468,7 +495,11 @@ inline fapi2::ReturnCode fw_reg_read(const fapi2::Target<fapi2::TARGET_TYPE_OCMB
// directly to the cmd_vector in the same order it
// currently is in
// Byte 2:5 = Address
- l_cmd_vector.insert(l_cmd_vector.end(), l_tmp_vector.begin(), l_tmp_vector.end());
+
+ for(std::vector<uint8_t>::iterator it = l_tmp_vector.begin(); it != l_tmp_vector.end(); ++it)
+ {
+ l_cmd_vector.push_back(*it);
+ }
// Use fapi2 putI2c interface to execute command
FAPI_TRY(fapi2::putI2c(i_target, l_cmd_vector),
@@ -554,6 +585,8 @@ inline uint32_t trans_micro_i2c_scom_addr(const uint32_t i_addr)
return (i_addr | OCMB_UNCACHED_OFFSET) ;
}
+#ifndef __PPE__
+
///
/// @brief Issue the DOWNLOAD command to the given OCMB chip
/// @param[in] i_target the OCMB target
@@ -600,6 +633,7 @@ fapi_try_exit:
return fapi2::current_err;
}
+#endif
}// i2c
}// exp
diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/i2c/exp_i2c_fields.H b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/i2c/exp_i2c_fields.H
index c962bd67..41d83cc9 100644
--- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/i2c/exp_i2c_fields.H
+++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/i2c/exp_i2c_fields.H
@@ -36,9 +36,14 @@
#ifndef _MSS_EXP_I2C_FIELDS_H_
#define _MSS_EXP_I2C_FIELDS_H_
-#include <generic/memory/lib/utils/mss_field.H>
-#include <lib/shared/exp_consts.H>
#include <functional>
+#ifdef __PPE__
+ #include <mss_field.H>
+ #include <exp_consts.H>
+#else
+ #include <generic/memory/lib/utils/mss_field.H>
+ #include <lib/shared/exp_consts.H>
+#endif
namespace mss
{
@@ -241,6 +246,7 @@ inline fapi2::ReturnCode get_field(const fapi2::Target<fapi2::TARGET_TYPE_OCMB_C
return mss::get_field<endian::BIG, F, TT>(i_target, i_data, EXP_I2C_GET_FIELD, o_value);
}
+#ifndef __PPE__
///
/// @brief Explorer I2C field setter
/// @tparam IT Input type
@@ -461,6 +467,8 @@ inline fapi2::ReturnCode set_fw_mode(const fapi2::Target<fapi2::TARGET_TYPE_OCMB
}// boot_cfg
+#endif
+
namespace status
{
@@ -478,6 +486,7 @@ inline fapi2::ReturnCode get_boot_stage(const fapi2::Target<fapi2::TARGET_TYPE_O
return get_field<fields::BOOT_STAGE>(i_target, i_data, o_setting);
}
+
///
/// @brief STATUS_CODE getter
/// @param[in] i_target the OCMB target
@@ -492,6 +501,7 @@ inline fapi2::ReturnCode get_status_code(const fapi2::Target<fapi2::TARGET_TYPE_
return get_field<fields::STATUS_CODE>(i_target, i_data, o_setting);
}
+#ifndef __PPE__
///
/// @brief CMD_ID getter
/// @param[in] i_target the OCMB target
@@ -505,6 +515,7 @@ inline fapi2::ReturnCode get_cmd_id(const fapi2::Target<fapi2::TARGET_TYPE_OCMB_
{
return get_field<fields::CMD_ID>(i_target, i_data, o_setting);
}
+#endif
}// status
}// i2c
diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/i2c/exp_i2c_scom.H b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/i2c/exp_i2c_scom.H
index 6113b3a4..251f2805 100644
--- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/i2c/exp_i2c_scom.H
+++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/i2c/exp_i2c_scom.H
@@ -36,7 +36,11 @@
#ifndef _MSS_EXP_I2C_SCOM_H_
#define _MSS_EXP_I2C_SCOM_H_
-#include <lib/i2c/exp_i2c.H>
+#ifdef __PPE__
+ #include <exp_i2c.H>
+#else
+ #include <lib/i2c/exp_i2c.H>
+#endif
namespace mss
diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H
index a2d77405..8aef80e4 100644
--- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H
+++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H
@@ -36,7 +36,9 @@
#ifndef MSS_EXP_CONSTS_H
#define MSS_EXP_CONSTS_H
-#include <generic/memory/lib/utils/shared/mss_generic_consts.H>
+#ifndef __PPE__
+ #include <generic/memory/lib/utils/shared/mss_generic_consts.H>
+#endif
namespace mss
{
@@ -46,6 +48,7 @@ namespace exp
constexpr uint32_t OCMB_ADDR_SHIFT = 3;
+#ifndef __PPE__
///
/// @brief enum list for the indexes for the address delays
/// @note Taken from 07-MAY-19 firwmare document
@@ -127,6 +130,8 @@ enum sizes
MAX_MRANK_PER_PORT = MAX_DIMM_PER_PORT * MAX_RANK_PER_DIMM,
};
+#endif
+
///
/// @brief explorer ffdc codes
///
@@ -241,6 +246,7 @@ enum status_codes
FW_BUSY = 0xFE,
};
+#ifndef __PPE__
///
/// @brief status codes for FW_BOOT_CONFIG
///
@@ -258,6 +264,7 @@ enum fw_boot_cfg_status
FW_BOOT_CFG_UNSUPPORTED_SERDES_FREQ = 0x04,
};
+#endif
///
/// @brief I2C boot stage options
/// @note certain cmds work in certain boot stages
@@ -305,9 +312,9 @@ enum addrSide
RHS = 0x01
};
-
}// i2c
+#ifndef __PPE__
namespace omi
{
@@ -371,6 +378,8 @@ enum response_arg
};
}// omi
+#endif
+
}// exp
}// mss
diff --git a/src/import/chips/ocmb/explorer/procedures/xml/error_info/mss_exp_errors.xml b/src/import/chips/ocmb/explorer/procedures/xml/error_info/mss_exp_errors.xml
index 8a325ff0..9f29367b 100644
--- a/src/import/chips/ocmb/explorer/procedures/xml/error_info/mss_exp_errors.xml
+++ b/src/import/chips/ocmb/explorer/procedures/xml/error_info/mss_exp_errors.xml
@@ -356,6 +356,7 @@
Explorer status code for command ID EXP_FW_STATUS
did not return SUCCESS
</description>
+ <ffdc>TARGET</ffdc>
<ffdc>STATUS_CODE</ffdc>
<ffdc>CMD_ID</ffdc>
<callout>
@@ -377,6 +378,7 @@
Received FW_BUSY status after polling timeout for
command ID EXP_FW_STATUS
</description>
+ <ffdc>TARGET</ffdc>
<ffdc>STATUS_CODE</ffdc>
<callout>
<procedure>CODE</procedure>
@@ -397,6 +399,7 @@
Received incorrect boot stage from
command ID EXP_FW_STATUS
</description>
+ <ffdc>TARGET</ffdc>
<ffdc>BOOT_STAGE</ffdc>
<ffdc>EXPECTED_BOOT_STAGE</ffdc>
<callout>
OpenPOWER on IntegriCloud