diff options
author | Richard Knight <rjknight@us.ibm.com> | 2014-10-27 18:14:07 -0500 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-11-17 12:02:50 -0600 |
commit | c64777ce5b38e87e02850bdbf480b100fe32df45 (patch) | |
tree | 774625afaa3ff2d03e0f4a12514ce1e84721459c /src/usr/hwas | |
parent | 87b7664dd21fe492c0ff70b86ea53a661216663e (diff) | |
download | talos-hostboot-c64777ce5b38e87e02850bdbf480b100fe32df45.tar.gz talos-hostboot-c64777ce5b38e87e02850bdbf480b100fe32df45.zip |
Update present/functional state for DIMMs/COREs/PROCs
add interfaces to handle updating various sensors
use new interfaces to update sensor state for
DIMM/CORE/PROC targets.
Change-Id: I71a5792f80617b1baa46319565c6742507a0b667
RTC:108827
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14207
Tested-by: Jenkins Server
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/hwas')
-rw-r--r-- | src/usr/hwas/common/deconfigGard.C | 24 | ||||
-rw-r--r-- | src/usr/hwas/hostbootIstep.C | 13 |
2 files changed, 34 insertions, 3 deletions
diff --git a/src/usr/hwas/common/deconfigGard.C b/src/usr/hwas/common/deconfigGard.C index d3d82a141..89ae8d235 100644 --- a/src/usr/hwas/common/deconfigGard.C +++ b/src/usr/hwas/common/deconfigGard.C @@ -39,6 +39,10 @@ #include <targeting/common/commontargeting.H> #include <targeting/common/utilFilter.H> +#include <ipmi/ipmisensor.H> +#include <config.h> + + // Trace definition #define __COMP_TD__ g_trac_deconf @@ -1415,7 +1419,27 @@ void DeconfigGard::_deconfigureTarget( //****************************************************************************** void DeconfigGard::_doDeconfigureActions(Target & i_target) { + // Placeholder for any necessary deconfigure actions + + +#ifdef CONFIG_BMC_IPMI + // set the BMC status for this target + SENSOR::StatusSensor l_sensor( &i_target ); + + // can assume the presence sensor is in the correct state, just + // assert that it is now non functional. + errlHndl_t err = l_sensor.setStatus( SENSOR::StatusSensor::NON_FUNCTIONAL ); + + if(err) + { + HWAS_ERR("Error returned from call to set sensor status for HUID 0x%x", + TARGETING::get_huid( &i_target) ); + err->collectTrace(HWAS_COMP_NAME, 512); + errlCommit(err, HWAS_COMP_ID); + } +#endif + } //****************************************************************************** diff --git a/src/usr/hwas/hostbootIstep.C b/src/usr/hwas/hostbootIstep.C index 5de7a739e..6c33c0a7c 100644 --- a/src/usr/hwas/hostbootIstep.C +++ b/src/usr/hwas/hostbootIstep.C @@ -62,6 +62,10 @@ #include <proc_enable_reconfig.H> + +#include <ipmi/ipmisensor.H> +#include <config.h> + namespace HWAS { @@ -94,8 +98,6 @@ void* host_set_ipl_parms( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "host_set_ipl_parms entry" ); errlHndl_t errl = NULL; - // stub -- nothing here currently - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "host_set_ipl_parms exit" ); return errl; @@ -130,8 +132,13 @@ void* host_discover_targets( void *io_pArgs ) errl = discoverTargets(); } +#ifdef CONFIG_BMC_IPMI + // send DIMM/CORE/PROC sensor status to the BMC + SENSOR::updateBMCSensorStatus(); +#endif + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "host_discover_targets exit" ); + "host_discover_targets exit" ); return errl; } |