diff options
author | Prasad Bg Ranganath <prasadbgr@in.ibm.com> | 2017-07-25 00:32:08 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-08-29 12:33:59 -0400 |
commit | 1ab2edd7289634d3b3d0262d309f8f640ab76d1e (patch) | |
tree | 0d19005ed39cf75c991f0d6a8a203d519aeefe34 /src/import/chips | |
parent | 42f0422d802186b0dd811de6fc05a7a999665fe3 (diff) | |
download | talos-hostboot-1ab2edd7289634d3b3d0262d309f8f640ab76d1e.tar.gz talos-hostboot-1ab2edd7289634d3b3d0262d309f8f640ab76d1e.zip |
AVSBUS: Move fapi2 return code to error xml file
- rebased
Change-Id: I186e716986012ede094a09e490a983ddcb4b92ef
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43582
Dev-Ready: Brent Wieman <bwieman@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: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44733
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>
Diffstat (limited to 'src/import/chips')
-rw-r--r-- | src/import/chips/p9/procedures/hwp/lib/p9_avsbus_lib.C | 14 | ||||
-rw-r--r-- | src/import/chips/p9/procedures/xml/error_info/p9_avsbus_lib_errors.xml | 10 |
2 files changed, 20 insertions, 4 deletions
diff --git a/src/import/chips/p9/procedures/hwp/lib/p9_avsbus_lib.C b/src/import/chips/p9/procedures/hwp/lib/p9_avsbus_lib.C index 372443898..176f4a3d5 100644 --- a/src/import/chips/p9/procedures/hwp/lib/p9_avsbus_lib.C +++ b/src/import/chips/p9/procedures/hwp/lib/p9_avsbus_lib.C @@ -259,8 +259,14 @@ avsPollVoltageTransDone(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& { // This will set current_err to a non success value that can be // checked by the caller. - l_rc = fapi2::FAPI2_RC_PLAT_AVSBUS_POLL_TIMEOUT; - fapi2::current_err = l_rc; + FAPI_ASSERT(false, + fapi2::PROCPM_AVSBUS_POLL_TIMEOUT() + .set_CHIP_TARGET(i_target) + .set_AVSBUS_NUM(i_avsBusNum) + .set_AVSBUS_BRIDGE_NUM(i_o2sBridgeNum) + .set_AVSBUS_MAX_POLL_CNT(p9avslib::MAX_POLL_COUNT_AVS), + "avsPollVoltageTransDone poll timeout"); + } fapi_try_exit: @@ -341,7 +347,7 @@ avsDriveCommand(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target, fapi_try_exit: - if (fapi2::current_err == fapi2::FAPI2_RC_PLAT_AVSBUS_POLL_TIMEOUT) + if (fapi2::current_err) { FAPI_ASSERT(false, fapi2::PROCPM_AVSBUS_VOLTAGE_TIMEOUT() @@ -466,7 +472,7 @@ avsIdleFrame(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target, fapi_try_exit: - if (fapi2::current_err == fapi2::FAPI2_RC_PLAT_AVSBUS_POLL_TIMEOUT) + if (fapi2::current_err) { FAPI_ASSERT(false, fapi2::PROCPM_AVSBUS_IDLEFRAME_TIMEOUT() diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_avsbus_lib_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_avsbus_lib_errors.xml index 6bedd41dd..a22dd50bf 100644 --- a/src/import/chips/p9/procedures/xml/error_info/p9_avsbus_lib_errors.xml +++ b/src/import/chips/p9/procedures/xml/error_info/p9_avsbus_lib_errors.xml @@ -33,6 +33,16 @@ <hwpErrors> <!-- ******************************************************************** --> <hwpError> + <rc>RC_PROCPM_AVSBUS_POLL_TIMEOUT</rc> + <description> + A timeout occured while polling OCB status register O2SST for o2s_ongoing=0 + </description> + <ffdc>CHIP_TARGET</ffdc> + <ffdc>AVSBUS_NUM</ffdc> + <ffdc>AVSBUS_BRIDGE_NUM</ffdc> + <ffdc>AVSBUS_MAX_POLL_CNT</ffdc> + </hwpError> + <hwpError> <rc>RC_PROCPM_AVSBUS_VOLTAGE_TIMEOUT</rc> <description> A timeout occured reading/writing voltage from an AVSBus |