diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2013-07-15 11:14:39 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-07-24 11:20:05 -0500 |
| commit | 3efd2cd53ef98af9a4727088e88b3e5f0d2975f4 (patch) | |
| tree | 38fd0b8a5c4c80e35ab02f62f35aa8195f434e0a /src/usr/xscom | |
| parent | 134f3baed1791e976a0bc1df285eb6255d95467c (diff) | |
| download | talos-hostboot-3efd2cd53ef98af9a4727088e88b3e5f0d2975f4.tar.gz talos-hostboot-3efd2cd53ef98af9a4727088e88b3e5f0d2975f4.zip | |
Remove workaround for SW193003
Change-Id: I0be42d36f1af368c849b5b2d38f24c7d9b11e103
RTC: 67295
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5404
Tested-by: Jenkins Server
Reviewed-by: Michael Baiocchi <baiocchi@us.ibm.com>
Reviewed-by: ADAM R. MUHLE <armuhle@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/xscom')
| -rw-r--r-- | src/usr/xscom/xscom.C | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/usr/xscom/xscom.C b/src/usr/xscom/xscom.C index d47992ac8..8e39ea29d 100644 --- a/src/usr/xscom/xscom.C +++ b/src/usr/xscom/xscom.C @@ -45,9 +45,6 @@ #include <errl/errludlogregister.H> #include <xscom/piberror.H> -//@fixme-RTC:67295 Only log the error once -bool MULTICAST_ERROR_LOGGED_ONCE = false; - // Trace definition trace_desc_t* g_trac_xscom = NULL; TRAC_INIT(&g_trac_xscom, "XSCOM", 2*KILOBYTE, TRACE::BUFFER_SLOW); @@ -525,25 +522,9 @@ errlHndl_t xScomDoOp(DeviceFW::OperationType i_opType, // Handle error if (io_hmer.mXSComStatus != PIB::PIB_NO_ERROR) { - - //@fixme-RTC:67295 remove these hacks, make log UNRECOVERABLE again - if( ((i_xscomAddr & 0xFF000000) == 0x57000000) - && (io_hmer.mXSComStatus == PIB::PIB_INVALID_ADDRESS) ) - { - if( MULTICAST_ERROR_LOGGED_ONCE ) - { - // Ignore this due to a Simics issue - see SW193003 - TRACFCOMP(g_trac_xscom, ERR_MRK "Skipping XSCOM errorlog for multicast error for addr=%llx",i_xscomAddr ); - io_buflen = XSCOM_BUFFER_SIZE; - // break out as if success and do not create an error - break; - } - MULTICAST_ERROR_LOGGED_ONCE = true; - } - uint64_t l_hmerVal = io_hmer; - TRACFCOMP(g_trac_xscom,ERR_MRK "XSCOM status error HMER: %.16llx ,XSComStatus = %llx ,Addr=%llx",l_hmerVal,io_hmer.mXSComStatus, i_xscomAddr ); + TRACFCOMP(g_trac_xscom,ERR_MRK "XSCOM status error HMER: %.16llx ,XSComStatus = %llx, Addr=%llx",l_hmerVal,io_hmer.mXSComStatus, i_xscomAddr ); /*@ * @errortype * @moduleid XSCOM_DO_OP @@ -557,7 +538,7 @@ errlHndl_t xScomDoOp(DeviceFW::OperationType i_opType, XSCOM_STATUS_ERR, io_hmer, l_mmioAddr); - + //Note: Callouts are added by the caller if needed } } while (0); |
