summaryrefslogtreecommitdiffstats
path: root/src/occ_405/sensor
diff options
context:
space:
mode:
authorChris Cain <cjcain@us.ibm.com>2017-01-24 15:56:29 -0600
committerChristopher J. Cain <cjcain@us.ibm.com>2017-01-27 15:15:32 -0500
commit6610ab230252ce3a96adbc5ddfeca7cf45ab69b2 (patch)
tree50a9ec2766c2c0f0e1a7f2eedacc049c44aed697 /src/occ_405/sensor
parent360934dea9355e488206267d7f9fd9b1c753cf16 (diff)
downloadtalos-occ-6610ab230252ce3a96adbc5ddfeca7cf45ab69b2.tar.gz
talos-occ-6610ab230252ce3a96adbc5ddfeca7cf45ab69b2.zip
Add VR Fan and OC support via AVSBUS
- monitor VR Fan (over-temperature) and OC (over-current) - add VR Fan sensor to poll response (Temperature FRU type: VRM) - log mfg error for OC - add error history counters for each Change-Id: Ia552aa2cc2db8adebcbbd928c146a057bb120c73 RTC: 132561 RTC: 132560 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35358 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Martha Broyles <mbroyles@us.ibm.com> Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com>
Diffstat (limited to 'src/occ_405/sensor')
-rwxr-xr-xsrc/occ_405/sensor/sensor_enum.h24
-rwxr-xr-xsrc/occ_405/sensor/sensor_info.c23
-rwxr-xr-xsrc/occ_405/sensor/sensor_table.c37
3 files changed, 34 insertions, 50 deletions
diff --git a/src/occ_405/sensor/sensor_enum.h b/src/occ_405/sensor/sensor_enum.h
index 37c411c..9b70941 100755
--- a/src/occ_405/sensor/sensor_enum.h
+++ b/src/occ_405/sensor/sensor_enum.h
@@ -69,9 +69,6 @@ enum e_gsid
PROBE250US6, // Internal Sensor for debug via AMESTER
PROBE250US7, // Internal Sensor for debug via AMESTER
- VOLTVDDSENSE, // chip voltage (remote sense adjusted for loadline)
- VOLTVDNSENSE, // chip voltage (remote sense adjusted for loadline)
-
GPEtickdur0, // Duration on the GPE0 Engine
GPEtickdur1, // Duration on the GPE1 Engine
RTLtickdur, // Duration on the RTL tick interrupt
@@ -120,7 +117,6 @@ enum e_gsid
MEMSP2MSP0,
PWR250USP0,
PWR250USVDD0, // from APSS (no change)
- CURVDD, // from AVSBUS - renamed from CUR250USVDD0 (was calculated from APSS data)
PWRVCSVIOVDN, // from APSS - rename from PWR250USVCS0 to show what it includes
PWR250USMEM0,
SLEEPCNT4MSP0,
@@ -130,8 +126,10 @@ enum e_gsid
TEMPPROCTHRM,
UTIL4MSP0,
TEMPNEST,
- VRFAN250USPROC,
- VRHOT250USPROC,
+ VOLTVDDSENSE, // chip voltage (remote sense adjusted for loadline)
+ VOLTVDNSENSE, // chip voltage (remote sense adjusted for loadline)
+ PWRVDD, // calculated from AVSBUS data
+ PWRVDN, // calculated from AVSBUS data
TEMPQ0,
TEMPQ1,
@@ -465,24 +463,20 @@ enum e_gsid
TEMPC22,
TEMPC23,
- CURVDN, // new - from AVSBUS
- PWRVDD, // new - calculated from AVSBUS data
- PWRVDN, // new - calculated from AVSBUS data
-
// ------------------------------------------------------
// Regulator Sensors
// ------------------------------------------------------
UVOLT250USP0V0,
UVOLT250USP0V1,
- VOLTVDD, // always from AVSBUS - renamed from VOLT250USP0V0
- VOLTVDN, // always from AVSBUS - renamed from VOLT250USP0V1
+ VOLTVDD,
+ VOLTVDN,
+ CURVDD,
+ CURVDN,
+ VRFAN,
// ------------------------------------------------------
// Memory Sensors
// ------------------------------------------------------
- VRFAN250USMEM,
- VRHOT250USMEM,
-
MRD2MSP0M0,
MRD2MSP0M1,
MRD2MSP0M2,
diff --git a/src/occ_405/sensor/sensor_info.c b/src/occ_405/sensor/sensor_info.c
index dc7e77f..a457c20 100755
--- a/src/occ_405/sensor/sensor_info.c
+++ b/src/occ_405/sensor/sensor_info.c
@@ -26,10 +26,11 @@
#include <occ_common.h> // STATIC_ASSERT macro
#include <sensor.h> // For Sensor defines
-#define AMEEFP_2MS_IN_HZ AMEFP(5,2) // 500 Hz
-#define AMEEFP_4MS_IN_HZ AMEFP(25,1) // 250 Hz
#define AMEEFP_250US_IN_HZ AMEFP(4,3) // 4000 Hz
#define AMEEFP_500US_IN_HZ AMEFP(2,3) // 2000 Hz
+#define AMEEFP_1MS_IN_HZ AMEFP(1,3) // 1000 Hz
+#define AMEEFP_2MS_IN_HZ AMEFP(5,2) // 500 Hz
+#define AMEEFP_4MS_IN_HZ AMEFP(25,1) // 250 Hz
#define AMEEFP_3S_IN_HZ AMEFP(333,-3) // 0.333 Hz
#define AMEFP_SCALE_0_16384 AMEFP(610352,-8) // scalar so that digital 16384=100%
@@ -223,8 +224,6 @@ const sensor_info_t G_sensor_info[] =
SENSOR_INFO_T_ENTRY( PROBE250US5, "n/a\0", AMEC_SENSOR_TYPE_GENERIC, AMEC_SENSOR_LOC_OCC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ),
SENSOR_INFO_T_ENTRY( PROBE250US6, "n/a\0", AMEC_SENSOR_TYPE_GENERIC, AMEC_SENSOR_LOC_OCC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ),
SENSOR_INFO_T_ENTRY( PROBE250US7, "n/a\0", AMEC_SENSOR_TYPE_GENERIC, AMEC_SENSOR_LOC_OCC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ),
- SENSOR_INFO_T_ENTRY( VOLTVDDSENSE, "mV\0", AMEC_SENSOR_TYPE_VOLTAGE, AMEC_SENSOR_LOC_OCC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, -1) ),
- SENSOR_INFO_T_ENTRY( VOLTVDNSENSE, "mV\0", AMEC_SENSOR_TYPE_VOLTAGE, AMEC_SENSOR_LOC_OCC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, -1) ),
SENSOR_INFO_T_ENTRY( GPEtickdur0, "us\0", AMEC_SENSOR_TYPE_TIME, AMEC_SENSOR_LOC_OCC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ),
SENSOR_INFO_T_ENTRY( GPEtickdur1, "us\0", AMEC_SENSOR_TYPE_TIME, AMEC_SENSOR_LOC_OCC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ),
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) ),
@@ -268,7 +267,6 @@ const sensor_info_t G_sensor_info[] =
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( PWR250USP0, "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( 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( 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( SLEEPCNT4MSP0, "#\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_4MS_IN_HZ, AMEFP( 1, 0) ),
@@ -278,18 +276,21 @@ const sensor_info_t G_sensor_info[] =
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( UTIL4MSP0, "%\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( VRFAN250USPROC, "pin\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ),
- SENSOR_INFO_T_ENTRY( VRHOT250USPROC, "pin\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_250US_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( 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) ),
+
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) ),
- 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( PWRVDD, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_500US_IN_HZ, AMEFP( 1, 0) ),
- SENSOR_INFO_T_ENTRY( PWRVDN, "W\0", AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_500US_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) ),
/* ==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) ),
@@ -307,8 +308,6 @@ const sensor_info_t G_sensor_info[] =
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) ),
/* ==MemSensors== NameString Units Type Location Number Freq ScaleFactor */
- SENSOR_INFO_T_ENTRY( VRFAN250USMEM, "pin\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ),
- SENSOR_INFO_T_ENTRY( VRHOT250USMEM, "pin\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ, AMEFP( 1, 0) ),
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) ),
diff --git a/src/occ_405/sensor/sensor_table.c b/src/occ_405/sensor/sensor_table.c
index faa7d68..3761b4a 100755
--- a/src/occ_405/sensor/sensor_table.c
+++ b/src/occ_405/sensor/sensor_table.c
@@ -287,8 +287,6 @@ const sensor_ptr_t G_amec_sensor_list[] =
SENSOR_PTR( PROBE250US5, &g_amec_sys.fw.probe250us[5]),
SENSOR_PTR( PROBE250US6, &g_amec_sys.fw.probe250us[6]),
SENSOR_PTR( PROBE250US7, &g_amec_sys.fw.probe250us[7]),
- SENSOR_PTR( VOLTVDDSENSE, &g_amec_sys.fw.voltvddsense),
- SENSOR_PTR( VOLTVDNSENSE, &g_amec_sys.fw.voltvdnsense),
SENSOR_PTR( GPEtickdur0, &g_amec_sys.fw.gpetickdur[0]),
SENSOR_PTR( GPEtickdur1, &g_amec_sys.fw.gpetickdur[1]),
SENSOR_PTR( RTLtickdur, &g_amec_sys.fw.prcdupdatedur),
@@ -337,7 +335,6 @@ const sensor_ptr_t G_amec_sensor_list[] =
SENSOR_PTR( MEMSP2MSP0, &g_amec_sys.proc[0].memsp2ms),
SENSOR_PTR( PWR250USP0, &g_amec_sys.proc[0].pwr250us),
SENSOR_PTR( PWR250USVDD0, &g_amec_sys.proc[0].pwr250usvdd),
- SENSOR_PTR( CURVDD, &g_amec_sys.proc[0].curvdd),
SENSOR_PTR( PWRVCSVIOVDN, &g_amec_sys.proc[0].pwrvcsviovdn),
SENSOR_PTR( PWR250USMEM0, &g_amec_sys.proc[0].pwr250usmem),
SENSOR_PTR( SLEEPCNT4MSP0, &g_amec_sys.proc[0].sleepcnt4ms),
@@ -347,8 +344,10 @@ const sensor_ptr_t G_amec_sensor_list[] =
SENSOR_PTR( TEMPPROCTHRM, &g_amec_sys.proc[0].tempprocthermal),
SENSOR_PTR( UTIL4MSP0, &g_amec_sys.proc[0].util4ms),
SENSOR_PTR( TEMPNEST, &g_amec_sys.proc[0].tempnest),
- SENSOR_PTR( VRFAN250USPROC, &g_amec_sys.sys.vrfan250usproc),
- SENSOR_PTR( VRHOT250USPROC, &g_amec_sys.sys.vrhot250usproc),
+ SENSOR_PTR( VOLTVDDSENSE, &g_amec_sys.fw.voltvddsense),
+ SENSOR_PTR( VOLTVDNSENSE, &g_amec_sys.fw.voltvdnsense),
+ SENSOR_PTR( PWRVDD, &g_amec_sys.proc[0].pwrvdd),
+ SENSOR_PTR( PWRVDN, &g_amec_sys.proc[0].pwrvdn),
// ------------------------------------------------------
// Quad Sensors (6 each)
@@ -372,16 +371,9 @@ const sensor_ptr_t G_amec_sensor_list[] =
CORE_SENSOR_PTRS( PWRPX250USP0C , &g_amec_sys.proc[0].core, pwrpx250us),
CORE_SENSOR_PTRS( TEMPC, &g_amec_sys.proc[0].core, tempc),
- SENSOR_PTR( CURVDN, &g_amec_sys.proc[0].curvdn),
- SENSOR_PTR( PWRVDD, &g_amec_sys.proc[0].pwrvdd),
- SENSOR_PTR( PWRVDN, &g_amec_sys.proc[0].pwrvdn),
-
// ------------------------------------------------------
// Memory Sensors
// ------------------------------------------------------
- SENSOR_PTR( VRFAN250USMEM, &g_amec_sys.sys.vrfan250usmem),
- SENSOR_PTR( VRHOT250USMEM, &g_amec_sys.sys.vrhot250usmem),
-
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),
@@ -412,6 +404,9 @@ const sensor_ptr_t G_amec_sensor_list[] =
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
@@ -468,8 +463,6 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION =
MINI_SENSOR_PTR( PROBE250US5, NULL),
MINI_SENSOR_PTR( PROBE250US6, NULL),
MINI_SENSOR_PTR( PROBE250US7, NULL),
- MINI_SENSOR_PTR( VOLTVDDSENSE, NULL),
- MINI_SENSOR_PTR( VOLTVDNSENSE, NULL),
MINI_SENSOR_PTR( GPEtickdur0, NULL),
MINI_SENSOR_PTR( GPEtickdur1, NULL),
MINI_SENSOR_PTR( RTLtickdur, NULL),
@@ -501,7 +494,6 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION =
MINI_SENSOR_PTR( MEMSP2MSP0, NULL),
MINI_SENSOR_PTR( PWR250USP0, &G_dcom_slv_outbox_tx.pwr250usp0),
MINI_SENSOR_PTR( PWR250USVDD0, NULL),
- MINI_SENSOR_PTR( CURVDD, NULL),
MINI_SENSOR_PTR( PWRVCSVIOVDN, NULL),
MINI_SENSOR_PTR( PWR250USMEM0, &G_dcom_slv_outbox_tx.pwr250usmemp0),
MINI_SENSOR_PTR( SLEEPCNT4MSP0, &G_dcom_slv_outbox_tx.sleepcnt4msp0),
@@ -511,8 +503,10 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION =
MINI_SENSOR_PTR( TEMPPROCTHRM, &G_dcom_slv_outbox_tx.tempprocthermal),
MINI_SENSOR_PTR( UTIL4MSP0, &G_dcom_slv_outbox_tx.util4msp0),
MINI_SENSOR_PTR( TEMPNEST, NULL),
- MINI_SENSOR_PTR( VRFAN250USPROC, &G_dcom_slv_outbox_tx.vrfan250usproc),
- MINI_SENSOR_PTR( VRHOT250USPROC, NULL),
+ MINI_SENSOR_PTR( VOLTVDDSENSE, NULL),
+ MINI_SENSOR_PTR( VOLTVDNSENSE, NULL),
+ MINI_SENSOR_PTR( PWRVDD, NULL),
+ MINI_SENSOR_PTR( PWRVDN, NULL),
// ------------------------------------------------------
// Quad Sensors (6 each)
@@ -536,15 +530,9 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION =
CORE_MINI_SENSOR_PTRS( PWRPX250USP0C, &G_dcom_slv_outbox_tx.pwrpx250usp0cy),
CORE_MINI_SENSOR_PTRS_NULL( TEMPC ),
- MINI_SENSOR_PTR( CURVDN, NULL),
- MINI_SENSOR_PTR( PWRVDD, NULL),
- MINI_SENSOR_PTR( PWRVDN, NULL),
-
// ------------------------------------------------------
// Memory Sensors
// ------------------------------------------------------
- MINI_SENSOR_PTR( VRFAN250USMEM, &G_dcom_slv_outbox_tx.vrfan250usmem),
- MINI_SENSOR_PTR( VRHOT250USMEM, NULL),
MEMCONTROL_MINI_SENSOR_PTRS(MRD2MSP0M, &G_dcom_slv_outbox_tx.mrd2msp0mx), //
MEMCONTROL_MINI_SENSOR_PTRS(MWR2MSP0M, &G_dcom_slv_outbox_tx.mwr2msp0mx), //
@@ -573,6 +561,9 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION =
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),
// ------------------------------------------------------
// Partition Sensors
OpenPOWER on IntegriCloud