VRM Vdd Interfaces

Change-Id: I8e2b597773c940ebc79972974a95fb323ea26660
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/48065
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Reviewed-by: Andres A. Lugo-Reyes <aalugore@us.ibm.com>
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>

3 files changed, 23 insertions, 15 deletions

diff --git a/src/occ_405/sensor/sensor_enum.h b/src/occ_405/sensor/sensor_enum.h
index f3fe743..433530e 100755
--- a/src/occ_405/sensor/sensor_enum.h
+++ b/src/occ_405/sensor/sensor_enum.h
@@ -145,6 +145,7 @@ enum e_gsid
     CURVDD,
     CURVDN,
     VRMPROCOT,
+    TEMPVDD,
 
     // ------------------------------------------------------
     // Core Sensors
diff --git a/src/occ_405/sensor/sensor_info.c b/src/occ_405/sensor/sensor_info.c
index 23bda41..06f3ff1 100755
--- a/src/occ_405/sensor/sensor_info.c
+++ b/src/occ_405/sensor/sensor_info.c
@@ -29,7 +29,9 @@
 #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_1500US_IN_HZ AMEFP(75,1)      //   750 Hz
 #define AMEEFP_2MS_IN_HZ    AMEFP(5,2)       //   500 Hz
+#define AMEEFP_3MS_IN_HZ    AMEFP(375,0)     //   375 Hz
 #define AMEEFP_4MS_IN_HZ    AMEFP(25,1)      //   250 Hz
 #define AMEEFP_8MS_IN_HZ    AMEFP(125,0)     //   125 Hz
 #define AMEEFP_16MS_IN_HZ   AMEFP(625,-1)    //  62.5 Hz
@@ -40,14 +42,16 @@
 #define AMEFP_SCALE_0_16384 AMEFP(610352,-8) // scalar so that digital 16384=100%
 
 // constants to allow fewer changes if tick time changes
-#define AMEEFP_EVERY_TICK_HZ        AMEEFP_500US_IN_HZ // tick time 500us
-#define AMEEFP_EVERY_2ND_TICK_HZ    AMEEFP_1MS_IN_HZ  // 1ms
-#define AMEEFP_EVERY_4TH_TICK_HZ    AMEEFP_2MS_IN_HZ  // 2ms
-#define AMEEFP_EVERY_8TH_TICK_HZ    AMEEFP_4MS_IN_HZ  // 4ms
-#define AMEEFP_EVERY_16TH_TICK_HZ   AMEEFP_8MS_IN_HZ  // 8ms
-#define AMEEFP_EVERY_32ND_TICK_HZ   AMEEFP_16MS_IN_HZ // 16ms
-#define AMEEFP_EVERY_64TH_TICK_HZ   AMEEFP_32MS_IN_HZ // 32ms
-#define AMEEFP_EVERY_128TH_TICK_HZ  AMEEFP_64MS_IN_HZ // 64ms
+#define AMEEFP_EVERY_TICK_HZ        AMEEFP_500US_IN_HZ  // tick time 500us
+#define AMEEFP_EVERY_2ND_TICK_HZ    AMEEFP_1MS_IN_HZ    // 1ms
+#define AMEEFP_EVERY_3RD_TICK_HZ    AMEEFP_1500US_IN_HZ // 1.5ms
+#define AMEEFP_EVERY_4TH_TICK_HZ    AMEEFP_2MS_IN_HZ    // 2ms
+#define AMEEFP_EVERY_6TH_TICK_HZ    AMEEFP_3MS_IN_HZ    // 3ms
+#define AMEEFP_EVERY_8TH_TICK_HZ    AMEEFP_4MS_IN_HZ    // 4ms
+#define AMEEFP_EVERY_16TH_TICK_HZ   AMEEFP_8MS_IN_HZ    // 8ms
+#define AMEEFP_EVERY_32ND_TICK_HZ   AMEEFP_16MS_IN_HZ   // 16ms
+#define AMEEFP_EVERY_64TH_TICK_HZ   AMEEFP_32MS_IN_HZ   // 32ms
+#define AMEEFP_EVERY_128TH_TICK_HZ  AMEEFP_64MS_IN_HZ   // 64ms
 
 // This will get the string when given the GSID
 #define SENSOR_GSID_TO_STRING(gsid)  G_sensor_list[gsid].name;
@@ -320,8 +324,8 @@ 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_EVERY_16TH_TICK_HZ, AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(           UTIL,   "%\0",    AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_EVERY_16TH_TICK_HZ, AMEFP(  1,-2)  ),
   SENSOR_INFO_T_ENTRY(       TEMPNEST,   "C\0",    AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_EVERY_16TH_TICK_HZ, AMEFP(  1, 0)  ),
-  SENSOR_INFO_T_ENTRY(   VOLTVDDSENSE,  "mV\0", AMEC_SENSOR_TYPE_VOLTAGE, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,  AMEEFP_EVERY_2ND_TICK_HZ, AMEFP(  1, -1)  ),
-  SENSOR_INFO_T_ENTRY(   VOLTVDNSENSE,  "mV\0", AMEC_SENSOR_TYPE_VOLTAGE, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,  AMEEFP_EVERY_2ND_TICK_HZ, AMEFP(  1, -1)  ),
+  SENSOR_INFO_T_ENTRY(   VOLTVDDSENSE,  "mV\0", AMEC_SENSOR_TYPE_VOLTAGE, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,  AMEEFP_EVERY_3RD_TICK_HZ, AMEFP(  1, -1)  ),
+  SENSOR_INFO_T_ENTRY(   VOLTVDNSENSE,  "mV\0", AMEC_SENSOR_TYPE_VOLTAGE, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,  AMEEFP_EVERY_3RD_TICK_HZ, AMEFP(  1, -1)  ),
   SENSOR_INFO_T_ENTRY(         PWRVDD,   "W\0",   AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,  AMEEFP_EVERY_2ND_TICK_HZ, AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(         PWRVDN,   "W\0",   AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,  AMEEFP_EVERY_2ND_TICK_HZ, AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(   PROCPWRTHROT,   "#\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,      AMEEFP_EVERY_TICK_HZ, AMEFP(  1, 0)  ),
@@ -331,11 +335,12 @@ const sensor_info_t G_sensor_info[]   =
   SENS_QUAD_ENTRY_SET(  VOLTDROOPCNTQ,   "#\0", AMEC_SENSOR_TYPE_VOLTAGE, AMEC_SENSOR_LOC_QUAD, AMEC_SENSOR_NONUM, AMEEFP_EVERY_16TH_TICK_HZ, AMEFP(  1, 0)  ),
 
   /* ==ReguSensors==       NameString  Units                      Type              Location             Number                Freq          ScaleFactor   */
-  SENSOR_INFO_T_ENTRY(        VOLTVDD, "mV\0", AMEC_SENSOR_TYPE_VOLTAGE,  AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_2ND_TICK_HZ, AMEFP(  1, -1)  ),
-  SENSOR_INFO_T_ENTRY(        VOLTVDN, "mV\0", AMEC_SENSOR_TYPE_VOLTAGE,  AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_2ND_TICK_HZ, AMEFP(  1, -1)  ),
-  SENSOR_INFO_T_ENTRY(         CURVDD,  "A\0", AMEC_SENSOR_TYPE_CURRENT,  AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_2ND_TICK_HZ, AMEFP(  1,-2)  ),
-  SENSOR_INFO_T_ENTRY(         CURVDN,  "A\0", AMEC_SENSOR_TYPE_CURRENT,  AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_2ND_TICK_HZ, AMEFP(  1,-2)  ),
-  SENSOR_INFO_T_ENTRY(      VRMPROCOT,  "#\0",    AMEC_SENSOR_TYPE_TEMP,  AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_4TH_TICK_HZ, AMEFP(  1, 0)  ),
+  SENSOR_INFO_T_ENTRY(        VOLTVDD, "mV\0", AMEC_SENSOR_TYPE_VOLTAGE,  AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_3RD_TICK_HZ, AMEFP(  1, -1)  ),
+  SENSOR_INFO_T_ENTRY(        VOLTVDN, "mV\0", AMEC_SENSOR_TYPE_VOLTAGE,  AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_3RD_TICK_HZ, AMEFP(  1, -1)  ),
+  SENSOR_INFO_T_ENTRY(         CURVDD,  "A\0", AMEC_SENSOR_TYPE_CURRENT,  AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_3RD_TICK_HZ, AMEFP(  1,-2)  ),
+  SENSOR_INFO_T_ENTRY(         CURVDN,  "A\0", AMEC_SENSOR_TYPE_CURRENT,  AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_3RD_TICK_HZ, AMEFP(  1,-2)  ),
+  SENSOR_INFO_T_ENTRY(      VRMPROCOT,  "#\0",    AMEC_SENSOR_TYPE_TEMP,  AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_6TH_TICK_HZ, AMEFP(  1, 0)  ),
+  SENSOR_INFO_T_ENTRY(        TEMPVDD,  "C\0",    AMEC_SENSOR_TYPE_TEMP,  AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_6TH_TICK_HZ, AMEFP(  1, 0)  ),
 
   /* ==CoreSensors==       NameString  Units                      Type              Location             Number                Freq          ScaleFactor   */
   SENS_CORE_ENTRY_SET(       FREQREQC, "MHz\0",   AMEC_SENSOR_TYPE_FREQ, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,      AMEEFP_EVERY_TICK_HZ, AMEFP(  1, 0)  ),
diff --git a/src/occ_405/sensor/sensor_table.c b/src/occ_405/sensor/sensor_table.c
index c2dabdb..1b7aef0 100755
--- a/src/occ_405/sensor/sensor_table.c
+++ b/src/occ_405/sensor/sensor_table.c
@@ -377,6 +377,7 @@ const sensor_ptr_t G_amec_sensor_list[] =
   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),
+  SENSOR_PTR( TEMPVDD,              &g_amec_sys.sys.tempvdd),
 
 
   // ------------------------------------------------------
@@ -558,6 +559,7 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION =
   MINI_SENSOR_PTR( CURVDD,          NULL),
   MINI_SENSOR_PTR( CURVDN,          NULL),
   MINI_SENSOR_PTR( VRMPROCOT,       NULL),
+  MINI_SENSOR_PTR( TEMPVDD,         NULL),
 
   // ------------------------------------------------------
   // Core Sensors (24 of each)