diff options
| author | mbroyles <mbroyles@us.ibm.com> | 2016-10-18 09:07:27 -0500 |
|---|---|---|
| committer | Martha Broyles <mbroyles@us.ibm.com> | 2016-10-20 17:15:07 -0400 |
| commit | 9af547bcc5ff79e711d1e497a3ff56b30d313448 (patch) | |
| tree | bfb88a83bf0936a93789211a8d99d9b7d2200ee2 /src/occ_405/sensor | |
| parent | 055aad1e072a479e2f7ab89f60e75ff2ad6c85d6 (diff) | |
| download | talos-occ-9af547bcc5ff79e711d1e497a3ff56b30d313448.tar.gz talos-occ-9af547bcc5ff79e711d1e497a3ff56b30d313448.zip | |
Support new APSS Function IDs
RTC: 162291
Change-Id: I979615313a9c5e860fa570736e0ce598b978f877
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31416
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Reviewed-by: Wael El-Essawy <welessa@us.ibm.com>
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Diffstat (limited to 'src/occ_405/sensor')
| -rwxr-xr-x | src/occ_405/sensor/sensor_enum.h | 3 | ||||
| -rwxr-xr-x | src/occ_405/sensor/sensor_info.c | 3 | ||||
| -rwxr-xr-x | src/occ_405/sensor/sensor_table.c | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/occ_405/sensor/sensor_enum.h b/src/occ_405/sensor/sensor_enum.h index a1dd1c2..2bba7b1 100755 --- a/src/occ_405/sensor/sensor_enum.h +++ b/src/occ_405/sensor/sensor_enum.h @@ -82,7 +82,7 @@ enum e_gsid PWR250USFAN, // Fan Power (from APSS) PWR250USIO, // IO Subsystem Power (from APSS) PWR250USSTORE, // Storage Subsys Power (from APSS) - PWR250USGPU, // GPU Subsystem Power (from APSS) e.g. Nvidia GPU + PWRGPU, // GPU Subsystem Power (from APSS) e.g. Nvidia GPU FANSPEEDAVG, // Average Fan Speed (from DPSS) PWRAPSSCH0, // These PWRAPSSCH sensors are used to report the power PWRAPSSCH1, // provided by each of the 16 APSS channels. @@ -100,6 +100,7 @@ enum e_gsid PWRAPSSCH13, PWRAPSSCH14, PWRAPSSCH15, + CUR12VSTBY, // 12V Standby Current // ------------------------------------------------------ // Chip Sensors diff --git a/src/occ_405/sensor/sensor_info.c b/src/occ_405/sensor/sensor_info.c index cd29e10..3713d9f 100755 --- a/src/occ_405/sensor/sensor_info.c +++ b/src/occ_405/sensor/sensor_info.c @@ -233,7 +233,7 @@ const sensor_info_t G_sensor_info[] = 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( PWR250USGPU, "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( FANSPEEDAVG, "RPM\0", AMEC_SENSOR_TYPE_TEMP, 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) ), @@ -251,6 +251,7 @@ const sensor_info_t G_sensor_info[] = 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( CUR12VSTBY, "A\0", AMEC_SENSOR_TYPE_CURRENT, AMEC_SENSOR_LOC_SYS, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1,-2) ), /* ==ChipSensors== NameString Units Type Location Number Freq ScaleFactor */ diff --git a/src/occ_405/sensor/sensor_table.c b/src/occ_405/sensor/sensor_table.c index 5ab4f15..519ca61 100755 --- a/src/occ_405/sensor/sensor_table.c +++ b/src/occ_405/sensor/sensor_table.c @@ -301,7 +301,7 @@ const sensor_ptr_t G_amec_sensor_list[] = 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( PWR250USGPU, &g_amec_sys.sys.pwr250usgpu), + SENSOR_PTR( PWRGPU, &g_amec_sys.sys.pwr250usgpu), SENSOR_PTR( FANSPEEDAVG, &g_amec_sys.fan.fanspeedavg), SENSOR_PTR( PWRAPSSCH0, &g_amec_sys.sys.pwrapssch[0]), SENSOR_PTR( PWRAPSSCH1, &g_amec_sys.sys.pwrapssch[1]), @@ -319,6 +319,7 @@ const sensor_ptr_t G_amec_sensor_list[] = SENSOR_PTR( PWRAPSSCH13, &g_amec_sys.sys.pwrapssch[13]), SENSOR_PTR( PWRAPSSCH14, &g_amec_sys.sys.pwrapssch[14]), SENSOR_PTR( PWRAPSSCH15, &g_amec_sys.sys.pwrapssch[15]), + SENSOR_PTR( CUR12VSTBY, &g_amec_sys.sys.cur12Vstby), // ------------------------------------------------------ // Chip Sensors @@ -475,7 +476,7 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION = MINI_SENSOR_PTR( PWR250USFAN, NULL), MINI_SENSOR_PTR( PWR250USIO, NULL), MINI_SENSOR_PTR( PWR250USSTORE, NULL), - MINI_SENSOR_PTR( PWR250USGPU, NULL), + MINI_SENSOR_PTR( PWRGPU, NULL), MINI_SENSOR_PTR( FANSPEEDAVG, NULL), // ------------------------------------------------------ |
