diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2014-02-10 17:22:15 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-02-12 17:47:20 -0600 |
| commit | 619e886b4f46478b447bff9789f0a47986cb78e4 (patch) | |
| tree | 17d3f6430bfde130fd0740e2710c83ad30ce7446 | |
| parent | 67fc5e5b1c959c9953814af20c66a5bdfa2b416e (diff) | |
| download | talos-hostboot-619e886b4f46478b447bff9789f0a47986cb78e4.tar.gz talos-hostboot-619e886b4f46478b447bff9789f0a47986cb78e4.zip | |
FFDC Improvements for SCOM
Change-Id: I5c749abf5e112fe6877b87fb242134807f4cff27
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8744
Tested-by: Jenkins Server
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
| -rw-r--r-- | src/usr/fsiscom/fsiscom.C | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/usr/fsiscom/fsiscom.C b/src/usr/fsiscom/fsiscom.C index 0c3e94361..ea3631d05 100644 --- a/src/usr/fsiscom/fsiscom.C +++ b/src/usr/fsiscom/fsiscom.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ /* */ /* p1 */ /* */ @@ -160,7 +160,7 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType, * @moduleid FSISCOM::MOD_FSISCOM_PERFORMOP * @reasoncode FSISCOM::RC_INVALID_ADDRESS * @userdata1 SCOM Address - * @userdata2 0 + * @userdata2 Target HUID * @devdesc fsiScomPerformOp> Address contains * more than 31 bits. */ @@ -249,7 +249,8 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType, * @moduleid FSISCOM::MOD_FSISCOM_PERFORMOP * @reasoncode FSISCOM::RC_WRITE_ERROR * @userdata1 SCOM Addr - * @userdata2 SCOM Status Reg + * @userdata2[00:31] Target HUID + * @userdata2[32:63] SCOM Status Reg * @devdesc fsiScomPerformOp> Error returned * from SCOM Engine after write */ @@ -258,7 +259,9 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType, FSISCOM::MOD_FSISCOM_PERFORMOP, FSISCOM::RC_WRITE_ERROR, l_scomAddr, - TO_UINT64(l_status)); + TWO_UINT32_TO_UINT64( + TARGETING::get_huid(i_target), + l_status)); // call common error handler to do callouts and recovery pib_error_handler( i_target, l_err, l_status ); @@ -335,14 +338,17 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType, * @moduleid FSISCOM::MOD_FSISCOM_PERFORMOP * @reasoncode FSISCOM::RC_READ_ERROR * @userdata1 SCOM Addr - * @userdata2 SCOM Status Reg + * @userdata2[00:31] Target HUID + * @userdata2[32:63] SCOM Status Reg * @devdesc fsiScomPerformOp> Error returned from SCOM Engine after read. */ l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE, FSISCOM::MOD_FSISCOM_PERFORMOP, FSISCOM::RC_READ_ERROR, l_scomAddr, - TO_UINT64(l_status)); + TWO_UINT32_TO_UINT64( + TARGETING::get_huid(i_target), + l_status)); // call common error handler to do callouts and recovery pib_error_handler( i_target, l_err, l_status ); |
