diff options
| author | Richard J. Knight <rjknight@us.ibm.com> | 2015-02-19 19:13:17 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-02-25 08:46:01 -0600 |
| commit | d8695b5f685e0ed2de669892e8f33eb1164ca364 (patch) | |
| tree | 1f2cb637f78c2229506bbe47b53a23f5e88fa165 /src/usr/errl | |
| parent | db33d79e8497b59a0add7c74be2f2251f4cd0c1e (diff) | |
| download | talos-hostboot-d8695b5f685e0ed2de669892e8f33eb1164ca364.tar.gz talos-hostboot-d8695b5f685e0ed2de669892e8f33eb1164ca364.zip | |
Updates to support serverwiz2 sensor format
Change-Id: I2518f6e78197f8dc329641e38264a7878060509d
Depends-on: I09c95f470ca4748eeed568b71dc1c8b6e1c3ab76
RTC:124008
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15853
Tested-by: Jenkins Server
Reviewed-by: WILLIAM G. HOFFA <wghoffa@us.ibm.com>
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/errl')
| -rw-r--r-- | src/usr/errl/errlmanager_common.C | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/usr/errl/errlmanager_common.C b/src/usr/errl/errlmanager_common.C index aeec2fbd8..a64ed3beb 100644 --- a/src/usr/errl/errlmanager_common.C +++ b/src/usr/errl/errlmanager_common.C @@ -53,8 +53,8 @@ void ErrlManager::sendErrLogToBmc(errlHndl_t &io_err) // look thru the errlog for any Callout UserDetail sections // to determine the sensor information for the SEL - uint8_t l_sensorNumber = SENSOR::INVALID_SENSOR; - uint8_t l_sensorType = SENSOR::INVALID_SENSOR; + uint8_t l_sensorNumber = TARGETING::UTIL::INVALID_IPMI_SENSOR; + uint8_t l_sensorType = TARGETING::UTIL::INVALID_IPMI_SENSOR; HWAS::callOutPriority l_priority = HWAS::SRCI_PRIORITY_NONE; for(std::vector<ErrlUD*>::const_iterator it = io_err->iv_SectionVector.begin(); @@ -92,13 +92,20 @@ void ErrlManager::sendErrLogToBmc(errlHndl_t &io_err) } } // for each SectionVector -#if 0 -// TODO: RTC 119440 - if (l_sensorNumber != SENSOR::INVALID_SENSOR) + if (l_sensorNumber != TARGETING::UTIL::INVALID_IPMI_SENSOR) { - l_sensorType = SENSOR::getSensorType(l_sensorNumber); + uint8_t unused = 0; + errlHndl_t e = + SENSOR::SensorBase::getSensorType( l_sensorNumber, + l_sensorType, unused ); + if( e ) + { + TRACFCOMP(g_trac_errl, ERR_MRK"Failed to get sensor type for sensor %d",l_sensorNumber); + // since we are in the commit path, lets just delete this + // error and move on. + delete e; + } } -#endif // flatten into buffer, truncate to max eSEL size uint32_t l_pelSize = io_err->flattenedSize(); @@ -141,4 +148,4 @@ void ErrlManager::sendErrLogToBmc(errlHndl_t &io_err) #endif -} // end namespace
\ No newline at end of file +} // end namespace |
