diff options
author | mbroyles <mbroyles@us.ibm.com> | 2017-06-20 15:54:03 -0500 |
---|---|---|
committer | Martha Broyles <mbroyles@us.ibm.com> | 2017-06-26 16:22:54 -0400 |
commit | 0219f446e54ed2229c62355083cd040c97ab6d20 (patch) | |
tree | 2401afa85bdb4bf746ddf0ff4010edd83fa7276c /src/occ_405 | |
parent | 99f068dfe8a9927a3d48a34fa02e3ef8acdca4b3 (diff) | |
download | talos-occ-0219f446e54ed2229c62355083cd040c97ab6d20.tar.gz talos-occ-0219f446e54ed2229c62355083cd040c97ab6d20.zip |
Remove time from sensor names
Change-Id: Ic6b8892285610985a80c623b6da35d2766926f4d
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42161
Reviewed-by: Andres A. Lugo-Reyes <aalugore@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com>
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Diffstat (limited to 'src/occ_405')
-rw-r--r-- | src/occ_405/amec/amec_controller.c | 4 | ||||
-rwxr-xr-x | src/occ_405/amec/amec_dps.c | 2 | ||||
-rwxr-xr-x | src/occ_405/amec/amec_freq.c | 8 | ||||
-rwxr-xr-x | src/occ_405/amec/amec_health.c | 2 | ||||
-rw-r--r-- | src/occ_405/amec/amec_init.c | 27 | ||||
-rwxr-xr-x | src/occ_405/amec/amec_master_smh.c | 14 | ||||
-rw-r--r-- | src/occ_405/amec/amec_sensors_centaur.c | 30 | ||||
-rwxr-xr-x | src/occ_405/amec/amec_sensors_core.c | 14 | ||||
-rwxr-xr-x | src/occ_405/amec/amec_sensors_power.c | 18 | ||||
-rwxr-xr-x | src/occ_405/amec/amec_slave_smh.c | 2 | ||||
-rwxr-xr-x | src/occ_405/amec/amec_sys.h | 9 | ||||
-rwxr-xr-x | src/occ_405/arl_test.c | 2 | ||||
-rwxr-xr-x | src/occ_405/arl_test_data.h | 2 | ||||
-rwxr-xr-x | src/occ_405/cmdh/cmdh_fsp_cmds.c | 2 | ||||
-rwxr-xr-x | src/occ_405/cmdh/cmdh_fsp_cmds_datacnfg.c | 28 | ||||
-rwxr-xr-x | src/occ_405/dcom/dcom.h | 4 | ||||
-rwxr-xr-x | src/occ_405/sensor/sensor_enum.h | 877 | ||||
-rwxr-xr-x | src/occ_405/sensor/sensor_info.c | 139 | ||||
-rwxr-xr-x | src/occ_405/sensor/sensor_table.c | 261 |
19 files changed, 657 insertions, 788 deletions
diff --git a/src/occ_405/amec/amec_controller.c b/src/occ_405/amec/amec_controller.c index 25901c7..2154d07 100644 --- a/src/occ_405/amec/amec_controller.c +++ b/src/occ_405/amec/amec_controller.c @@ -291,8 +291,8 @@ void amec_controller_centaur_thermal() /*------------------------------------------------------------------------*/ /* Code */ /*------------------------------------------------------------------------*/ - // Get TEMP2MSCENT sensor value - l_sensor = getSensorByGsid(TEMP2MSCENT); + // Get TEMPCENT sensor value + l_sensor = getSensorByGsid(TEMPCENT); if(G_cent_temp_expired_bitmap) { diff --git a/src/occ_405/amec/amec_dps.c b/src/occ_405/amec/amec_dps.c index ac6aff7..6f5ff15 100755 --- a/src/occ_405/amec/amec_dps.c +++ b/src/occ_405/amec/amec_dps.c @@ -354,7 +354,7 @@ void amec_dps_main(void) if (CORE_PRESENT(l_idx)) { G_dcom_slv_outbox_tx.factual = - AMECSENSOR_ARRAY_PTR(FREQ250USP0C0,l_idx)->sample; + AMECSENSOR_ARRAY_PTR(FREQREQC0,l_idx)->sample; break; } } diff --git a/src/occ_405/amec/amec_freq.c b/src/occ_405/amec/amec_freq.c index 4d0be6b..8b7eb26 100755 --- a/src/occ_405/amec/amec_freq.c +++ b/src/occ_405/amec/amec_freq.c @@ -487,7 +487,7 @@ void amec_slv_proc_voting_box(void) } // Update the sensor telling us what the requested frequency is - sensor_update( AMECSENSOR_ARRAY_PTR(FREQ250USP0C0,k), + sensor_update( AMECSENSOR_ARRAY_PTR(FREQREQC0,k), (uint16_t) g_amec->proc[0].core[k].f_request); #if DEBUG_PROC_VOTING_BOX @@ -878,9 +878,9 @@ void amec_slv_check_perf(void) G_sysConfigData.pcap.system_pcap ); TRAC_ERR("SnrFanPwr %d, SnrIOPwr %d, SnrStoragePwr %d, SnrGpuPrw %d ", - AMECSENSOR_PTR(PWR250USFAN)->sample, - AMECSENSOR_PTR(PWR250USIO)->sample, - AMECSENSOR_PTR(PWR250USSTORE)->sample, + AMECSENSOR_PTR(PWRFAN)->sample, + AMECSENSOR_PTR(PWRIO)->sample, + AMECSENSOR_PTR(PWRSTORE)->sample, AMECSENSOR_PTR(PWRGPU)->sample ); TRAC_ERR("SnrProcPwr 0 %d, SnrProcPwr 1 %d, SnrProcPwr 2 %d, SnrProcPwr 3 %d", diff --git a/src/occ_405/amec/amec_health.c b/src/occ_405/amec/amec_health.c index 0f0edf7..1d026d2 100755 --- a/src/occ_405/amec/amec_health.c +++ b/src/occ_405/amec/amec_health.c @@ -513,7 +513,7 @@ void amec_health_check_cent_temp() } l_ot_error = g_amec->thermalcent.ot_error; - l_sensor = getSensorByGsid(TEMP2MSCENT); + l_sensor = getSensorByGsid(TEMPCENT); l_cur_temp = l_sensor->sample; l_max_temp = l_sensor->sample_max; TRAC_ERR("amec_health_check_cent_temp: Centaur reached error temp[%d]. cur_max[%d], hist_max[%d] bitmap[0x%02X]", diff --git a/src/occ_405/amec/amec_init.c b/src/occ_405/amec/amec_init.c index ceaf360..656edc6 100644 --- a/src/occ_405/amec/amec_init.c +++ b/src/occ_405/amec/amec_init.c @@ -191,12 +191,12 @@ void amec_init_vector_sensors(void) FREQAC0); //----------------------------------------------------- - // IPS4MSP0 Vector Sensor + // IPS Vector Sensor //----------------------------------------------------- - amec_vectorize_core_sensor(AMECSENSOR_PTR(IPS4MSP0), + amec_vectorize_core_sensor(AMECSENSOR_PTR(IPS), &g_amec_sys.proc[0].ips4ms_vector, VECTOR_OP_AVG, - IPS4MSP0C0); + IPSC0); //----------------------------------------------------- // TEMPPROCTHRM Vector Sensor @@ -214,27 +214,6 @@ void amec_init_vector_sensors(void) VECTOR_OP_AVG, UTILC0); -//TODO: Centaur support RTC 163359 -//Re-enable with error checking when centaur support is added -#if 0 - int l_rc = 0, l_idx = 0, l_idx2 = 0; // Used to index the for loops for vector create - //----------------------------------------------------- - // MEMSP2MSP0 Vector Sensor - //----------------------------------------------------- - sensor_vectorize(AMECSENSOR_PTR(MEMSP2MSP0), - &g_amec_sys.proc[0].memsp2ms_vector, - VECTOR_OP_MIN); - - for(l_idx=0; l_idx<MAX_NUM_MEM_CONTROLLERS; l_idx++) - { - for(l_idx2=0; l_idx2<NUM_PORT_PAIRS_PER_CENTAUR; l_idx2++) - { - sensor_vector_elem_add(AMECSENSOR_PTR(MEMSP2MSP0)->vector, - l_idx, - AMECSENSOR_2D_ARRAY_PTR(MEMSP2MSPM0C0P0,l_idx, l_idx2)); - } - } -#endif } // Function Specification diff --git a/src/occ_405/amec/amec_master_smh.c b/src/occ_405/amec/amec_master_smh.c index 244bde5..9fce8ef 100755 --- a/src/occ_405/amec/amec_master_smh.c +++ b/src/occ_405/amec/amec_master_smh.c @@ -473,16 +473,16 @@ void amec_mst_check_under_pcap(void) if(G_over_cap_count >= PCAP_FAILURE_THRESHOLD) { TRAC_ERR("Failure to maintain power cap: Power Cap = %d ," - "PWRSYS = %d ,PWRPROC = %d ,PWR250USFAN = %d ," - "PWR250USMEM0 = %d",g_amec->pcap.active_node_pcap, + "PWRSYS = %d ,PWRPROC = %d ,PWRFAN = %d ," + "PWRMEM = %d",g_amec->pcap.active_node_pcap, AMECSENSOR_PTR(PWRSYS)->sample, AMECSENSOR_PTR(PWRPROC)->sample, - AMECSENSOR_PTR(PWR250USFAN)->sample, - AMECSENSOR_PTR(PWR250USMEM0)->sample); + AMECSENSOR_PTR(PWRFAN)->sample, + AMECSENSOR_PTR(PWRMEM)->sample); - TRAC_ERR("PWR250USIO = %d , PWR250USSTORE = %d, PWRGPU = %d", - AMECSENSOR_PTR(PWR250USIO)->sample, - AMECSENSOR_PTR(PWR250USSTORE)->sample, + TRAC_ERR("PWRIO = %d , PWRSTORE = %d, PWRGPU = %d", + AMECSENSOR_PTR(PWRIO)->sample, + AMECSENSOR_PTR(PWRSTORE)->sample, AMECSENSOR_PTR(PWRGPU)->sample); /* @ diff --git a/src/occ_405/amec/amec_sensors_centaur.c b/src/occ_405/amec/amec_sensors_centaur.c index 1138400..9749a3f 100644 --- a/src/occ_405/amec/amec_sensors_centaur.c +++ b/src/occ_405/amec/amec_sensors_centaur.c @@ -468,7 +468,7 @@ void amec_perfcount_getmc( MemData * i_sensor_cache, } // --------------------------------------------------------------------------- - // Interim Calculation: MWR2MSP0Mx (0.01 Mrps) Memory write requests per sec + // Interim Calculation: MWRMx (0.01 Mrps) Memory write requests per sec // --------------------------------------------------------------------------- // Extract write bandwidth @@ -483,7 +483,7 @@ void amec_perfcount_getmc( MemData * i_sensor_cache, g_amec->proc[0].memctl[i_centaur].centaur.portpair[i_mc_id].perf.memwrite2ms = tempreg; // ------------------------------------------------------------------------- - // Interim Calculation: MRD2MSP0Mx (0.01 Mrps) Memory read requests per sec + // Interim Calculation: MRDMx (0.01 Mrps) Memory read requests per sec // ------------------------------------------------------------------------- // Extract read bandwidth @@ -510,7 +510,7 @@ void amec_perfcount_getmc( MemData * i_sensor_cache, } // ---------------------------------------------------------------- - // Sensor: MPU2MSP0Mx (0.01 Mrps) Memory power-up requests per sec + // Sensor: MPUMx (0.01 Mrps) Memory power-up requests per sec // ---------------------------------------------------------------- // Extract power up count temp32new = (templ); // left shift into top 20 bits of 32 bits @@ -523,7 +523,7 @@ void amec_perfcount_getmc( MemData * i_sensor_cache, sensor_update(AMECSENSOR_PORTPAIR_PTR(mpu2ms,i_centaur,i_mc_id), tempreg); // ------------------------------------------------------------------- - // Sensor: MAC2MSP0Mx (0.01 Mrps) Memory activation requests per sec + // Sensor: MACMx (0.01 Mrps) Memory activation requests per sec // ------------------------------------------------------------------- // Extract activation count temp32 = templ; @@ -538,7 +538,7 @@ void amec_perfcount_getmc( MemData * i_sensor_cache, sensor_update(AMECSENSOR_PORTPAIR_PTR(mac2ms,i_centaur,i_mc_id), tempreg); // -------------------------------------------------------------------------- - // Sensor: MTS2MS (count) Last received Timestamp (frame count) from Centaur + // Sensor: MTS (count) Last received Timestamp (frame count) from Centaur // -------------------------------------------------------------------------- // Extract framecount (clock is 266.6666666MHz * 0.032 / 4096)=2083. temp32new = l_sensor_cache->scache.frame_count; @@ -562,7 +562,7 @@ void amec_perfcount_getmc( MemData * i_sensor_cache, templ = l_sensor_cache->scache.mba23_cache_hits_wr; } // ---------------------------------------------------------------------- - // Sensor: M4RD2MS (0.01 Mrps) Memory cached (L4) read requests per sec + // Sensor: M4RD (0.01 Mrps) Memory cached (L4) read requests per sec // ---------------------------------------------------------------------- temp32new = (tempu); // left shift into top 20 bits of 32 bits temp32 = temp32new - g_amec->proc[0].memctl[i_centaur].centaur.portpair[i_mc_id].perf.l4_rd_cnt_accum; @@ -583,7 +583,7 @@ void amec_perfcount_getmc( MemData * i_sensor_cache, sensor_update(AMECSENSOR_PORTPAIR_PTR(m4rd2ms,i_centaur,i_mc_id), tempreg); // ----------------------------------------------------------------------- - // Sensor: M4WR2MS (0.01 Mrps) Memory cached (L4) write requests per sec + // Sensor: M4WR (0.01 Mrps) Memory cached (L4) write requests per sec // ----------------------------------------------------------------------- temp32new = (templ); // left shift into top 20 bits of 32 bits temp32 = temp32new - g_amec->proc[0].memctl[i_centaur].centaur.portpair[i_mc_id].perf.l4_wr_cnt_accum; @@ -605,7 +605,7 @@ void amec_perfcount_getmc( MemData * i_sensor_cache, sensor_update(AMECSENSOR_PORTPAIR_PTR(m4wr2ms,i_centaur,i_mc_id), tempreg); // ------------------------------------------------------------------------------ - // Sensor: MIRB2MS (0.01 Mevents/s) Memory Inter-request arrival idle intervals + // Sensor: MIRB (0.01 Mevents/s) Memory Inter-request arrival idle intervals // ------------------------------------------------------------------------------ temp32new = (i_mc_id == 0) ? l_sensor_cache->scache.mba01_intreq_arr_cnt_base : l_sensor_cache->scache.mba23_intreq_arr_cnt_base; temp32 = temp32new - g_amec->proc[0].memctl[i_centaur].centaur.portpair[i_mc_id].perf.intreq_base_accum; @@ -617,7 +617,7 @@ void amec_perfcount_getmc( MemData * i_sensor_cache, sensor_update(AMECSENSOR_PORTPAIR_PTR(mirb2ms,i_centaur,i_mc_id), tempreg); // -------------------------------------------------------------------------------------------------------- - // Sensor: MIRL2MS (0.01 Mevents/s) Memory Inter-request arrival idle intervals longer than low threshold + // Sensor: MIRL (0.01 Mevents/s) Memory Inter-request arrival idle intervals longer than low threshold // -------------------------------------------------------------------------------------------------------- temp32new = (i_mc_id == 0) ? l_sensor_cache->scache.mba01_intreq_arr_cnt_low : l_sensor_cache->scache.mba23_intreq_arr_cnt_low; temp32 = temp32new - g_amec->proc[0].memctl[i_centaur].centaur.portpair[i_mc_id].perf.intreq_low_accum; @@ -629,7 +629,7 @@ void amec_perfcount_getmc( MemData * i_sensor_cache, sensor_update(AMECSENSOR_PORTPAIR_PTR(mirl2ms,i_centaur,i_mc_id), tempreg); // ----------------------------------------------------------------------------------------------------------- - // Sensor: MIRM2MS (0.01 Mevents/s) Memory Inter-request arrival idle intervals longer than medium threshold + // Sensor: MIRM (0.01 Mevents/s) Memory Inter-request arrival idle intervals longer than medium threshold // ----------------------------------------------------------------------------------------------------------- temp32new = (i_mc_id == 0) ? l_sensor_cache->scache.mba01_intreq_arr_cnt_med : l_sensor_cache->scache.mba23_intreq_arr_cnt_med; temp32 = temp32new - g_amec->proc[0].memctl[i_centaur].centaur.portpair[i_mc_id].perf.intreq_med_accum; @@ -641,7 +641,7 @@ void amec_perfcount_getmc( MemData * i_sensor_cache, sensor_update(AMECSENSOR_PORTPAIR_PTR(mirm2ms,i_centaur,i_mc_id), tempreg); // --------------------------------------------------------------------------------------------------------- - // Sensor: MIRH2MS (0.01 Mevents/s) Memory Inter-request arrival idle intervals longer than high threshold + // Sensor: MIRH (0.01 Mevents/s) Memory Inter-request arrival idle intervals longer than high threshold // --------------------------------------------------------------------------------------------------------- temp32new = (i_mc_id == 0) ? l_sensor_cache->scache.mba01_intreq_arr_cnt_high : l_sensor_cache->scache.mba23_intreq_arr_cnt_high; temp32 = temp32new - g_amec->proc[0].memctl[i_centaur].centaur.portpair[i_mc_id].perf.intreq_high_accum; @@ -654,7 +654,7 @@ void amec_perfcount_getmc( MemData * i_sensor_cache, } // -------------------------------------------------------------------------------------------------------------- - // Sensor: MIRC2MS (0.01 Mevents/s) Memory Inter-request arrival idle interval longer than programmed threshold + // Sensor: MIRC (0.01 Mevents/s) Memory Inter-request arrival idle interval longer than programmed threshold // -------------------------------------------------------------------------------------------------------------- temp32new = l_sensor_cache->scache.intreq_arr_cnt_high_latency; temp32 = temp32new - g_amec->proc[0].memctl[i_centaur].centaur.perf.intreq_highlatency_accum; @@ -666,7 +666,7 @@ void amec_perfcount_getmc( MemData * i_sensor_cache, sensor_update((&(g_amec->proc[0].memctl[i_centaur].centaur.mirc2ms)), tempreg); // ---------------------------------------------------- - // Sensor: MLP2MS (events/s) Number of LP2 exits + // Sensor: MLP2 (events/s) Number of LP2 exits // ---------------------------------------------------- temp32new = l_sensor_cache->scache.lp2_exits; temp32 = temp32new - g_amec->proc[0].memctl[i_centaur].centaur.perf.lp2exit_accum; @@ -678,14 +678,14 @@ void amec_perfcount_getmc( MemData * i_sensor_cache, sensor_update((&(g_amec->proc[0].memctl[i_centaur].centaur.mlp2ms)), tempreg); // ------------------------------------------------------------ - // Sensor: MRD2MSP0Mx (0.01 Mrps) Memory read requests per sec + // Sensor: MRDMx (0.01 Mrps) Memory read requests per sec // ------------------------------------------------------------ tempreg = g_amec->proc[0].memctl[i_centaur].centaur.portpair[0].perf.memread2ms; tempreg += g_amec->proc[0].memctl[i_centaur].centaur.portpair[1].perf.memread2ms; sensor_update( (&(g_amec->proc[0].memctl[i_centaur].mrd2ms)), tempreg); // ------------------------------------------------------------- - // Sensor: MWR2MSP0Mx (0.01 Mrps) Memory write requests per sec + // Sensor: MWRMx (0.01 Mrps) Memory write requests per sec // ------------------------------------------------------------- tempreg = g_amec->proc[0].memctl[i_centaur].centaur.portpair[0].perf.memwrite2ms; tempreg += g_amec->proc[0].memctl[i_centaur].centaur.portpair[1].perf.memwrite2ms; diff --git a/src/occ_405/amec/amec_sensors_core.c b/src/occ_405/amec/amec_sensors_core.c index e9fab2b..6dd6dfb 100755 --- a/src/occ_405/amec/amec_sensors_core.c +++ b/src/occ_405/amec/amec_sensors_core.c @@ -529,7 +529,7 @@ void amec_calc_freq_and_util_sensors(CoreData * i_core_data_ptr, uint8_t i_core) } // Update Sensor for this core - sensor_update( AMECSENSOR_ARRAY_PTR(NOTBZE4MSP0C0,i_core), (uint16_t) temp32); + sensor_update( AMECSENSOR_ARRAY_PTR(NOTBZEC0,i_core), (uint16_t) temp32); temp32 = i_core_data_ptr->empath.freq_sens_finish; temp32a = g_amec->proc[0].core[i_core].prev_FREQ_SENS_FINISH; @@ -543,14 +543,14 @@ void amec_calc_freq_and_util_sensors(CoreData * i_core_data_ptr, uint8_t i_core) } // Update Sensor for this core - sensor_update( AMECSENSOR_ARRAY_PTR(NOTFIN4MSP0C0,i_core), (uint16_t) temp32); + sensor_update( AMECSENSOR_ARRAY_PTR(NOTFINC0,i_core), (uint16_t) temp32); // ------------------------------------------------------ // Per Core Normalized Average Utilization // ------------------------------------------------------ // <amec_formula> // Result: Calculated Normalized Average Core Utilization - // Sensor: NUTIL3SP0C0 + // Sensor: NUTILC0 // Timescale: 4ms (3s rolling average) // Units: 0.01 % // Min/Max: 0/10000 (0/100%) @@ -611,11 +611,11 @@ void amec_calc_freq_and_util_sensors(CoreData * i_core_data_ptr, uint8_t i_core) // Update sensor for this core if(l_core_sleep_winkle) { - sensor_update(AMECSENSOR_ARRAY_PTR(NUTIL3SP0C0, i_core), 0); + sensor_update(AMECSENSOR_ARRAY_PTR(NUTILC0, i_core), 0); } else { - sensor_update(AMECSENSOR_ARRAY_PTR(NUTIL3SP0C0, i_core), (uint16_t)temp32); + sensor_update(AMECSENSOR_ARRAY_PTR(NUTILC0, i_core), (uint16_t)temp32); } } } @@ -740,7 +740,7 @@ void amec_calc_ips_sensors(CoreData * i_core_data_ptr, uint8_t i_core) // ------------------------------------------------------ // <amec_formula> // Result: Calculated Instructions per Second - // Sensor: IPS4MSP0C0 + // Sensor: IPSC0 // Timescale: 4ms // Units: 0.2Mips // Min/Max: ? @@ -765,7 +765,7 @@ void amec_calc_ips_sensors(CoreData * i_core_data_ptr, uint8_t i_core) { temp32 = 0; } - sensor_update( AMECSENSOR_ARRAY_PTR(IPS4MSP0C0,i_core), (uint16_t) temp32); + sensor_update( AMECSENSOR_ARRAY_PTR(IPSC0,i_core), (uint16_t) temp32); } /*----------------------------------------------------------------------------*/ diff --git a/src/occ_405/amec/amec_sensors_power.c b/src/occ_405/amec/amec_sensors_power.c index 1363a78..2233738 100755 --- a/src/occ_405/amec/amec_sensors_power.c +++ b/src/occ_405/amec/amec_sensors_power.c @@ -279,12 +279,6 @@ void amec_update_apss_sensors(void) // divide by 10 to get it to centiUnits (0.01) // divide by 100 to get it to deciUnits (0.1) // divide by 1000 to get it to Units (1) - // Vdd has both a power and a current sensor, we convert the Vdd power - // to Watts and the current to centiAmps - temp32 = ((l_vdd * l_bulk_voltage)+ADCMULT_ROUND)/ADCMULT_TO_UNITS; - sensor_update( AMECSENSOR_PTR(PWR250USVDD0), (uint16_t)temp32); - temp32 = ((l_vcs_vio_vpcie * l_bulk_voltage)+ADCMULT_ROUND)/ADCMULT_TO_UNITS; - sensor_update( AMECSENSOR_PTR(PWRVCSVIOVDN), (uint16_t)temp32); // ---------------------------------------------------- // Convert Other Raw Misc Power from APSS into sensors @@ -294,14 +288,14 @@ void amec_update_apss_sensors(void) temp32 = ADC_CONVERTED_VALUE(G_sysConfigData.apss_adc_map.fans[0]); temp32 += ADC_CONVERTED_VALUE(G_sysConfigData.apss_adc_map.fans[1]); temp32 = ((temp32 * l_bulk_voltage)+ADCMULT_ROUND)/ADCMULT_TO_UNITS; - sensor_update( AMECSENSOR_PTR(PWR250USFAN), (uint16_t)temp32); + sensor_update( AMECSENSOR_PTR(PWRFAN), (uint16_t)temp32); // I/O: Add up all I/O channels temp32 = ADC_CONVERTED_VALUE(G_sysConfigData.apss_adc_map.io[0]); temp32 += ADC_CONVERTED_VALUE(G_sysConfigData.apss_adc_map.io[1]); temp32 += ADC_CONVERTED_VALUE(G_sysConfigData.apss_adc_map.io[2]); temp32 = ((temp32 * l_bulk_voltage)+ADCMULT_ROUND)/ADCMULT_TO_UNITS; - sensor_update( AMECSENSOR_PTR(PWR250USIO), (uint16_t)temp32); + sensor_update( AMECSENSOR_PTR(PWRIO), (uint16_t)temp32); // Memory: Add up all channels for the same processor. temp32 = ADC_CONVERTED_VALUE(G_sysConfigData.apss_adc_map.memory[l_proc][0]); @@ -314,7 +308,7 @@ void amec_update_apss_sensors(void) temp32 += ADC_CONVERTED_VALUE(G_sysConfigData.apss_adc_map.mem_cache); } temp32 = ((temp32 * l_bulk_voltage)+ADCMULT_ROUND)/ADCMULT_TO_UNITS; - sensor_update( AMECSENSOR_PTR(PWR250USMEM0), (uint16_t)temp32); + sensor_update( AMECSENSOR_PTR(PWRMEM), (uint16_t)temp32); // Save off the combined power from all memory for (l_idx=0; l_idx < MAX_NUM_CHIP_MODULES; l_idx++) @@ -330,7 +324,7 @@ void amec_update_apss_sensors(void) temp32 = ADC_CONVERTED_VALUE(G_sysConfigData.apss_adc_map.storage_media[0]); temp32 += ADC_CONVERTED_VALUE(G_sysConfigData.apss_adc_map.storage_media[1]); temp32 = ((temp32 * l_bulk_voltage)+ADCMULT_ROUND)/ADCMULT_TO_UNITS; - sensor_update( AMECSENSOR_PTR(PWR250USSTORE), (uint16_t)temp32); + sensor_update( AMECSENSOR_PTR(PWRSTORE), (uint16_t)temp32); // Save total GPU adapter for this proc if (l_proc < MAX_GPU_DOMAINS) @@ -382,7 +376,7 @@ void amec_update_apss_sensors(void) //Calculate average of all the OCCs. l_allOccAvgFreqOver250us /= l_presentOCCs; - // Save the max and min pwr250us sensors and keep an accumulator of the + // Save the max and min pwr sensors and keep an accumulator of the // average frequency over 30 seconds. if (g_pwr250us_over30sec.count == 0) { @@ -650,7 +644,7 @@ void amec_update_avsbus_sensors(void) { // Update sensor with the OT status (0 / 1) uint16_t otStatus = process_avsbus_status(); - sensor_update(AMECSENSOR_PTR(VRFAN), otStatus); + sensor_update(AMECSENSOR_PTR(VRMPROCOT), otStatus); } // Back to reading currents initiate_avsbus_reads(AVSBUS_CURRENT); diff --git a/src/occ_405/amec/amec_slave_smh.c b/src/occ_405/amec/amec_slave_smh.c index 56fcd76..841c699 100755 --- a/src/occ_405/amec/amec_slave_smh.c +++ b/src/occ_405/amec/amec_slave_smh.c @@ -404,7 +404,7 @@ void amec_slv_state_0(void) sensor_vector_update(AMECSENSOR_PTR(TEMPPROCAVG), 1); sensor_vector_update(AMECSENSOR_PTR(TEMPPROCTHRM), 1); sensor_vector_update(AMECSENSOR_PTR(FREQA), 1); - sensor_vector_update(AMECSENSOR_PTR(IPS4MSP0), 1); + sensor_vector_update(AMECSENSOR_PTR(IPS), 1); sensor_vector_update(AMECSENSOR_PTR(UTIL), 1); // Call the trace function for 2ms tracing if it has been configured via diff --git a/src/occ_405/amec/amec_sys.h b/src/occ_405/amec/amec_sys.h index d3127df..74b2812 100755 --- a/src/occ_405/amec/amec_sys.h +++ b/src/occ_405/amec/amec_sys.h @@ -126,7 +126,6 @@ typedef struct typedef struct { // Sensors - sensor_t uvolt250us; sensor_t volt250us; } amec_vrm_t; @@ -181,7 +180,6 @@ typedef struct sensor_t mirm2ms; sensor_t mirh2ms; sensor_t mts2ms; - sensor_t memsp2ms; sensor_t m4rd2ms; sensor_t m4wr2ms; @@ -294,9 +292,6 @@ typedef struct sensor_t util; sensor_t nutil3s; sensor_t mstl2ms; - sensor_t cmt2ms; - sensor_t ppic; - sensor_t pwrpx250us; sensor_t tempc; sensor_t stopdeepreqc; sensor_t stopdeepactc; @@ -451,14 +446,11 @@ typedef struct vectorSensor_t freqa_vector; sensor_t ips4ms; vectorSensor_t ips4ms_vector; - sensor_t memsp2ms; - vectorSensor_t memsp2ms_vector; sensor_t pwrproc; sensor_t pwr250usvdd; sensor_t curvdd; sensor_t pwrvcsviovdn; sensor_t pwr250usmem; - sensor_t sp250us; sensor_t tempprocavg; vectorSensor_t temp4ms_vector; sensor_t tempprocthermal; @@ -470,7 +462,6 @@ typedef struct // Memory Summary Sensors sensor_t temp2mscent; sensor_t tempdimmthrm; - sensor_t memsp2ms_tls; sensor_t mempwrthrot; sensor_t memotthrot; diff --git a/src/occ_405/arl_test.c b/src/occ_405/arl_test.c index d697c5b..d6935a3 100755 --- a/src/occ_405/arl_test.c +++ b/src/occ_405/arl_test.c @@ -67,7 +67,7 @@ void arl_test(void) temp32 = temp32 << 8; // Shift left 8 bits (raw value is < 2^24) temp32a = 64000; // Divide by 64000 to convert to frequency sensor in 1MHz increments temp32 = temp32 / temp32a; - gpRTL->FREQ250USP0C0=(UINT16)temp32; // Write to frequency sensor + gpRTL->FREQREQC0=(UINT16)temp32; // Write to frequency sensor // Debug code to inject data into SCOMs for per thread information diff --git a/src/occ_405/arl_test_data.h b/src/occ_405/arl_test_data.h index 6e660b3..b8ba534 100755 --- a/src/occ_405/arl_test_data.h +++ b/src/occ_405/arl_test_data.h @@ -77,7 +77,7 @@ typedef struct UINT32 utilcounter[MAX_THREADS]; // base counter for synthesizing per thread utilization (value written to SCOMs every 250usec) UINT32 utilincrement[MAX_THREADS]; // increment for synthesizing per thread utilization (cycles per 250usec with run latch on) UINT16 util2ms_thread[MAX_THREADS]; // array of utilization sensors for P0 Core 0 (0.01% increments) - UINT16 FREQ250USP0C0; // actual frequency sensor for P0 Core 0 (1MHz increments) + UINT16 FREQREQC0; // requested actual frequency sensor for P0 Core 0 (1MHz increments) } sRTLData_t; diff --git a/src/occ_405/cmdh/cmdh_fsp_cmds.c b/src/occ_405/cmdh/cmdh_fsp_cmds.c index 9dac133..c047d15 100755 --- a/src/occ_405/cmdh/cmdh_fsp_cmds.c +++ b/src/occ_405/cmdh/cmdh_fsp_cmds.c @@ -336,7 +336,7 @@ ERRL_RC cmdh_poll_v20(cmdh_fsp_rsp_t * o_rsp_ptr) if (G_vrm_thermal_monitoring) { // Add VRFAN - const sensor_t *vrfan = getSensorByGsid(VRFAN); + const sensor_t *vrfan = getSensorByGsid(VRMPROCOT); if (vrfan != NULL) { l_tempSensorList[l_sensorHeader.count].id = G_sysConfigData.proc_huid; diff --git a/src/occ_405/cmdh/cmdh_fsp_cmds_datacnfg.c b/src/occ_405/cmdh/cmdh_fsp_cmds_datacnfg.c index ab91db3..37f66c9 100755 --- a/src/occ_405/cmdh/cmdh_fsp_cmds_datacnfg.c +++ b/src/occ_405/cmdh/cmdh_fsp_cmds_datacnfg.c @@ -656,27 +656,7 @@ void apss_store_ipmi_sensor_id(const uint16_t i_channel, const apss_cfg_adc_v20_ case ADC_MEMORY_PROC_3: if (l_proc == (i_adc->assignment - ADC_MEMORY_PROC_0)) { - AMECSENSOR_PTR(PWR250USMEM0)->ipmi_sid = i_adc->ipmisensorId; - } - break; - case ADC_VDD_PROC_0: - case ADC_VDD_PROC_1: - case ADC_VDD_PROC_2: - case ADC_VDD_PROC_3: - if (l_proc == (i_adc->assignment - ADC_VDD_PROC_0)) - { - AMECSENSOR_PTR(PWR250USVDD0)->ipmi_sid = i_adc->ipmisensorId; - } - - break; - - case ADC_VCS_VIO_VPCIE_PROC_0: - case ADC_VCS_VIO_VPCIE_PROC_1: - case ADC_VCS_VIO_VPCIE_PROC_2: - case ADC_VCS_VIO_VPCIE_PROC_3: - if (l_proc == (i_adc->assignment - ADC_VCS_VIO_VPCIE_PROC_0)) - { - AMECSENSOR_PTR(PWRVCSVIOVDN)->ipmi_sid = i_adc->ipmisensorId; + AMECSENSOR_PTR(PWRMEM)->ipmi_sid = i_adc->ipmisensorId; } break; @@ -685,7 +665,7 @@ void apss_store_ipmi_sensor_id(const uint16_t i_channel, const apss_cfg_adc_v20_ case ADC_IO_C: if (i_adc->ipmisensorId != 0) { - AMECSENSOR_PTR(PWR250USIO)->ipmi_sid = i_adc->ipmisensorId; + AMECSENSOR_PTR(PWRIO)->ipmi_sid = i_adc->ipmisensorId; } break; @@ -693,7 +673,7 @@ void apss_store_ipmi_sensor_id(const uint16_t i_channel, const apss_cfg_adc_v20_ case ADC_FANS_B: if (i_adc->ipmisensorId != 0) { - AMECSENSOR_PTR(PWR250USFAN)->ipmi_sid = i_adc->ipmisensorId; + AMECSENSOR_PTR(PWRFAN)->ipmi_sid = i_adc->ipmisensorId; } break; @@ -701,7 +681,7 @@ void apss_store_ipmi_sensor_id(const uint16_t i_channel, const apss_cfg_adc_v20_ case ADC_STORAGE_B: if (i_adc->ipmisensorId != 0) { - AMECSENSOR_PTR(PWR250USSTORE)->ipmi_sid = i_adc->ipmisensorId; + AMECSENSOR_PTR(PWRSTORE)->ipmi_sid = i_adc->ipmisensorId; } break; diff --git a/src/occ_405/dcom/dcom.h b/src/occ_405/dcom/dcom.h index 811aecc..9fb1efd 100755 --- a/src/occ_405/dcom/dcom.h +++ b/src/occ_405/dcom/dcom.h @@ -197,7 +197,7 @@ typedef struct __attribute__ ((packed)) uint16_t ips4msp0cy[MAX_CORES]; // [4] uint16_t mcpifd4msp0cy[MAX_CORES]; // [52] uint16_t mcpifi4msp0cy[MAX_CORES]; // [100] - uint16_t memsp2msp0mx[MAX_NUM_MEM_CONTROLLERS]; // [148] + uint16_t memReserved[MAX_NUM_MEM_CONTROLLERS]; // [148] uint16_t pwrproc; // [164] uint16_t pwr250usmemp0; // [166] uint16_t reserved0; // [168] @@ -209,7 +209,7 @@ typedef struct __attribute__ ((packed)) uint16_t reserved2; // [226] uint16_t mrd2msp0mx[MAX_NUM_MEM_CONTROLLERS]; // [228] uint16_t mwr2msp0mx[MAX_NUM_MEM_CONTROLLERS]; // [244] - uint16_t pwrpx250usp0cy[MAX_CORES]; // [260] + uint16_t coreReserved[MAX_CORES]; // [260] uint16_t todclock[NUM_TOD_SENSORS]; // [308] uint16_t temp2mscent; // [314] uint16_t tempdimmthrm; // [316] diff --git a/src/occ_405/sensor/sensor_enum.h b/src/occ_405/sensor/sensor_enum.h index 2e7db0e..4d2d483 100755 --- a/src/occ_405/sensor/sensor_enum.h +++ b/src/occ_405/sensor/sensor_enum.h @@ -77,9 +77,9 @@ enum e_gsid // System Sensors // ------------------------------------------------------ PWRSYS, // System DC Power (from APSS) - PWR250USFAN, // Fan Power (from APSS) - PWR250USIO, // IO Subsystem Power (from APSS) - PWR250USSTORE, // Storage Subsys Power (from APSS) + PWRFAN, // Fan Power (from APSS) + PWRIO, // IO Subsystem Power (from APSS) + PWRSTORE, // Storage Subsys Power (from APSS) PWRGPU, // GPU Subsystem Power (from APSS) e.g. Nvidia GPU PWRAPSSCH0, // These PWRAPSSCH sensors are used to report the power PWRAPSSCH1, // provided by each of the 16 APSS channels. @@ -111,13 +111,9 @@ enum e_gsid // Processor Sensors // ------------------------------------------------------ FREQA, - IPS4MSP0, - MEMSP2MSP0, + IPS, PWRPROC, - PWR250USVDD0, // from APSS (no change) - PWRVCSVIOVDN, // from APSS - rename from PWR250USVCS0 to show what it includes - PWR250USMEM0, - SP250USP0, + PWRMEM, TEMPPROCAVG, TEMPPROCTHRM, UTIL, @@ -135,32 +131,45 @@ enum e_gsid TEMPQ4, TEMPQ5, - FREQ250USP0C0, - FREQ250USP0C1, - FREQ250USP0C2, - FREQ250USP0C3, - FREQ250USP0C4, - FREQ250USP0C5, - FREQ250USP0C6, - FREQ250USP0C7, - FREQ250USP0C8, - FREQ250USP0C9, - FREQ250USP0C10, - FREQ250USP0C11, - FREQ250USP0C12, - FREQ250USP0C13, - FREQ250USP0C14, - FREQ250USP0C15, - FREQ250USP0C16, - FREQ250USP0C17, - FREQ250USP0C18, - FREQ250USP0C19, - FREQ250USP0C20, - FREQ250USP0C21, - FREQ250USP0C22, - FREQ250USP0C23, - - FREQAC0, + // ------------------------------------------------------ + // Regulator Sensors + // ------------------------------------------------------ + VOLTVDD, + VOLTVDN, + CURVDD, + CURVDN, + VRMPROCOT, + + // ------------------------------------------------------ + // Core Sensors + // ------------------------------------------------------ + + FREQREQC0, // requested frequency + FREQREQC1, + FREQREQC2, + FREQREQC3, + FREQREQC4, + FREQREQC5, + FREQREQC6, + FREQREQC7, + FREQREQC8, + FREQREQC9, + FREQREQC10, + FREQREQC11, + FREQREQC12, + FREQREQC13, + FREQREQC14, + FREQREQC15, + FREQREQC16, + FREQREQC17, + FREQREQC18, + FREQREQC19, + FREQREQC20, + FREQREQC21, + FREQREQC22, + FREQREQC23, + + FREQAC0, // actual frequency FREQAC1, FREQAC2, FREQAC3, @@ -185,80 +194,80 @@ enum e_gsid FREQAC22, FREQAC23, - IPS4MSP0C0, - IPS4MSP0C1, - IPS4MSP0C2, - IPS4MSP0C3, - IPS4MSP0C4, - IPS4MSP0C5, - IPS4MSP0C6, - IPS4MSP0C7, - IPS4MSP0C8, - IPS4MSP0C9, - IPS4MSP0C10, - IPS4MSP0C11, - IPS4MSP0C12, - IPS4MSP0C13, - IPS4MSP0C14, - IPS4MSP0C15, - IPS4MSP0C16, - IPS4MSP0C17, - IPS4MSP0C18, - IPS4MSP0C19, - IPS4MSP0C20, - IPS4MSP0C21, - IPS4MSP0C22, - IPS4MSP0C23, - - NOTBZE4MSP0C0, - NOTBZE4MSP0C1, - NOTBZE4MSP0C2, - NOTBZE4MSP0C3, - NOTBZE4MSP0C4, - NOTBZE4MSP0C5, - NOTBZE4MSP0C6, - NOTBZE4MSP0C7, - NOTBZE4MSP0C8, - NOTBZE4MSP0C9, - NOTBZE4MSP0C10, - NOTBZE4MSP0C11, - NOTBZE4MSP0C12, - NOTBZE4MSP0C13, - NOTBZE4MSP0C14, - NOTBZE4MSP0C15, - NOTBZE4MSP0C16, - NOTBZE4MSP0C17, - NOTBZE4MSP0C18, - NOTBZE4MSP0C19, - NOTBZE4MSP0C20, - NOTBZE4MSP0C21, - NOTBZE4MSP0C22, - NOTBZE4MSP0C23, - - NOTFIN4MSP0C0, - NOTFIN4MSP0C1, - NOTFIN4MSP0C2, - NOTFIN4MSP0C3, - NOTFIN4MSP0C4, - NOTFIN4MSP0C5, - NOTFIN4MSP0C6, - NOTFIN4MSP0C7, - NOTFIN4MSP0C8, - NOTFIN4MSP0C9, - NOTFIN4MSP0C10, - NOTFIN4MSP0C11, - NOTFIN4MSP0C12, - NOTFIN4MSP0C13, - NOTFIN4MSP0C14, - NOTFIN4MSP0C15, - NOTFIN4MSP0C16, - NOTFIN4MSP0C17, - NOTFIN4MSP0C18, - NOTFIN4MSP0C19, - NOTFIN4MSP0C20, - NOTFIN4MSP0C21, - NOTFIN4MSP0C22, - NOTFIN4MSP0C23, + IPSC0, + IPSC1, + IPSC2, + IPSC3, + IPSC4, + IPSC5, + IPSC6, + IPSC7, + IPSC8, + IPSC9, + IPSC10, + IPSC11, + IPSC12, + IPSC13, + IPSC14, + IPSC15, + IPSC16, + IPSC17, + IPSC18, + IPSC19, + IPSC20, + IPSC21, + IPSC22, + IPSC23, + + NOTBZEC0, + NOTBZEC1, + NOTBZEC2, + NOTBZEC3, + NOTBZEC4, + NOTBZEC5, + NOTBZEC6, + NOTBZEC7, + NOTBZEC8, + NOTBZEC9, + NOTBZEC10, + NOTBZEC11, + NOTBZEC12, + NOTBZEC13, + NOTBZEC14, + NOTBZEC15, + NOTBZEC16, + NOTBZEC17, + NOTBZEC18, + NOTBZEC19, + NOTBZEC20, + NOTBZEC21, + NOTBZEC22, + NOTBZEC23, + + NOTFINC0, + NOTFINC1, + NOTFINC2, + NOTFINC3, + NOTFINC4, + NOTFINC5, + NOTFINC6, + NOTFINC7, + NOTFINC8, + NOTFINC9, + NOTFINC10, + NOTFINC11, + NOTFINC12, + NOTFINC13, + NOTFINC14, + NOTFINC15, + NOTFINC16, + NOTFINC17, + NOTFINC18, + NOTFINC19, + NOTFINC20, + NOTFINC21, + NOTFINC22, + NOTFINC23, TEMPPROCTHRMC0, TEMPPROCTHRMC1, @@ -310,130 +319,55 @@ enum e_gsid UTILC22, UTILC23, - NUTIL3SP0C0, - NUTIL3SP0C1, - NUTIL3SP0C2, - NUTIL3SP0C3, - NUTIL3SP0C4, - NUTIL3SP0C5, - NUTIL3SP0C6, - NUTIL3SP0C7, - NUTIL3SP0C8, - NUTIL3SP0C9, - NUTIL3SP0C10, - NUTIL3SP0C11, - NUTIL3SP0C12, - NUTIL3SP0C13, - NUTIL3SP0C14, - NUTIL3SP0C15, - NUTIL3SP0C16, - NUTIL3SP0C17, - NUTIL3SP0C18, - NUTIL3SP0C19, - NUTIL3SP0C20, - NUTIL3SP0C21, - NUTIL3SP0C22, - NUTIL3SP0C23, - - MSTL2MSP0C0, - MSTL2MSP0C1, - MSTL2MSP0C2, - MSTL2MSP0C3, - MSTL2MSP0C4, - MSTL2MSP0C5, - MSTL2MSP0C6, - MSTL2MSP0C7, - MSTL2MSP0C8, - MSTL2MSP0C9, - MSTL2MSP0C10, - MSTL2MSP0C11, - MSTL2MSP0C12, - MSTL2MSP0C13, - MSTL2MSP0C14, - MSTL2MSP0C15, - MSTL2MSP0C16, - MSTL2MSP0C17, - MSTL2MSP0C18, - MSTL2MSP0C19, - MSTL2MSP0C20, - MSTL2MSP0C21, - MSTL2MSP0C22, - MSTL2MSP0C23, - - CMT2MSP0C0, - CMT2MSP0C1, - CMT2MSP0C2, - CMT2MSP0C3, - CMT2MSP0C4, - CMT2MSP0C5, - CMT2MSP0C6, - CMT2MSP0C7, - CMT2MSP0C8, - CMT2MSP0C9, - CMT2MSP0C10, - CMT2MSP0C11, - CMT2MSP0C12, - CMT2MSP0C13, - CMT2MSP0C14, - CMT2MSP0C15, - CMT2MSP0C16, - CMT2MSP0C17, - CMT2MSP0C18, - CMT2MSP0C19, - CMT2MSP0C20, - CMT2MSP0C21, - CMT2MSP0C22, - CMT2MSP0C23, - - PPICP0C0, - PPICP0C1, - PPICP0C2, - PPICP0C3, - PPICP0C4, - PPICP0C5, - PPICP0C6, - PPICP0C7, - PPICP0C8, - PPICP0C9, - PPICP0C10, - PPICP0C11, - PPICP0C12, - PPICP0C13, - PPICP0C14, - PPICP0C15, - PPICP0C16, - PPICP0C17, - PPICP0C18, - PPICP0C19, - PPICP0C20, - PPICP0C21, - PPICP0C22, - PPICP0C23, - - PWRPX250USP0C0, - PWRPX250USP0C1, - PWRPX250USP0C2, - PWRPX250USP0C3, - PWRPX250USP0C4, - PWRPX250USP0C5, - PWRPX250USP0C6, - PWRPX250USP0C7, - PWRPX250USP0C8, - PWRPX250USP0C9, - PWRPX250USP0C10, - PWRPX250USP0C11, - PWRPX250USP0C12, - PWRPX250USP0C13, - PWRPX250USP0C14, - PWRPX250USP0C15, - PWRPX250USP0C16, - PWRPX250USP0C17, - PWRPX250USP0C18, - PWRPX250USP0C19, - PWRPX250USP0C20, - PWRPX250USP0C21, - PWRPX250USP0C22, - PWRPX250USP0C23, + NUTILC0, + NUTILC1, + NUTILC2, + NUTILC3, + NUTILC4, + NUTILC5, + NUTILC6, + NUTILC7, + NUTILC8, + NUTILC9, + NUTILC10, + NUTILC11, + NUTILC12, + NUTILC13, + NUTILC14, + NUTILC15, + NUTILC16, + NUTILC17, + NUTILC18, + NUTILC19, + NUTILC20, + NUTILC21, + NUTILC22, + NUTILC23, + + MSTLC0, + MSTLC1, + MSTLC2, + MSTLC3, + MSTLC4, + MSTLC5, + MSTLC6, + MSTLC7, + MSTLC8, + MSTLC9, + MSTLC10, + MSTLC11, + MSTLC12, + MSTLC13, + MSTLC14, + MSTLC15, + MSTLC16, + MSTLC17, + MSTLC18, + MSTLC19, + MSTLC20, + MSTLC21, + MSTLC22, + MSTLC23, TEMPC0, TEMPC1, @@ -511,59 +445,43 @@ enum e_gsid STOPDEEPACTC23, // ------------------------------------------------------ - // Regulator Sensors - // ------------------------------------------------------ - UVOLT250USP0V0, - UVOLT250USP0V1, - VOLTVDD, - VOLTVDN, - CURVDD, - CURVDN, - VRFAN, - - // ------------------------------------------------------ // Memory Sensors // ------------------------------------------------------ - MRD2MSP0M0, - MRD2MSP0M1, - MRD2MSP0M2, - MRD2MSP0M3, - MRD2MSP0M4, - MRD2MSP0M5, - MRD2MSP0M6, - MRD2MSP0M7, - - MWR2MSP0M0, - MWR2MSP0M1, - MWR2MSP0M2, - MWR2MSP0M3, - MWR2MSP0M4, - MWR2MSP0M5, - MWR2MSP0M6, - MWR2MSP0M7, - - // TODO: RTC 163359 - Determine if we want to store individual DIMM temps for CENTAUR - // or continue to use max DIMM temp/location under each CENTAUR. - TEMPDIMMAXP0M0, - TEMPDIMMAXP0M1, - TEMPDIMMAXP0M2, - TEMPDIMMAXP0M3, - TEMPDIMMAXP0M4, - TEMPDIMMAXP0M5, - TEMPDIMMAXP0M6, - TEMPDIMMAXP0M7, - - LOCDIMMAXP0M0, - LOCDIMMAXP0M1, - LOCDIMMAXP0M2, - LOCDIMMAXP0M3, - LOCDIMMAXP0M4, - LOCDIMMAXP0M5, - LOCDIMMAXP0M6, - LOCDIMMAXP0M7, - - MEMPWRTHROT, - MEMOTTHROT, + MRDM0, + MRDM1, + MRDM2, + MRDM3, + MRDM4, + MRDM5, + MRDM6, + MRDM7, + + MWRM0, + MWRM1, + MWRM2, + MWRM3, + MWRM4, + MWRM5, + MWRM6, + MWRM7, + + MIRCM0, + MIRCM1, + MIRCM2, + MIRCM3, + MIRCM4, + MIRCM5, + MIRCM6, + MIRCM7, + + MLP2M0, + MLP2M1, + MLP2M2, + MLP2M3, + MLP2M4, + MLP2M5, + MLP2M6, + MLP2M7, // Individual DIMM temperatures (NIMBUS) TEMPDIMM00, @@ -583,200 +501,187 @@ enum e_gsid TEMPDIMM14, TEMPDIMM15, + // TODO: RTC 163359 - Determine if we want to store individual DIMM temps for CENTAUR + // or continue to use max DIMM temp/location under each CENTAUR. + TEMPDIMMAXM0, + TEMPDIMMAXM1, + TEMPDIMMAXM2, + TEMPDIMMAXM3, + TEMPDIMMAXM4, + TEMPDIMMAXM5, + TEMPDIMMAXM6, + TEMPDIMMAXM7, + + LOCDIMMAXM0, + LOCDIMMAXM1, + LOCDIMMAXM2, + LOCDIMMAXM3, + LOCDIMMAXM4, + LOCDIMMAXM5, + LOCDIMMAXM6, + LOCDIMMAXM7, + + MEMPWRTHROT, + MEMOTTHROT, + // ------------------------------------------------------ // Centaur Sensors - 8 MemC/Proc - 1 Cent/MemC - 2 PP/Cent // ------------------------------------------------------ - MAC2MSP0M0C0P0, - MAC2MSP0M0C0P1, - MAC2MSP0M1C0P0, - MAC2MSP0M1C0P1, - MAC2MSP0M2C0P0, - MAC2MSP0M2C0P1, - MAC2MSP0M3C0P0, - MAC2MSP0M3C0P1, - MAC2MSP0M4C0P0, - MAC2MSP0M4C0P1, - MAC2MSP0M5C0P0, - MAC2MSP0M5C0P1, - MAC2MSP0M6C0P0, - MAC2MSP0M6C0P1, - MAC2MSP0M7C0P0, - MAC2MSP0M7C0P1, - - MPU2MSP0M0C0P0, - MPU2MSP0M0C0P1, - MPU2MSP0M1C0P0, - MPU2MSP0M1C0P1, - MPU2MSP0M2C0P0, - MPU2MSP0M2C0P1, - MPU2MSP0M3C0P0, - MPU2MSP0M3C0P1, - MPU2MSP0M4C0P0, - MPU2MSP0M4C0P1, - MPU2MSP0M5C0P0, - MPU2MSP0M5C0P1, - MPU2MSP0M6C0P0, - MPU2MSP0M6C0P1, - MPU2MSP0M7C0P0, - MPU2MSP0M7C0P1, - - MIRB2MSP0M0C0P0, - MIRB2MSP0M0C0P1, - MIRB2MSP0M1C0P0, - MIRB2MSP0M1C0P1, - MIRB2MSP0M2C0P0, - MIRB2MSP0M2C0P1, - MIRB2MSP0M3C0P0, - MIRB2MSP0M3C0P1, - MIRB2MSP0M4C0P0, - MIRB2MSP0M4C0P1, - MIRB2MSP0M5C0P0, - MIRB2MSP0M5C0P1, - MIRB2MSP0M6C0P0, - MIRB2MSP0M6C0P1, - MIRB2MSP0M7C0P0, - MIRB2MSP0M7C0P1, - - MIRL2MSP0M0C0P0, - MIRL2MSP0M0C0P1, - MIRL2MSP0M1C0P0, - MIRL2MSP0M1C0P1, - MIRL2MSP0M2C0P0, - MIRL2MSP0M2C0P1, - MIRL2MSP0M3C0P0, - MIRL2MSP0M3C0P1, - MIRL2MSP0M4C0P0, - MIRL2MSP0M4C0P1, - MIRL2MSP0M5C0P0, - MIRL2MSP0M5C0P1, - MIRL2MSP0M6C0P0, - MIRL2MSP0M6C0P1, - MIRL2MSP0M7C0P0, - MIRL2MSP0M7C0P1, - - MIRM2MSP0M0C0P0, - MIRM2MSP0M0C0P1, - MIRM2MSP0M1C0P0, - MIRM2MSP0M1C0P1, - MIRM2MSP0M2C0P0, - MIRM2MSP0M2C0P1, - MIRM2MSP0M3C0P0, - MIRM2MSP0M3C0P1, - MIRM2MSP0M4C0P0, - MIRM2MSP0M4C0P1, - MIRM2MSP0M5C0P0, - MIRM2MSP0M5C0P1, - MIRM2MSP0M6C0P0, - MIRM2MSP0M6C0P1, - MIRM2MSP0M7C0P0, - MIRM2MSP0M7C0P1, - - MIRH2MSP0M0C0P0, - MIRH2MSP0M0C0P1, - MIRH2MSP0M1C0P0, - MIRH2MSP0M1C0P1, - MIRH2MSP0M2C0P0, - MIRH2MSP0M2C0P1, - MIRH2MSP0M3C0P0, - MIRH2MSP0M3C0P1, - MIRH2MSP0M4C0P0, - MIRH2MSP0M4C0P1, - MIRH2MSP0M5C0P0, - MIRH2MSP0M5C0P1, - MIRH2MSP0M6C0P0, - MIRH2MSP0M6C0P1, - MIRH2MSP0M7C0P0, - MIRH2MSP0M7C0P1, - - MTS2MSP0M0C0P0, - MTS2MSP0M0C0P1, - MTS2MSP0M1C0P0, - MTS2MSP0M1C0P1, - MTS2MSP0M2C0P0, - MTS2MSP0M2C0P1, - MTS2MSP0M3C0P0, - MTS2MSP0M3C0P1, - MTS2MSP0M4C0P0, - MTS2MSP0M4C0P1, - MTS2MSP0M5C0P0, - MTS2MSP0M5C0P1, - MTS2MSP0M6C0P0, - MTS2MSP0M6C0P1, - MTS2MSP0M7C0P0, - MTS2MSP0M7C0P1, - - MEMSP2MSPM0C0P0, - MEMSP2MSPM0C0P1, - MEMSP2MSPM1C0P0, - MEMSP2MSPM1C0P1, - MEMSP2MSPM2C0P0, - MEMSP2MSPM2C0P1, - MEMSP2MSPM3C0P0, - MEMSP2MSPM3C0P1, - MEMSP2MSPM4C0P0, - MEMSP2MSPM4C0P1, - MEMSP2MSPM5C0P0, - MEMSP2MSPM5C0P1, - MEMSP2MSPM6C0P0, - MEMSP2MSPM6C0P1, - MEMSP2MSPM7C0P0, - MEMSP2MSPM7C0P1, - - M4RD2MSP0M0C0P0, - M4RD2MSP0M0C0P1, - M4RD2MSP0M1C0P0, - M4RD2MSP0M1C0P1, - M4RD2MSP0M2C0P0, - M4RD2MSP0M2C0P1, - M4RD2MSP0M3C0P0, - M4RD2MSP0M3C0P1, - M4RD2MSP0M4C0P0, - M4RD2MSP0M4C0P1, - M4RD2MSP0M5C0P0, - M4RD2MSP0M5C0P1, - M4RD2MSP0M6C0P0, - M4RD2MSP0M6C0P1, - M4RD2MSP0M7C0P0, - M4RD2MSP0M7C0P1, - - M4WR2MSP0M0C0P0, - M4WR2MSP0M0C0P1, - M4WR2MSP0M1C0P0, - M4WR2MSP0M1C0P1, - M4WR2MSP0M2C0P0, - M4WR2MSP0M2C0P1, - M4WR2MSP0M3C0P0, - M4WR2MSP0M3C0P1, - M4WR2MSP0M4C0P0, - M4WR2MSP0M4C0P1, - M4WR2MSP0M5C0P0, - M4WR2MSP0M5C0P1, - M4WR2MSP0M6C0P0, - M4WR2MSP0M6C0P1, - M4WR2MSP0M7C0P0, - M4WR2MSP0M7C0P1, - - MIRC2MSP0M0, - MIRC2MSP0M1, - MIRC2MSP0M2, - MIRC2MSP0M3, - MIRC2MSP0M4, - MIRC2MSP0M5, - MIRC2MSP0M6, - MIRC2MSP0M7, - - MLP2P0M0, - MLP2P0M1, - MLP2P0M2, - MLP2P0M3, - MLP2P0M4, - MLP2P0M5, - MLP2P0M6, - MLP2P0M7, - - TEMP2MSCENT, + MACM0C0P0, + MACM0C0P1, + MACM1C0P0, + MACM1C0P1, + MACM2C0P0, + MACM2C0P1, + MACM3C0P0, + MACM3C0P1, + MACM4C0P0, + MACM4C0P1, + MACM5C0P0, + MACM5C0P1, + MACM6C0P0, + MACM6C0P1, + MACM7C0P0, + MACM7C0P1, + + MPUM0C0P0, + MPUM0C0P1, + MPUM1C0P0, + MPUM1C0P1, + MPUM2C0P0, + MPUM2C0P1, + MPUM3C0P0, + MPUM3C0P1, + MPUM4C0P0, + MPUM4C0P1, + MPUM5C0P0, + MPUM5C0P1, + MPUM6C0P0, + MPUM6C0P1, + MPUM7C0P0, + MPUM7C0P1, + + MIRBM0C0P0, + MIRBM0C0P1, + MIRBM1C0P0, + MIRBM1C0P1, + MIRBM2C0P0, + MIRBM2C0P1, + MIRBM3C0P0, + MIRBM3C0P1, + MIRBM4C0P0, + MIRBM4C0P1, + MIRBM5C0P0, + MIRBM5C0P1, + MIRBM6C0P0, + MIRBM6C0P1, + MIRBM7C0P0, + MIRBM7C0P1, + + MIRLM0C0P0, + MIRLM0C0P1, + MIRLM1C0P0, + MIRLM1C0P1, + MIRLM2C0P0, + MIRLM2C0P1, + MIRLM3C0P0, + MIRLM3C0P1, + MIRLM4C0P0, + MIRLM4C0P1, + MIRLM5C0P0, + MIRLM5C0P1, + MIRLM6C0P0, + MIRLM6C0P1, + MIRLM7C0P0, + MIRLM7C0P1, + + MIRMM0C0P0, + MIRMM0C0P1, + MIRMM1C0P0, + MIRMM1C0P1, + MIRMM2C0P0, + MIRMM2C0P1, + MIRMM3C0P0, + MIRMM3C0P1, + MIRMM4C0P0, + MIRMM4C0P1, + MIRMM5C0P0, + MIRMM5C0P1, + MIRMM6C0P0, + MIRMM6C0P1, + MIRMM7C0P0, + MIRMM7C0P1, + + MIRHM0C0P0, + MIRHM0C0P1, + MIRHM1C0P0, + MIRHM1C0P1, + MIRHM2C0P0, + MIRHM2C0P1, + MIRHM3C0P0, + MIRHM3C0P1, + MIRHM4C0P0, + MIRHM4C0P1, + MIRHM5C0P0, + MIRHM5C0P1, + MIRHM6C0P0, + MIRHM6C0P1, + MIRHM7C0P0, + MIRHM7C0P1, + + MTSM0C0P0, + MTSM0C0P1, + MTSM1C0P0, + MTSM1C0P1, + MTSM2C0P0, + MTSM2C0P1, + MTSM3C0P0, + MTSM3C0P1, + MTSM4C0P0, + MTSM4C0P1, + MTSM5C0P0, + MTSM5C0P1, + MTSM6C0P0, + MTSM6C0P1, + MTSM7C0P0, + MTSM7C0P1, + + M4RDM0C0P0, + M4RDM0C0P1, + M4RDM1C0P0, + M4RDM1C0P1, + M4RDM2C0P0, + M4RDM2C0P1, + M4RDM3C0P0, + M4RDM3C0P1, + M4RDM4C0P0, + M4RDM4C0P1, + M4RDM5C0P0, + M4RDM5C0P1, + M4RDM6C0P0, + M4RDM6C0P1, + M4RDM7C0P0, + M4RDM7C0P1, + + M4WRM0C0P0, + M4WRM0C0P1, + M4WRM1C0P0, + M4WRM1C0P1, + M4WRM2C0P0, + M4WRM2C0P1, + M4WRM3C0P0, + M4WRM3C0P1, + M4WRM4C0P0, + M4WRM4C0P1, + M4WRM5C0P0, + M4WRM5C0P1, + M4WRM6C0P0, + M4WRM6C0P1, + M4WRM7C0P0, + M4WRM7C0P1, + + TEMPCENT, TEMPDIMMTHRM, - MEMSP2MS, // ------------------------------------------------------ // GPU Sensors @@ -788,18 +693,18 @@ enum e_gsid // ------------------------------------------------------ // Partition Sensors // ------------------------------------------------------ - UTIL2MSSLCG000, - UTIL2MSSLCG001, - UTIL2MSSLCG002, - UTIL2MSSLCG003, - UTIL2MSSLCG004, - UTIL2MSSLCG005, - UTIL2MSSLCG006, - UTIL2MSSLCG007, - UTIL2MSSLCG008, - UTIL2MSSLCG009, - UTIL2MSSLCG010, - UTIL2MSSLCG011, + UTILSLCG000, + UTILSLCG001, + UTILSLCG002, + UTILSLCG003, + UTILSLCG004, + UTILSLCG005, + UTILSLCG006, + UTILSLCG007, + UTILSLCG008, + UTILSLCG009, + UTILSLCG010, + UTILSLCG011, // ------------------------------------------------------ // END of Sensor List (this must be last entry) diff --git a/src/occ_405/sensor/sensor_info.c b/src/occ_405/sensor/sensor_info.c index c9b0806..91e4557 100755 --- a/src/occ_405/sensor/sensor_info.c +++ b/src/occ_405/sensor/sensor_info.c @@ -269,50 +269,46 @@ const sensor_info_t G_sensor_info[] = SENSOR_INFO_T_ENTRY( RTLtickdur, "us\0", AMEC_SENSOR_TYPE_TIME, AMEC_SENSOR_LOC_OCC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), /* ==SystemSensors== NameString Units Type Location Number Freq ScaleFactor */ - SENSOR_INFO_T_ENTRY( PWRSYS, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWR250USFAN, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWR250USIO, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWR250USSTORE, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWRGPU, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWRAPSSCH0, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWRAPSSCH1, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWRAPSSCH2, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWRAPSSCH3, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWRAPSSCH4, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWRAPSSCH5, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWRAPSSCH6, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWRAPSSCH7, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWRAPSSCH8, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWRAPSSCH9, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWRAPSSCH10, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWRAPSSCH11, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWRAPSSCH12, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWRAPSSCH13, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWRAPSSCH14, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWRAPSSCH15, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRSYS, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRFAN, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRIO, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRSTORE, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRGPU, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRAPSSCH0, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRAPSSCH1, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRAPSSCH2, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRAPSSCH3, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRAPSSCH4, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRAPSSCH5, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRAPSSCH6, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRAPSSCH7, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRAPSSCH8, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRAPSSCH9, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRAPSSCH10, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRAPSSCH11, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRAPSSCH12, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRAPSSCH13, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRAPSSCH14, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRAPSSCH15, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), SENSOR_INFO_T_ENTRY( CUR12VSTBY, "A\0", AMEC_SENSOR_TYPE_CURRENT, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1,-2) ), - SENSOR_INFO_T_ENTRY( VRHOTMEMPRCCNT, "#\0", AMEC_SENSOR_TYPE_GENERIC, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( VRHOTMEMPRCCNT, "#\0", AMEC_SENSOR_TYPE_GENERIC, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), /* ==ChipSensors== NameString Units Type Location Number Freq ScaleFactor */ - SENSOR_INFO_T_ENTRY( TODclock0, "us\0", AMEC_SENSOR_TYPE_TIME, AMEC_SENSOR_LOC_ALL, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 16, 0) ), - SENSOR_INFO_T_ENTRY( TODclock1, "sec\0", AMEC_SENSOR_TYPE_TIME, AMEC_SENSOR_LOC_ALL, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1048576,-6) ), - SENSOR_INFO_T_ENTRY( TODclock2, "day\0", AMEC_SENSOR_TYPE_TIME, AMEC_SENSOR_LOC_ALL, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 795364,-6) ), + SENSOR_INFO_T_ENTRY( TODclock0, "us\0", AMEC_SENSOR_TYPE_TIME, AMEC_SENSOR_LOC_ALL, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 16, 0) ), + SENSOR_INFO_T_ENTRY( TODclock1, "sec\0", AMEC_SENSOR_TYPE_TIME, AMEC_SENSOR_LOC_ALL, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1048576,-6) ), + SENSOR_INFO_T_ENTRY( TODclock2, "day\0", AMEC_SENSOR_TYPE_TIME, AMEC_SENSOR_LOC_ALL, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 795364,-6) ), /* ==ProcSensors== NameString Units Type Location Number Freq ScaleFactor */ SENSOR_INFO_T_ENTRY( FREQA, "MHz\0", AMEC_SENSOR_TYPE_FREQ, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( IPS4MSP0, "MIP\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( MEMSP2MSP0, "%\0", AMEC_SENSOR_TYPE_TIME, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( IPS, "MIP\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1, 0) ), SENSOR_INFO_T_ENTRY( PWRPROC, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWR250USVDD0, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWRVCSVIOVDN, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( PWR250USMEM0, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( SP250USP0, "%\0", AMEC_SENSOR_TYPE_FREQ, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( PWRMEM, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), SENSOR_INFO_T_ENTRY( TEMPPROCAVG, "C\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1, 0) ), SENSOR_INFO_T_ENTRY( TEMPPROCTHRM, "C\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1, 0) ), SENSOR_INFO_T_ENTRY( UTIL, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1,-2) ), SENSOR_INFO_T_ENTRY( TEMPNEST, "C\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( VOLTVDDSENSE, "mV\0", AMEC_SENSOR_TYPE_VOLTAGE, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, -1) ), - SENSOR_INFO_T_ENTRY( VOLTVDNSENSE, "mV\0", AMEC_SENSOR_TYPE_VOLTAGE, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, -1) ), + SENSOR_INFO_T_ENTRY( VOLTVDDSENSE, "mV\0", AMEC_SENSOR_TYPE_VOLTAGE, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_500US_IN_HZ, AMEFP( 1, -1) ), + SENSOR_INFO_T_ENTRY( VOLTVDNSENSE, "mV\0", AMEC_SENSOR_TYPE_VOLTAGE, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_500US_IN_HZ, AMEFP( 1, -1) ), SENSOR_INFO_T_ENTRY( PWRVDD, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_500US_IN_HZ, AMEFP( 1, 0) ), SENSOR_INFO_T_ENTRY( PWRVDN, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_500US_IN_HZ, AMEFP( 1, 0) ), SENSOR_INFO_T_ENTRY( PROCPWRTHROT, "#\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), @@ -321,59 +317,52 @@ const sensor_info_t G_sensor_info[] = SENS_QUAD_ENTRY_SET( TEMPQ, "C\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1, 0) ), /* ==ReguSensors== NameString Units Type Location Number Freq ScaleFactor */ - SENSOR_INFO_T_ENTRY( UVOLT250USP0V0, "mV\0", AMEC_SENSOR_TYPE_VOLTAGE, AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, -1) ), - SENSOR_INFO_T_ENTRY( UVOLT250USP0V1, "mV\0", AMEC_SENSOR_TYPE_VOLTAGE, AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, -1) ), SENSOR_INFO_T_ENTRY( VOLTVDD, "mV\0", AMEC_SENSOR_TYPE_VOLTAGE, AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_500US_IN_HZ, AMEFP( 1, -1) ), SENSOR_INFO_T_ENTRY( VOLTVDN, "mV\0", AMEC_SENSOR_TYPE_VOLTAGE, AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_500US_IN_HZ, AMEFP( 1, -1) ), SENSOR_INFO_T_ENTRY( CURVDD, "A\0", AMEC_SENSOR_TYPE_CURRENT, AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_500US_IN_HZ, AMEFP( 1,-2) ), SENSOR_INFO_T_ENTRY( CURVDN, "A\0", AMEC_SENSOR_TYPE_CURRENT, AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_500US_IN_HZ, AMEFP( 1,-2) ), - SENSOR_INFO_T_ENTRY( VRFAN, "pin\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_1MS_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( VRMPROCOT, "#\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_1MS_IN_HZ, AMEFP( 1, 0) ), /* ==CoreSensors== NameString Units Type Location Number Freq ScaleFactor */ - SENS_CORE_ENTRY_SET( FREQ250USP0C, "MHz\0", AMEC_SENSOR_TYPE_FREQ, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENS_CORE_ENTRY_SET( FREQREQC, "MHz\0", AMEC_SENSOR_TYPE_FREQ, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), SENS_CORE_ENTRY_SET( FREQAC, "MHz\0", AMEC_SENSOR_TYPE_FREQ, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1, 0) ), - SENS_CORE_ENTRY_SET( IPS4MSP0C, "MIP\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1, 0) ), - SENS_CORE_ENTRY_SET( NOTBZE4MSP0C, "cyc\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1, 0) ), - SENS_CORE_ENTRY_SET( NOTFIN4MSP0C, "cyc\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1, 0) ), + SENS_CORE_ENTRY_SET( IPSC, "MIP\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1, 0) ), + SENS_CORE_ENTRY_SET( NOTBZEC, "cyc\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1, 0) ), + SENS_CORE_ENTRY_SET( NOTFINC, "cyc\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1, 0) ), SENS_CORE_ENTRY_SET( TEMPPROCTHRMC, "C\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1, 0) ), SENS_CORE_ENTRY_SET( UTILC, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1,-2) ), - SENS_CORE_ENTRY_SET( NUTIL3SP0C, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_3S_IN_HZ, AMEFP( 1,-2) ), - SENS_CORE_ENTRY_SET( MSTL2MSP0C, "cpi\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENS_CORE_ENTRY_SET( CMT2MSP0C, "%\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENS_CORE_ENTRY_SET( PPICP0C, "%\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENS_CORE_ENTRY_SET( PWRPX250USP0C, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENS_CORE_ENTRY_SET( NUTILC, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_3S_IN_HZ, AMEFP( 1,-2) ), + SENS_CORE_ENTRY_SET( MSTLC, "cpi\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), SENS_CORE_ENTRY_SET( TEMPC, "C\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1, 0) ), SENS_CORE_ENTRY_SET( STOPDEEPREQC, "ss\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1, 0) ), SENS_CORE_ENTRY_SET( STOPDEEPACTC, "ss\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1, 0) ), /* ==MemSensors== NameString Units Type Location Number Freq ScaleFactor */ - SENS_MEMC_ENTRY_SET( MRD2MSP0M, "GBs\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 128, -5) ), - SENS_MEMC_ENTRY_SET( MWR2MSP0M, "GBs\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 128, -5) ), - SENS_MEMC_ENTRY_SET( MIRC2MSP0M, "eps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), - SENS_MEMC_ENTRY_SET( MLP2P0M, "eps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENS_MEMC_ENTRY_SET( MRDM, "GBs\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 128, -5) ), + SENS_MEMC_ENTRY_SET( MWRM, "GBs\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 128, -5) ), + SENS_MEMC_ENTRY_SET( MIRCM, "eps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), + SENS_MEMC_ENTRY_SET( MLP2M, "eps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), SENS_DIMM_ENTRY_SET( TEMPDIMM, "C\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_32MS_IN_HZ, AMEFP( 1, 0) ), - SENS_MEMC_ENTRY_SET( TEMPDIMMAXP0M, "C\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), - SENS_MEMC_ENTRY_SET( LOCDIMMAXP0M, "loc\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), + SENS_MEMC_ENTRY_SET( TEMPDIMMAXM, "C\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), + SENS_MEMC_ENTRY_SET( LOCDIMMAXM, "loc\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), SENSOR_INFO_T_ENTRY( MEMPWRTHROT, "#\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), SENSOR_INFO_T_ENTRY( MEMOTTHROT, "#\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_16MS_IN_HZ, AMEFP( 1, 0) ), /* ==CentaurSensors== NameString Units Type Location Number Freq ScaleFactor */ - SEN_CENTR_ENTRY_SET( MAC2MSP0M, "rps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), - SEN_CENTR_ENTRY_SET( MPU2MSP0M, "rps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), - SEN_CENTR_ENTRY_SET( MIRB2MSP0M, "eps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), - SEN_CENTR_ENTRY_SET( MIRL2MSP0M, "eps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), - SEN_CENTR_ENTRY_SET( MIRM2MSP0M, "eps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), - SEN_CENTR_ENTRY_SET( MIRH2MSP0M, "eps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), - SEN_CENTR_ENTRY_SET( MTS2MSP0M, "cnt\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), - SEN_CENTR_ENTRY_SET( MEMSP2MSPM, "%\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), - SEN_CENTR_ENTRY_SET( M4RD2MSP0M, "GBs\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 128, -5) ), - SEN_CENTR_ENTRY_SET( M4WR2MSP0M, "GBs\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 128, -5) ), + SEN_CENTR_ENTRY_SET( MACM, "rps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), + SEN_CENTR_ENTRY_SET( MPUM, "rps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), + SEN_CENTR_ENTRY_SET( MIRBM, "eps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), + SEN_CENTR_ENTRY_SET( MIRLM, "eps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), + SEN_CENTR_ENTRY_SET( MIRMM, "eps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), + SEN_CENTR_ENTRY_SET( MIRHM, "eps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), + SEN_CENTR_ENTRY_SET( MTSM, "cnt\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), + SEN_CENTR_ENTRY_SET( M4RDM, "GBs\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 128, -5) ), + SEN_CENTR_ENTRY_SET( M4WRM, "GBs\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 128, -5) ), /* ==MemSummarySensors== NameString Units Type Location Number Freq ScaleFactor */ - SENSOR_INFO_T_ENTRY( TEMP2MSCENT, "C\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), + SENSOR_INFO_T_ENTRY( TEMPCENT, "C\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP( 1, 0) ), SENSOR_INFO_T_ENTRY( TEMPDIMMTHRM, "C\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_32MS_IN_HZ, AMEFP( 1, 0) ), - SENSOR_INFO_T_ENTRY( MEMSP2MS, "%\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ), /* ==GPUSensors== NameString Units Type Location Number Freq ScaleFactor */ SENSOR_INFO_T_ENTRY( TEMPGPU0, "C\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_GPU, AMEC_SENSOR_NONUM, AMEEFP_32MS_IN_HZ, AMEFP( 1, 0) ), @@ -381,18 +370,18 @@ const sensor_info_t G_sensor_info[] = SENSOR_INFO_T_ENTRY( TEMPGPU2, "C\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_GPU, AMEC_SENSOR_NONUM, AMEEFP_32MS_IN_HZ, AMEFP( 1, 0) ), /* ==PartSummarySensors== NameString Units Type Location Number Freq ScaleFactor */ - SENSOR_INFO_T_ENTRY( UTIL2MSSLCG000, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), - SENSOR_INFO_T_ENTRY( UTIL2MSSLCG001, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), - SENSOR_INFO_T_ENTRY( UTIL2MSSLCG002, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), - SENSOR_INFO_T_ENTRY( UTIL2MSSLCG003, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), - SENSOR_INFO_T_ENTRY( UTIL2MSSLCG004, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), - SENSOR_INFO_T_ENTRY( UTIL2MSSLCG005, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), - SENSOR_INFO_T_ENTRY( UTIL2MSSLCG006, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), - SENSOR_INFO_T_ENTRY( UTIL2MSSLCG007, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), - SENSOR_INFO_T_ENTRY( UTIL2MSSLCG008, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), - SENSOR_INFO_T_ENTRY( UTIL2MSSLCG009, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), - SENSOR_INFO_T_ENTRY( UTIL2MSSLCG010, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), - SENSOR_INFO_T_ENTRY( UTIL2MSSLCG011, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), + SENSOR_INFO_T_ENTRY( UTILSLCG000, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), + SENSOR_INFO_T_ENTRY( UTILSLCG001, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), + SENSOR_INFO_T_ENTRY( UTILSLCG002, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), + SENSOR_INFO_T_ENTRY( UTILSLCG003, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), + SENSOR_INFO_T_ENTRY( UTILSLCG004, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), + SENSOR_INFO_T_ENTRY( UTILSLCG005, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), + SENSOR_INFO_T_ENTRY( UTILSLCG006, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), + SENSOR_INFO_T_ENTRY( UTILSLCG007, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), + SENSOR_INFO_T_ENTRY( UTILSLCG008, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), + SENSOR_INFO_T_ENTRY( UTILSLCG009, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), + SENSOR_INFO_T_ENTRY( UTILSLCG010, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), + SENSOR_INFO_T_ENTRY( UTILSLCG011, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_2MS_IN_HZ, AMEFP_SCALE_0_16384), }; // Cause a compile error if we don't have all the sensors in the enum in the initialization list. diff --git a/src/occ_405/sensor/sensor_table.c b/src/occ_405/sensor/sensor_table.c index 0f85049..11fffd9 100755 --- a/src/occ_405/sensor/sensor_table.c +++ b/src/occ_405/sensor/sensor_table.c @@ -315,9 +315,9 @@ const sensor_ptr_t G_amec_sensor_list[] = // System Sensors // ------------------------------------------------------ SENSOR_PTR( PWRSYS, &g_amec_sys.sys.pwrsys), - SENSOR_PTR( PWR250USFAN, &g_amec_sys.fan.pwr250usfan), - SENSOR_PTR( PWR250USIO, &g_amec_sys.io.pwr250usio), - SENSOR_PTR( PWR250USSTORE, &g_amec_sys.storage.pwr250usstore), + SENSOR_PTR( PWRFAN, &g_amec_sys.fan.pwr250usfan), + SENSOR_PTR( PWRIO, &g_amec_sys.io.pwr250usio), + SENSOR_PTR( PWRSTORE, &g_amec_sys.storage.pwr250usstore), SENSOR_PTR( PWRGPU, &g_amec_sys.sys.pwr250usgpu), SENSOR_PTR( PWRAPSSCH0, &g_amec_sys.sys.pwrapssch[0]), SENSOR_PTR( PWRAPSSCH1, &g_amec_sys.sys.pwrapssch[1]), @@ -349,13 +349,9 @@ const sensor_ptr_t G_amec_sensor_list[] = // Processor Sensors // ------------------------------------------------------ SENSOR_PTR( FREQA, &g_amec_sys.proc[0].freqa), - SENSOR_PTR( IPS4MSP0, &g_amec_sys.proc[0].ips4ms), - SENSOR_PTR( MEMSP2MSP0, &g_amec_sys.proc[0].memsp2ms), + SENSOR_PTR( IPS, &g_amec_sys.proc[0].ips4ms), SENSOR_PTR( PWRPROC, &g_amec_sys.proc[0].pwrproc), - SENSOR_PTR( PWR250USVDD0, &g_amec_sys.proc[0].pwr250usvdd), - SENSOR_PTR( PWRVCSVIOVDN, &g_amec_sys.proc[0].pwrvcsviovdn), - SENSOR_PTR( PWR250USMEM0, &g_amec_sys.proc[0].pwr250usmem), - SENSOR_PTR( SP250USP0, &g_amec_sys.proc[0].sp250us), + SENSOR_PTR( PWRMEM, &g_amec_sys.proc[0].pwr250usmem), SENSOR_PTR( TEMPPROCAVG, &g_amec_sys.proc[0].tempprocavg), SENSOR_PTR( TEMPPROCTHRM, &g_amec_sys.proc[0].tempprocthermal), SENSOR_PTR( UTIL, &g_amec_sys.proc[0].util), @@ -373,20 +369,27 @@ const sensor_ptr_t G_amec_sensor_list[] = QUAD_SENSOR_PTRS( TEMPQ, &g_amec_sys.proc[0].quad, tempq), // ------------------------------------------------------ + // Regulator Sensors + // ------------------------------------------------------ + SENSOR_PTR( VOLTVDD, &g_amec_sys.proc[0].vrm[0].volt250us), + SENSOR_PTR( VOLTVDN, &g_amec_sys.proc[0].vrm[1].volt250us), + SENSOR_PTR( CURVDD, &g_amec_sys.proc[0].curvdd), + SENSOR_PTR( CURVDN, &g_amec_sys.proc[0].curvdn), + SENSOR_PTR( VRMPROCOT, &g_amec_sys.sys.vrfan), + + + // ------------------------------------------------------ // Core Sensors (24 of each) // ------------------------------------------------------ - CORE_SENSOR_PTRS( FREQ250USP0C , &g_amec_sys.proc[0].core, freq250us), + CORE_SENSOR_PTRS( FREQREQC , &g_amec_sys.proc[0].core, freq250us), CORE_SENSOR_PTRS( FREQAC , &g_amec_sys.proc[0].core, freqa), - CORE_SENSOR_PTRS( IPS4MSP0C , &g_amec_sys.proc[0].core, ips4ms), - CORE_SENSOR_PTRS( NOTBZE4MSP0C , &g_amec_sys.proc[0].core, mcpifd4ms), - CORE_SENSOR_PTRS( NOTFIN4MSP0C , &g_amec_sys.proc[0].core, mcpifi4ms), + CORE_SENSOR_PTRS( IPSC , &g_amec_sys.proc[0].core, ips4ms), + CORE_SENSOR_PTRS( NOTBZEC , &g_amec_sys.proc[0].core, mcpifd4ms), + CORE_SENSOR_PTRS( NOTFINC , &g_amec_sys.proc[0].core, mcpifi4ms), CORE_SENSOR_PTRS( TEMPPROCTHRMC , &g_amec_sys.proc[0].core, tempprocthermal), CORE_SENSOR_PTRS( UTILC , &g_amec_sys.proc[0].core, util), - CORE_SENSOR_PTRS( NUTIL3SP0C , &g_amec_sys.proc[0].core, nutil3s), - CORE_SENSOR_PTRS( MSTL2MSP0C , &g_amec_sys.proc[0].core, mstl2ms), - CORE_SENSOR_PTRS( CMT2MSP0C , &g_amec_sys.proc[0].core, cmt2ms), - CORE_SENSOR_PTRS( PPICP0C , &g_amec_sys.proc[0].core, ppic), - CORE_SENSOR_PTRS( PWRPX250USP0C , &g_amec_sys.proc[0].core, pwrpx250us), + CORE_SENSOR_PTRS( NUTILC , &g_amec_sys.proc[0].core, nutil3s), + CORE_SENSOR_PTRS( MSTLC , &g_amec_sys.proc[0].core, mstl2ms), CORE_SENSOR_PTRS( TEMPC, &g_amec_sys.proc[0].core, tempc), CORE_SENSOR_PTRS( STOPDEEPREQC, &g_amec_sys.proc[0].core, stopdeepreqc), CORE_SENSOR_PTRS( STOPDEEPACTC, &g_amec_sys.proc[0].core, stopdeepactc), @@ -394,31 +397,29 @@ const sensor_ptr_t G_amec_sensor_list[] = // ------------------------------------------------------ // Memory Sensors // ------------------------------------------------------ - MEMCONTROL_SENSOR_PTRS(MRD2MSP0M, &g_amec_sys.proc[0].memctl, mrd2ms), - MEMCONTROL_SENSOR_PTRS(MWR2MSP0M, &g_amec_sys.proc[0].memctl, mwr2ms), - MEMCONTROL_SENSOR_PTRS(MIRC2MSP0M, &g_amec_sys.proc[0].memctl, centaur.mirc2ms), - MEMCONTROL_SENSOR_PTRS(MLP2P0M, &g_amec_sys.proc[0].memctl, centaur.mlp2ms), + MEMCONTROL_SENSOR_PTRS(MRDM, &g_amec_sys.proc[0].memctl, mrd2ms), + MEMCONTROL_SENSOR_PTRS(MWRM, &g_amec_sys.proc[0].memctl, mwr2ms), + MEMCONTROL_SENSOR_PTRS(MIRCM, &g_amec_sys.proc[0].memctl, centaur.mirc2ms), + MEMCONTROL_SENSOR_PTRS(MLP2M, &g_amec_sys.proc[0].memctl, centaur.mlp2ms), DIMM_SENSOR_PTRS(TEMPDIMM, &g_amec_sys.proc[0], tempdimm), - MEMCONTROL_SENSOR_PTRS(TEMPDIMMAXP0M, &g_amec_sys.proc[0].memctl, centaur.tempdimmax), - MEMCONTROL_SENSOR_PTRS(LOCDIMMAXP0M, &g_amec_sys.proc[0].memctl, centaur.locdimmax), + MEMCONTROL_SENSOR_PTRS(TEMPDIMMAXM, &g_amec_sys.proc[0].memctl, centaur.tempdimmax), + MEMCONTROL_SENSOR_PTRS(LOCDIMMAXM, &g_amec_sys.proc[0].memctl, centaur.locdimmax), SENSOR_PTR(MEMPWRTHROT, &g_amec_sys.proc[0].mempwrthrot), SENSOR_PTR(MEMOTTHROT, &g_amec_sys.proc[0].memotthrot), - PORTPAIR_SENSOR_PTRS(MAC2MSP0M, &g_amec_sys.proc[0].memctl, centaur.portpair, mac2ms), - PORTPAIR_SENSOR_PTRS(MPU2MSP0M, &g_amec_sys.proc[0].memctl, centaur.portpair, mpu2ms), - PORTPAIR_SENSOR_PTRS(MIRB2MSP0M, &g_amec_sys.proc[0].memctl, centaur.portpair, mirb2ms), - PORTPAIR_SENSOR_PTRS(MIRL2MSP0M, &g_amec_sys.proc[0].memctl, centaur.portpair, mirl2ms), - PORTPAIR_SENSOR_PTRS(MIRM2MSP0M, &g_amec_sys.proc[0].memctl, centaur.portpair, mirm2ms), - PORTPAIR_SENSOR_PTRS(MIRH2MSP0M, &g_amec_sys.proc[0].memctl, centaur.portpair, mirh2ms), - PORTPAIR_SENSOR_PTRS(MTS2MSP0M, &g_amec_sys.proc[0].memctl, centaur.portpair, mts2ms), - PORTPAIR_SENSOR_PTRS(MEMSP2MSPM, &g_amec_sys.proc[0].memctl, centaur.portpair, memsp2ms), - PORTPAIR_SENSOR_PTRS(M4RD2MSP0M, &g_amec_sys.proc[0].memctl, centaur.portpair, m4rd2ms), - PORTPAIR_SENSOR_PTRS(M4WR2MSP0M, &g_amec_sys.proc[0].memctl, centaur.portpair, m4wr2ms), + PORTPAIR_SENSOR_PTRS(MACM, &g_amec_sys.proc[0].memctl, centaur.portpair, mac2ms), + PORTPAIR_SENSOR_PTRS(MPUM, &g_amec_sys.proc[0].memctl, centaur.portpair, mpu2ms), + PORTPAIR_SENSOR_PTRS(MIRBM, &g_amec_sys.proc[0].memctl, centaur.portpair, mirb2ms), + PORTPAIR_SENSOR_PTRS(MIRLM, &g_amec_sys.proc[0].memctl, centaur.portpair, mirl2ms), + PORTPAIR_SENSOR_PTRS(MIRMM, &g_amec_sys.proc[0].memctl, centaur.portpair, mirm2ms), + PORTPAIR_SENSOR_PTRS(MIRHM, &g_amec_sys.proc[0].memctl, centaur.portpair, mirh2ms), + PORTPAIR_SENSOR_PTRS(MTSM, &g_amec_sys.proc[0].memctl, centaur.portpair, mts2ms), + PORTPAIR_SENSOR_PTRS(M4RDM, &g_amec_sys.proc[0].memctl, centaur.portpair, m4rd2ms), + PORTPAIR_SENSOR_PTRS(M4WRM, &g_amec_sys.proc[0].memctl, centaur.portpair, m4wr2ms), - SENSOR_PTR(TEMP2MSCENT, &g_amec_sys.proc[0].temp2mscent), + SENSOR_PTR(TEMPCENT, &g_amec_sys.proc[0].temp2mscent), SENSOR_PTR(TEMPDIMMTHRM, &g_amec_sys.proc[0].tempdimmthrm), - SENSOR_PTR(MEMSP2MS, &g_amec_sys.proc[0].memsp2ms_tls), // ------------------------------------------------------ // GPU Sensors @@ -428,31 +429,20 @@ const sensor_ptr_t G_amec_sensor_list[] = SENSOR_PTR(TEMPGPU2, &g_amec_sys.proc[0].tempgpu2), // ------------------------------------------------------ - // Regulator Sensors - // ------------------------------------------------------ - SENSOR_PTR( UVOLT250USP0V0, &g_amec_sys.proc[0].vrm[0].uvolt250us), - SENSOR_PTR( UVOLT250USP0V1, &g_amec_sys.proc[0].vrm[1].uvolt250us), - SENSOR_PTR( VOLTVDD, &g_amec_sys.proc[0].vrm[0].volt250us), - SENSOR_PTR( VOLTVDN, &g_amec_sys.proc[0].vrm[1].volt250us), - SENSOR_PTR( CURVDD, &g_amec_sys.proc[0].curvdd), - SENSOR_PTR( CURVDN, &g_amec_sys.proc[0].curvdn), - SENSOR_PTR( VRFAN, &g_amec_sys.sys.vrfan), - - // ------------------------------------------------------ // Partition Sensors // ------------------------------------------------------ - SENSOR_PTR( UTIL2MSSLCG000, &g_amec_sys.part_config.part_list[0].util2msslack), - SENSOR_PTR( UTIL2MSSLCG001, &g_amec_sys.part_config.part_list[1].util2msslack), - SENSOR_PTR( UTIL2MSSLCG002, &g_amec_sys.part_config.part_list[2].util2msslack), - SENSOR_PTR( UTIL2MSSLCG003, &g_amec_sys.part_config.part_list[3].util2msslack), - SENSOR_PTR( UTIL2MSSLCG004, &g_amec_sys.part_config.part_list[4].util2msslack), - SENSOR_PTR( UTIL2MSSLCG005, &g_amec_sys.part_config.part_list[5].util2msslack), - SENSOR_PTR( UTIL2MSSLCG006, &g_amec_sys.part_config.part_list[6].util2msslack), - SENSOR_PTR( UTIL2MSSLCG007, &g_amec_sys.part_config.part_list[7].util2msslack), - SENSOR_PTR( UTIL2MSSLCG008, &g_amec_sys.part_config.part_list[8].util2msslack), - SENSOR_PTR( UTIL2MSSLCG009, &g_amec_sys.part_config.part_list[9].util2msslack), - SENSOR_PTR( UTIL2MSSLCG010, &g_amec_sys.part_config.part_list[10].util2msslack), - SENSOR_PTR( UTIL2MSSLCG011, &g_amec_sys.part_config.part_list[11].util2msslack), + SENSOR_PTR( UTILSLCG000, &g_amec_sys.part_config.part_list[0].util2msslack), + SENSOR_PTR( UTILSLCG001, &g_amec_sys.part_config.part_list[1].util2msslack), + SENSOR_PTR( UTILSLCG002, &g_amec_sys.part_config.part_list[2].util2msslack), + SENSOR_PTR( UTILSLCG003, &g_amec_sys.part_config.part_list[3].util2msslack), + SENSOR_PTR( UTILSLCG004, &g_amec_sys.part_config.part_list[4].util2msslack), + SENSOR_PTR( UTILSLCG005, &g_amec_sys.part_config.part_list[5].util2msslack), + SENSOR_PTR( UTILSLCG006, &g_amec_sys.part_config.part_list[6].util2msslack), + SENSOR_PTR( UTILSLCG007, &g_amec_sys.part_config.part_list[7].util2msslack), + SENSOR_PTR( UTILSLCG008, &g_amec_sys.part_config.part_list[8].util2msslack), + SENSOR_PTR( UTILSLCG009, &g_amec_sys.part_config.part_list[9].util2msslack), + SENSOR_PTR( UTILSLCG010, &g_amec_sys.part_config.part_list[10].util2msslack), + SENSOR_PTR( UTILSLCG011, &g_amec_sys.part_config.part_list[11].util2msslack), }; STATIC_ASSERT( (NUMBER_OF_SENSORS_IN_LIST != (sizeof(G_amec_sensor_list)/sizeof(sensor_ptr_t))) ); @@ -501,10 +491,28 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION = // System Sensors // ------------------------------------------------------ MINI_SENSOR_PTR( PWRSYS, NULL), - MINI_SENSOR_PTR( PWR250USFAN, NULL), - MINI_SENSOR_PTR( PWR250USIO, NULL), - MINI_SENSOR_PTR( PWR250USSTORE, NULL), + MINI_SENSOR_PTR( PWRFAN, NULL), + MINI_SENSOR_PTR( PWRIO, NULL), + MINI_SENSOR_PTR( PWRSTORE, NULL), MINI_SENSOR_PTR( PWRGPU, NULL), + MINI_SENSOR_PTR( PWRAPSSCH0, NULL), + MINI_SENSOR_PTR( PWRAPSSCH1, NULL), + MINI_SENSOR_PTR( PWRAPSSCH2, NULL), + MINI_SENSOR_PTR( PWRAPSSCH3, NULL), + MINI_SENSOR_PTR( PWRAPSSCH4, NULL), + MINI_SENSOR_PTR( PWRAPSSCH5, NULL), + MINI_SENSOR_PTR( PWRAPSSCH6, NULL), + MINI_SENSOR_PTR( PWRAPSSCH7, NULL), + MINI_SENSOR_PTR( PWRAPSSCH8, NULL), + MINI_SENSOR_PTR( PWRAPSSCH9, NULL), + MINI_SENSOR_PTR( PWRAPSSCH10, NULL), + MINI_SENSOR_PTR( PWRAPSSCH11, NULL), + MINI_SENSOR_PTR( PWRAPSSCH12, NULL), + MINI_SENSOR_PTR( PWRAPSSCH13, NULL), + MINI_SENSOR_PTR( PWRAPSSCH14, NULL), + MINI_SENSOR_PTR( PWRAPSSCH15, NULL), + MINI_SENSOR_PTR( CUR12VSTBY, NULL), + MINI_SENSOR_PTR( VRHOTMEMPRCCNT, NULL), // ------------------------------------------------------ // Chip Sensors @@ -517,13 +525,9 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION = // Processor Sensors // ------------------------------------------------------ MINI_SENSOR_PTR( FREQA, &G_dcom_slv_outbox_tx.freqa), - MINI_SENSOR_PTR( IPS4MSP0, &G_dcom_slv_outbox_tx.ips4msp0), - MINI_SENSOR_PTR( MEMSP2MSP0, NULL), + MINI_SENSOR_PTR( IPS, &G_dcom_slv_outbox_tx.ips4msp0), MINI_SENSOR_PTR( PWRPROC, &G_dcom_slv_outbox_tx.pwrproc), - MINI_SENSOR_PTR( PWR250USVDD0, NULL), - MINI_SENSOR_PTR( PWRVCSVIOVDN, NULL), - MINI_SENSOR_PTR( PWR250USMEM0, &G_dcom_slv_outbox_tx.pwr250usmemp0), - MINI_SENSOR_PTR( SP250USP0, NULL), + MINI_SENSOR_PTR( PWRMEM, &G_dcom_slv_outbox_tx.pwr250usmemp0), MINI_SENSOR_PTR( TEMPPROCAVG, &G_dcom_slv_outbox_tx.tempprocavg), MINI_SENSOR_PTR( TEMPPROCTHRM, &G_dcom_slv_outbox_tx.tempprocthermal), MINI_SENSOR_PTR( UTIL, &G_dcom_slv_outbox_tx.util), @@ -532,6 +536,8 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION = MINI_SENSOR_PTR( VOLTVDNSENSE, NULL), MINI_SENSOR_PTR( PWRVDD, NULL), MINI_SENSOR_PTR( PWRVDN, NULL), + MINI_SENSOR_PTR( PROCPWRTHROT, NULL), + MINI_SENSOR_PTR( PROCOTTHROT, NULL), // ------------------------------------------------------ // Quad Sensors (6 each) @@ -539,72 +545,97 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION = QUAD_MINI_SENSOR_PTRS_NULL( TEMPQ ), // ------------------------------------------------------ + // Regulator Sensors + // ------------------------------------------------------ + MINI_SENSOR_PTR( VOLTVDD, NULL), + MINI_SENSOR_PTR( VOLTVDN, NULL), + MINI_SENSOR_PTR( CURVDD, NULL), + MINI_SENSOR_PTR( CURVDN, NULL), + MINI_SENSOR_PTR( VRMPROCOT, NULL), + + // ------------------------------------------------------ // Core Sensors (24 of each) // ------------------------------------------------------ - CORE_MINI_SENSOR_PTRS_NULL( FREQ250USP0C ), + CORE_MINI_SENSOR_PTRS_NULL( FREQREQC ), CORE_MINI_SENSOR_PTRS_NULL( FREQAC ), - CORE_MINI_SENSOR_PTRS( IPS4MSP0C, &G_dcom_slv_outbox_tx.ips4msp0cy ), - CORE_MINI_SENSOR_PTRS( NOTBZE4MSP0C, &G_dcom_slv_outbox_tx.mcpifd4msp0cy ), - CORE_MINI_SENSOR_PTRS( NOTFIN4MSP0C, &G_dcom_slv_outbox_tx.mcpifi4msp0cy ), + CORE_MINI_SENSOR_PTRS( IPSC, &G_dcom_slv_outbox_tx.ips4msp0cy ), + CORE_MINI_SENSOR_PTRS( NOTBZEC, &G_dcom_slv_outbox_tx.mcpifd4msp0cy ), + CORE_MINI_SENSOR_PTRS( NOTFINC, &G_dcom_slv_outbox_tx.mcpifi4msp0cy ), CORE_MINI_SENSOR_PTRS_NULL( TEMPPROCTHRMC ), CORE_MINI_SENSOR_PTRS( UTILC, &G_dcom_slv_outbox_tx.utilcy ), - CORE_MINI_SENSOR_PTRS( NUTIL3SP0C, &G_dcom_slv_outbox_tx.nutil3sp0cy ), - CORE_MINI_SENSOR_PTRS_NULL( MSTL2MSP0C ), - CORE_MINI_SENSOR_PTRS_NULL( CMT2MSP0C ), - CORE_MINI_SENSOR_PTRS_NULL( PPICP0C ), - CORE_MINI_SENSOR_PTRS( PWRPX250USP0C, &G_dcom_slv_outbox_tx.pwrpx250usp0cy), + CORE_MINI_SENSOR_PTRS( NUTILC, &G_dcom_slv_outbox_tx.nutil3sp0cy ), + CORE_MINI_SENSOR_PTRS_NULL( MSTLC ), CORE_MINI_SENSOR_PTRS_NULL( TEMPC ), + CORE_MINI_SENSOR_PTRS_NULL( STOPDEEPREQC ), + CORE_MINI_SENSOR_PTRS_NULL( STOPDEEPACTC ), // ------------------------------------------------------ // Memory Sensors // ------------------------------------------------------ - MEMCONTROL_MINI_SENSOR_PTRS(MRD2MSP0M, &G_dcom_slv_outbox_tx.mrd2msp0mx), // - MEMCONTROL_MINI_SENSOR_PTRS(MWR2MSP0M, &G_dcom_slv_outbox_tx.mwr2msp0mx), // - MEMCONTROL_MINI_SENSOR_PTRS_NULL(MIRC2MSP0M), - MEMCONTROL_MINI_SENSOR_PTRS_NULL(MLP2P0M), - - PORTPAIR_MINI_SENSOR_PTRS_NULL(MAC2MSP0M), - PORTPAIR_MINI_SENSOR_PTRS_NULL(MPU2MSP0M), - PORTPAIR_MINI_SENSOR_PTRS_NULL(MIRB2MSP0M), - PORTPAIR_MINI_SENSOR_PTRS_NULL(MIRL2MSP0M), - PORTPAIR_MINI_SENSOR_PTRS_NULL(MIRM2MSP0M), - PORTPAIR_MINI_SENSOR_PTRS_NULL(MIRH2MSP0M), - PORTPAIR_MINI_SENSOR_PTRS_NULL(MTS2MSP0M), - PORTPAIR_MINI_SENSOR_PTRS_NULL(MEMSP2MSPM), - PORTPAIR_MINI_SENSOR_PTRS_NULL(M4RD2MSP0M), - PORTPAIR_MINI_SENSOR_PTRS_NULL(M4WR2MSP0M), - - MINI_SENSOR_PTR( TEMP2MSCENT, &G_dcom_slv_outbox_tx.temp2mscent), + MEMCONTROL_MINI_SENSOR_PTRS(MRDM, &G_dcom_slv_outbox_tx.mrd2msp0mx), // + MEMCONTROL_MINI_SENSOR_PTRS(MWRM, &G_dcom_slv_outbox_tx.mwr2msp0mx), // + MEMCONTROL_MINI_SENSOR_PTRS_NULL(MIRCM), + MEMCONTROL_MINI_SENSOR_PTRS_NULL(MLP2M), + + MINI_SENSOR_PTR( TEMPDIMM00, NULL), + MINI_SENSOR_PTR( TEMPDIMM01, NULL), + MINI_SENSOR_PTR( TEMPDIMM02, NULL), + MINI_SENSOR_PTR( TEMPDIMM03, NULL), + MINI_SENSOR_PTR( TEMPDIMM04, NULL), + MINI_SENSOR_PTR( TEMPDIMM05, NULL), + MINI_SENSOR_PTR( TEMPDIMM06, NULL), + MINI_SENSOR_PTR( TEMPDIMM07, NULL), + MINI_SENSOR_PTR( TEMPDIMM08, NULL), + MINI_SENSOR_PTR( TEMPDIMM09, NULL), + MINI_SENSOR_PTR( TEMPDIMM10, NULL), + MINI_SENSOR_PTR( TEMPDIMM11, NULL), + MINI_SENSOR_PTR( TEMPDIMM12, NULL), + MINI_SENSOR_PTR( TEMPDIMM13, NULL), + MINI_SENSOR_PTR( TEMPDIMM14, NULL), + MINI_SENSOR_PTR( TEMPDIMM15, NULL), + + MEMCONTROL_MINI_SENSOR_PTRS_NULL(TEMPDIMMAXM), + MEMCONTROL_MINI_SENSOR_PTRS_NULL(LOCDIMMAXM), + + MINI_SENSOR_PTR( MEMPWRTHROT, NULL), + MINI_SENSOR_PTR( MEMOTTHROT, NULL), + + PORTPAIR_MINI_SENSOR_PTRS_NULL(MACM), + PORTPAIR_MINI_SENSOR_PTRS_NULL(MPUM), + PORTPAIR_MINI_SENSOR_PTRS_NULL(MIRBM), + PORTPAIR_MINI_SENSOR_PTRS_NULL(MIRLM), + PORTPAIR_MINI_SENSOR_PTRS_NULL(MIRMM), + PORTPAIR_MINI_SENSOR_PTRS_NULL(MIRHM), + PORTPAIR_MINI_SENSOR_PTRS_NULL(MTSM), + PORTPAIR_MINI_SENSOR_PTRS_NULL(M4RDM), + PORTPAIR_MINI_SENSOR_PTRS_NULL(M4WRM), + + MINI_SENSOR_PTR( TEMPCENT, &G_dcom_slv_outbox_tx.temp2mscent), MINI_SENSOR_PTR( TEMPDIMMTHRM, &G_dcom_slv_outbox_tx.tempdimmthrm), - MINI_SENSOR_PTR( MEMSP2MS, NULL), // ------------------------------------------------------ - // Regulator Sensors + // GPU Sensors // ------------------------------------------------------ - MINI_SENSOR_PTR( UVOLT250USP0V0, NULL), - MINI_SENSOR_PTR( UVOLT250USP0V1, NULL), - MINI_SENSOR_PTR( VOLTVDD, NULL), - MINI_SENSOR_PTR( VOLTVDN, NULL), - MINI_SENSOR_PTR( CURVDD, NULL), - MINI_SENSOR_PTR( CURVDN, NULL), - MINI_SENSOR_PTR( VRFAN, NULL), + MINI_SENSOR_PTR( TEMPGPU0, NULL), + MINI_SENSOR_PTR( TEMPGPU1, NULL), + MINI_SENSOR_PTR( TEMPGPU2, NULL), // ------------------------------------------------------ // Partition Sensors // ------------------------------------------------------ - MINI_SENSOR_PTR( UTIL2MSSLCG000, NULL), - MINI_SENSOR_PTR( UTIL2MSSLCG001, NULL), - MINI_SENSOR_PTR( UTIL2MSSLCG002, NULL), - MINI_SENSOR_PTR( UTIL2MSSLCG003, NULL), - MINI_SENSOR_PTR( UTIL2MSSLCG004, NULL), - MINI_SENSOR_PTR( UTIL2MSSLCG005, NULL), - MINI_SENSOR_PTR( UTIL2MSSLCG006, NULL), - MINI_SENSOR_PTR( UTIL2MSSLCG007, NULL), - MINI_SENSOR_PTR( UTIL2MSSLCG008, NULL), - MINI_SENSOR_PTR( UTIL2MSSLCG009, NULL), - MINI_SENSOR_PTR( UTIL2MSSLCG010, NULL), - MINI_SENSOR_PTR( UTIL2MSSLCG011, NULL), + MINI_SENSOR_PTR( UTILSLCG000, NULL), + MINI_SENSOR_PTR( UTILSLCG001, NULL), + MINI_SENSOR_PTR( UTILSLCG002, NULL), + MINI_SENSOR_PTR( UTILSLCG003, NULL), + MINI_SENSOR_PTR( UTILSLCG004, NULL), + MINI_SENSOR_PTR( UTILSLCG005, NULL), + MINI_SENSOR_PTR( UTILSLCG006, NULL), + MINI_SENSOR_PTR( UTILSLCG007, NULL), + MINI_SENSOR_PTR( UTILSLCG008, NULL), + MINI_SENSOR_PTR( UTILSLCG009, NULL), + MINI_SENSOR_PTR( UTILSLCG010, NULL), + MINI_SENSOR_PTR( UTILSLCG011, NULL), }; STATIC_ASSERT( (NUMBER_OF_SENSORS_IN_LIST != (sizeof(G_amec_mini_sensor_list)/sizeof(uint16_t *))) ); STATIC_ASSERT( (MAX_AMEC_SENSORS < (sizeof(G_amec_mini_sensor_list)/sizeof(uint16_t *))) ); |