From a801fcf53301760bc456217d1e6a0790a840bc1f Mon Sep 17 00:00:00 2001
From: Louis Stermole <stermole@us.ibm.com>
Date: Thu, 16 Jan 2020 13:32:19 -0500
Subject: Fix exp_draminit to print response structure and error code when
 training fails

Change-Id: Ia02b9261c03b24d799cf96cd655aace3b52b0481
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/89761
Reviewed-by: RYAN P KING <rpking@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Mark Pizzutillo <mark.pizzutillo@ibm.com>
Reviewed-by: Jennifer A Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/89795
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
---
 .../procedures/hwp/memory/lib/exp_draminit_utils.C     | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/exp_draminit_utils.C b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/exp_draminit_utils.C
index bb4595806..25a23285a 100644
--- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/exp_draminit_utils.C
+++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/exp_draminit_utils.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2018,2019                        */
+/* Contributors Listed Below - COPYRIGHT 2018,2020                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -324,6 +324,8 @@ fapi2::ReturnCode check_host_fw_response(const fapi2::Target<fapi2::TARGET_TYPE_
 
     o_rc = mss::exp::check::response(i_target, l_response, i_cmd);
 
+    return fapi2::FAPI2_RC_SUCCESS;
+
 fapi_try_exit:
     return fapi2::current_err;
 }
@@ -506,18 +508,26 @@ fapi2::ReturnCode response(const fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP>& i_
                            const host_fw_response_struct& i_rsp,
                            const host_fw_command_struct& i_cmd)
 {
+    fapi2::buffer<uint32_t> l_error_code;
+
+    l_error_code.insertFromRight<0, BITS_PER_BYTE>(i_rsp.response_argument[4]).
+    insertFromRight<BITS_PER_BYTE, BITS_PER_BYTE>(i_rsp.response_argument[3]).
+    insertFromRight<2 * BITS_PER_BYTE, BITS_PER_BYTE>(i_rsp.response_argument[2]).
+    insertFromRight<3 * BITS_PER_BYTE, BITS_PER_BYTE>(i_rsp.response_argument[1]);
+
     // Check if cmd was successful
     FAPI_ASSERT(i_rsp.response_argument[0] == omi::response_arg::SUCCESS &&
                 i_rsp.request_identifier == i_cmd.request_identifier,
                 fapi2::MSS_EXP_RSP_ARG_FAILED().
                 set_TARGET(i_target).
                 set_RSP_ID(i_rsp.response_id).
-                set_ERROR_CODE(i_rsp.response_argument[1]).
+                set_ERROR_CODE(l_error_code).
                 set_EXPECTED_REQID(i_cmd.request_identifier).
                 set_ACTUAL_REQID(i_rsp.request_identifier),
-                "Failed to initialize the PHY for %s, response=0x%X "
+                "Failed to initialize the PHY for %s, response=0x%X, error_code=0x%08X "
                 "RSP RQ ID: %u CMD RQ ID: %u",
-                mss::c_str(i_target), i_rsp.response_argument[0], i_rsp.request_identifier, i_cmd.request_identifier);
+                mss::c_str(i_target), i_rsp.response_argument[0], l_error_code,
+                i_rsp.request_identifier, i_cmd.request_identifier);
 
     return fapi2::FAPI2_RC_SUCCESS;
 
-- 
cgit v1.2.1