diff options
author | Chris Cain <cjcain@us.ibm.com> | 2015-11-19 12:27:03 -0600 |
---|---|---|
committer | William A. Bryan <wilbryan@us.ibm.com> | 2016-01-27 16:27:07 -0600 |
commit | 1cdc7f74cf7303b2d2e7e172b0e269928def09de (patch) | |
tree | bc88add88943f8389626a04c5219d0efc3d08f17 /src/occ_405/state.c | |
parent | 476a284b52f50c1d0f5a8fc637cc28a22c714185 (diff) | |
download | talos-occ-1cdc7f74cf7303b2d2e7e172b0e269928def09de.tar.gz talos-occ-1cdc7f74cf7303b2d2e7e172b0e269928def09de.zip |
Implement code to read DIMM temperatures
Change-Id: I98fc83ab1c78bd40241fe6e47a9ddeae24f78c38
RTC: 140093
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/22770
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Tested-by: FSP CI Jenkins
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Reviewed-by: Christopher Cain <cjcain@us.ibm.com>
Diffstat (limited to 'src/occ_405/state.c')
-rwxr-xr-x | src/occ_405/state.c | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/src/occ_405/state.c b/src/occ_405/state.c index 8cb1124..b784fa4 100755 --- a/src/occ_405/state.c +++ b/src/occ_405/state.c @@ -40,6 +40,7 @@ //#include "heartbeat.h" #include "scom.h" #include <fir_data_collect.h> +#include <dimm.h> extern proc_gpsm_dcm_sync_occfw_t G_proc_dcm_sync_state; extern bool G_mem_monitoring_allowed; @@ -135,37 +136,8 @@ errlHndl_t SMGR_standby_to_observation() l_error_logged = FALSE; TRAC_IMP("SMGR: Standby to Observation Transition Started"); -// TEMP -- NOT SUPPORTED YET IN PHASE1 -/* - //This flag is set if tmgt sends us at least one data set in the - //mem config data packet. No data sets will be sent for centaur ec less than 2.0 - //due to an intermittent hw failure that can occur on those chips. + memory_init(); - if(G_mem_monitoring_allowed) - { - if(!rtl_task_is_runnable(TASK_ID_CENTAUR_DATA)) - { - - TRAC_INFO("SMGR_standby_to_observation: calling centaur_init()"); - centaur_init(); //no rc, handles errors internally - - //check if centaur_init resulted in a reset - //since we don't have a return code from centaur_init. - if(isSafeStateRequested()) - { - TRAC_ERR("SMGR_standby_to_observation: OCC is being reset, centaur_init failed"); - } - else - { - //initialization was successful. - //Set task flags to allow centaur control task to run and - //also to prevent us from doing initialization again. - G_task_table[TASK_ID_CENTAUR_DATA].flags = CENTAUR_DATA_RTL_FLAGS; - G_task_table[TASK_ID_CENTAUR_CONTROL].flags = CENTAUR_CONTROL_RTL_FLAGS; - } - } - } -*/ // Set the RTL Flags to indicate which tasks can run // - Set OBSERVATION b/c we're in OBSERVATION State rtl_clr_run_mask_deferred(RTL_FLAG_STANDBY); |