From 82fbc51a7b8a2f53b6f4fb00ec09768a3ef6fcde Mon Sep 17 00:00:00 2001
From: Andre Marin <aamarin@us.ibm.com>
Date: Fri, 2 Nov 2018 08:33:30 -0500
Subject: Add exp_draminit and fix data_structs constants

Change-Id: I3b559d19cbfe407cf6a919174e201347f1bb1c1b
Original-Change-Id: Ic8011ed9b6261ce2849b2c51f79c9533261222bf
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/67837
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
---
 .../procedures/hwp/memory/lib/i2c/exp_i2c.H        |  2 +-
 .../procedures/hwp/memory/lib/shared/exp_consts.H  | 33 ++++++++++++++++++++++
 .../procedures/xml/error_info/mss_exp_errors.xml   | 22 ++++++++++++++-
 .../memory/lib/utils/shared/mss_generic_consts.H   |  3 +-
 4 files changed, 57 insertions(+), 3 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 986b5b75..cdab3c9c 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
@@ -70,7 +70,7 @@ 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_STATUS_CODE_UNSUCCESSFUL().
+                 fapi2::MSS_EXP_I2C_FW_STATUS_CODE_FAILED().
                  set_TARGET(i_target).
                  set_STATUS_CODE(l_status).
                  set_CMD_ID(i_cmd_id),
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 387a21be..472abea2 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
@@ -167,6 +167,39 @@ enum addrSide
 
 
 }// i2c
+
+namespace omi
+{
+
+///
+/// @brief HOST-FW Commands and Responses
+///
+enum cmd_and_response_id
+{
+    FW_DDR_INTERFACE_INIT = 0x01,
+    FW_TEMP_SENSOR_INIT = 0x02,
+    FW_ERR_LOGGING_INTERFACE_INIT = 0x03,
+    FW_GO_COMMAND = 0x04,
+    FW_ADAPTER_PROPERTIES_GET = 0x05,
+    FW_STATUS_GET = 0x06,
+    FW_TEMPERATURE_GET = 0x07,
+    FW_ERROR_LOG_GET = 0x08,
+    FW_SPD_DATA_SET = 0x09,
+    FW_BINARY_UPGRADE = 0x0A,
+    FW_FLASH_LOADER_VERSION_INFO = 0x0B,
+};
+
+///
+/// @brief Response argument parameters
+///
+enum response_arg
+{
+    SUCCESS = 0,
+    ERROR_CODE = 1,
+};
+
+}// omi
+
 }// 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 c5061b45..a0a9c973 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
@@ -40,7 +40,7 @@
   </hwpError>
 
   <hwpError>
-    <rc>RC_MSS_EXP_STATUS_CODE_UNSUCCESSFUL</rc>
+    <rc>RC_MSS_EXP_I2C_FW_STATUS_CODE_FAILED</rc>
     <description>
       Explorer status code for command ID EXP_FW_STATUS
       did not return SUCCESS
@@ -98,4 +98,24 @@
     </deconfigure>
   </hwpError>
 
+  <hwpError>
+    <rc>RC_MSS_EXP_RSP_ARG_FAILED</rc>
+    <description>
+      The response_argument field of the host_fw_response_struct returned a FAILURE
+    </description>
+    <ffdc>RSP_ID</ffdc>
+    <ffdc>ERROR_CODE</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>MEDIUM</priority>
+    </callout>
+    <callout>
+      <target>TARGET</target>
+      <priority>HIGH</priority>
+    </callout>
+    <deconfigure>
+      <target>TARGET</target>
+    </deconfigure>
+  </hwpError>
+
 </hwpErrors>
diff --git a/src/import/generic/memory/lib/utils/shared/mss_generic_consts.H b/src/import/generic/memory/lib/utils/shared/mss_generic_consts.H
index d378179d..6082120c 100644
--- a/src/import/generic/memory/lib/utils/shared/mss_generic_consts.H
+++ b/src/import/generic/memory/lib/utils/shared/mss_generic_consts.H
@@ -47,7 +47,8 @@ namespace mss
 ///
 enum common_consts
 {
-    DEFAULT_POLL_LIMIT = 50,       ///< the number of poll attempts in the event we can't calculate another
+    DEFAULT_POLL_LIMIT = 50,  ///< the number of poll attempts in the event we can't calculate another
+    MEMCMP_EQUAL = 0,         ///< Equal comparison value for memcmp
 };
 
 ///
-- 
cgit v1.2.3