diff options
| author | Prachi Gupta <pragupta@us.ibm.com> | 2017-11-17 13:45:03 -0600 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2017-11-21 12:24:15 -0500 |
| commit | 18cc0dfbc93fd2342c5a35f3c8405e1d0a660a77 (patch) | |
| tree | f85b3326ebc77e332795385eb4617cd200c989e4 /src/usr/fsiscom | |
| parent | dfdf4bee880f30dd5aefa3cfba70801ad78c760b (diff) | |
| download | talos-hostboot-18cc0dfbc93fd2342c5a35f3c8405e1d0a660a77.tar.gz talos-hostboot-18cc0dfbc93fd2342c5a35f3c8405e1d0a660a77.zip | |
Zeppelin BUP updates
- targeting: skip over ATTR_BAD_DQ_BITMAP during fapi attriubte dump
as it is not looked up correctly for cumulus.
Need to add it back in future.
- istep changes:
- remove p9_throttle_sync from istep 13, it is already getting
called in istep 14
- add support for memdiags on cumulus
- centaur pibrc errors: mask out PROTECTION_BIT for centaur scoms as it is
irrelevant for centaurs
- configureHbrtHypIds: correctly setup DMI information
Change-Id: Ifeaca2f58e16b7ecac9e1329409b98bc6a2f38e7
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/49382
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Thomas R. Sand <trsand@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/usr/fsiscom')
| -rw-r--r-- | src/usr/fsiscom/fsiscom.C | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/usr/fsiscom/fsiscom.C b/src/usr/fsiscom/fsiscom.C index 3db2e691f..9a35c9b62 100644 --- a/src/usr/fsiscom/fsiscom.C +++ b/src/usr/fsiscom/fsiscom.C @@ -191,6 +191,7 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType, bool need_unlock = false; size_t op_size = sizeof(uint32_t); mutex_t* l_mutex = NULL; + uint32_t l_any_error_bits = ANY_ERROR_BIT; do{ @@ -247,6 +248,13 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType, l_command = static_cast<uint32_t>(l_scomAddr & 0x000000007FFFFFFF); + if (i_target->getAttr<TARGETING::ATTR_TYPE>() == TARGETING::TYPE_MEMBUF) + { + //Protection bit is irrelevant for membuf chips + l_any_error_bits &= ~PROTECTION_CHECK; + } + + // use the chip-specific mutex attribute l_mutex = i_target->getHbMutexAttr<TARGETING::ATTR_FSI_SCOM_MUTEX>(); @@ -309,7 +317,7 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType, } // Check the status reg for errors - if( l_status & ANY_ERROR_BIT ) + if( l_status & l_any_error_bits ) { TRACFCOMP( g_trac_fsiscom, ERR_MRK"fsiScomPerformOp:Write: PCB/PIB error received: l_status=0x%X)", l_status); /*@ @@ -375,7 +383,7 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType, } // Check the status reg for errors - if( l_status & ANY_ERROR_BIT ) + if( l_status & l_any_error_bits ) { TRACFCOMP( g_trac_fsiscom, ERR_MRK"fsiScomPerformOp:Read: PCB/PIB error received: l_status=0x%0.8X)", l_status); |
