diff options
| author | Prachi Gupta <pragupta@us.ibm.com> | 2014-09-15 10:41:59 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-09-15 12:11:03 -0500 |
| commit | 1182e50debe777f2bb01c2b3b9a427333abda499 (patch) | |
| tree | 5dd7a37175197f073c77babae8a9818c0b1afe78 /src/usr/hwpf/hwp/utility_procedures | |
| parent | fa963664ec95ca5e1eed0f5bd68ae427d972ac76 (diff) | |
| download | talos-hostboot-1182e50debe777f2bb01c2b3b9a427333abda499.tar.gz talos-hostboot-1182e50debe777f2bb01c2b3b9a427333abda499.zip | |
SW275672: New handling of MBSFIR[3][4]: externa/l/internal timeouts
CQ:SW275672
Change-Id: I7189b3a5df91138b7ec3c24fd3e0c31a57eaddbf
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/13333
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: STEPHEN M. CPREK <smcprek@us.ibm.com>
Tested-by: PRACHI GUPTA <pragupta@us.ibm.com>
Reviewed-by: PRACHI GUPTA <pragupta@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/13381
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/hwpf/hwp/utility_procedures')
| -rw-r--r-- | src/usr/hwpf/hwp/utility_procedures/mss_unmask_errors.C | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/usr/hwpf/hwp/utility_procedures/mss_unmask_errors.C b/src/usr/hwpf/hwp/utility_procedures/mss_unmask_errors.C index 354042b2d..2a01ff8bf 100644 --- a/src/usr/hwpf/hwp/utility_procedures/mss_unmask_errors.C +++ b/src/usr/hwpf/hwp/utility_procedures/mss_unmask_errors.C @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -20,7 +22,7 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: mss_unmask_errors.C,v 1.8 2014/04/08 16:15:56 gollub Exp $ +// $Id: mss_unmask_errors.C,v 1.9 2014/08/29 18:19:55 gollub Exp $ //------------------------------------------------------------------------------ // Don't forget to create CVS comments when you check in your changes! //------------------------------------------------------------------------------ @@ -64,6 +66,8 @@ // | | | New DD2: MBAFIR 8 channel checkstop unmasked // | | | New DD2: MBACALFIR 20,21,22 recoverable masked // 1.8 |08-APR-14 | gollub | Removed debug trace +// 1.9 |29-AUG-14 | gollub | SW275672: Changed MBS_FIR_REG[3][4] from channel checkstop to recoverable + //------------------------------------------------------------------------------ // Includes @@ -537,14 +541,14 @@ fapi::ReturnCode mss_unmask_inband_errors( const fapi::Target & i_target, l_ecmd_rc |= l_mbs_fir_action1.clearBit(2); l_ecmd_rc |= l_mbs_fir_mask_or.setBit(2); - // 3 external_timeout channel checkstop mask (until unmask_fetch_errors) + // 3 external_timeout recoverable mask (until unmask_fetch_errors) l_ecmd_rc |= l_mbs_fir_action0.clearBit(3); - l_ecmd_rc |= l_mbs_fir_action1.clearBit(3); + l_ecmd_rc |= l_mbs_fir_action1.setBit(3); l_ecmd_rc |= l_mbs_fir_mask_or.setBit(3); - // 4 internal_timeout channel checkstop mask (until unmask_fetch_errors) + // 4 internal_timeout recoverable mask (until unmask_fetch_errors) l_ecmd_rc |= l_mbs_fir_action0.clearBit(4); - l_ecmd_rc |= l_mbs_fir_action1.clearBit(4); + l_ecmd_rc |= l_mbs_fir_action1.setBit(4); l_ecmd_rc |= l_mbs_fir_mask_or.setBit(4); // 5 int_buffer_ce recoverable unmask @@ -3011,10 +3015,10 @@ fapi::ReturnCode mss_unmask_fetch_errors(const fapi::Target & i_target, // 2 invalid_address_error channel checkstop unmask l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(2); - // 3 external_timeout channel checkstop unmask + // 3 external_timeout recoverable unmask l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(3); - // 4 internal_timeout channel checkstop unmask + // 4 internal_timeout recoverable unmask l_ecmd_rc |= l_mbs_fir_mask_and.clearBit(4); |
