summaryrefslogtreecommitdiffstats
path: root/src/occ_405/thread
diff options
context:
space:
mode:
authorShawn McCarney <shawnmm@us.ibm.com>2017-04-25 15:19:48 -0500
committerChristopher J. Cain <cjcain@us.ibm.com>2017-04-27 17:39:49 -0400
commitb227f22726bc2c51c65966c461f96b450875edd3 (patch)
tree3063a295560bad8bf22f30445f4a313b0ab13fde /src/occ_405/thread
parentc36fa46c1e2ab003f0b12c0e52ad7301b826ea38 (diff)
downloadtalos-occ-b227f22726bc2c51c65966c461f96b450875edd3.tar.gz
talos-occ-b227f22726bc2c51c65966c461f96b450875edd3.zip
OCC: Non-GPU Sensors to main memory: Phase 1
Performed the following sensor renames required by this RTC story: FREQA4MSP0Cy -> FREQACy UTIL4MSP0Cy -> UTILCy PWR250US -> PWRSYS PWR250USP0 -> PWRPROC Also renamed the following related symbols: * Associated sensor_t field names in the amec_sys_t data structure * Mini-sensor field names * Parent sensors that contain a vector iterating over renamed sensors Change-Id: I1e9e17661e5730ed6309fc7617c61bd973d2e44f Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39772 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: William A. Bryan <wilbryan@us.ibm.com> Reviewed-by: Martha Broyles <mbroyles@us.ibm.com> Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com>
Diffstat (limited to 'src/occ_405/thread')
-rwxr-xr-xsrc/occ_405/thread/chom.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/occ_405/thread/chom.c b/src/occ_405/thread/chom.c
index 0b27956..572941d 100755
--- a/src/occ_405/thread/chom.c
+++ b/src/occ_405/thread/chom.c
@@ -60,16 +60,16 @@ STATIC_ASSERT( sizeof(ChomLogData_t) > CHOM_LOG_DATA_MAX );
const uint16_t * g_chom_sensor_table[CHOM_NUM_OF_SENSORS] =
{ // Node total power (DC)
- &g_amec_sys.sys.pwr250us.sample,
+ &g_amec_sys.sys.pwrsys.sample,
// Socket power
- &g_amec_sys.proc[0].pwr250us.sample,
- &G_dcom_slv_outbox_rx[1].pwr250usp0,
- &G_dcom_slv_outbox_rx[2].pwr250usp0,
- &G_dcom_slv_outbox_rx[3].pwr250usp0,
- &G_dcom_slv_outbox_rx[4].pwr250usp0,
- &G_dcom_slv_outbox_rx[5].pwr250usp0,
- &G_dcom_slv_outbox_rx[6].pwr250usp0,
- &G_dcom_slv_outbox_rx[7].pwr250usp0,
+ &g_amec_sys.proc[0].pwrproc.sample,
+ &G_dcom_slv_outbox_rx[1].pwrproc,
+ &G_dcom_slv_outbox_rx[2].pwrproc,
+ &G_dcom_slv_outbox_rx[3].pwrproc,
+ &G_dcom_slv_outbox_rx[4].pwrproc,
+ &G_dcom_slv_outbox_rx[5].pwrproc,
+ &G_dcom_slv_outbox_rx[6].pwrproc,
+ &G_dcom_slv_outbox_rx[7].pwrproc,
// Memory power
&G_dcom_slv_outbox_rx[0].pwr250usmemp0,
&G_dcom_slv_outbox_rx[1].pwr250usmemp0,
@@ -82,23 +82,23 @@ const uint16_t * g_chom_sensor_table[CHOM_NUM_OF_SENSORS] =
// Fan power
&g_amec_sys.fan.pwr250usfan.sample,
// Processor frequency
- &G_dcom_slv_outbox_rx[0].freqa4msp0,
- &G_dcom_slv_outbox_rx[1].freqa4msp0,
- &G_dcom_slv_outbox_rx[2].freqa4msp0,
- &G_dcom_slv_outbox_rx[3].freqa4msp0,
- &G_dcom_slv_outbox_rx[4].freqa4msp0,
- &G_dcom_slv_outbox_rx[5].freqa4msp0,
- &G_dcom_slv_outbox_rx[6].freqa4msp0,
- &G_dcom_slv_outbox_rx[7].freqa4msp0,
+ &G_dcom_slv_outbox_rx[0].freqa,
+ &G_dcom_slv_outbox_rx[1].freqa,
+ &G_dcom_slv_outbox_rx[2].freqa,
+ &G_dcom_slv_outbox_rx[3].freqa,
+ &G_dcom_slv_outbox_rx[4].freqa,
+ &G_dcom_slv_outbox_rx[5].freqa,
+ &G_dcom_slv_outbox_rx[6].freqa,
+ &G_dcom_slv_outbox_rx[7].freqa,
// Processor utilization sensor
- &G_dcom_slv_outbox_rx[0].util4msp0,
- &G_dcom_slv_outbox_rx[1].util4msp0,
- &G_dcom_slv_outbox_rx[2].util4msp0,
- &G_dcom_slv_outbox_rx[3].util4msp0,
- &G_dcom_slv_outbox_rx[4].util4msp0,
- &G_dcom_slv_outbox_rx[5].util4msp0,
- &G_dcom_slv_outbox_rx[6].util4msp0,
- &G_dcom_slv_outbox_rx[7].util4msp0,
+ &G_dcom_slv_outbox_rx[0].util,
+ &G_dcom_slv_outbox_rx[1].util,
+ &G_dcom_slv_outbox_rx[2].util,
+ &G_dcom_slv_outbox_rx[3].util,
+ &G_dcom_slv_outbox_rx[4].util,
+ &G_dcom_slv_outbox_rx[5].util,
+ &G_dcom_slv_outbox_rx[6].util,
+ &G_dcom_slv_outbox_rx[7].util,
// Max Core temperature for all processors in the node
NULL,
// Max Centaur temperature for all Centaurs in the node
OpenPOWER on IntegriCloud