Initial 405 GPU support

Change-Id: I6e957ca1aa643d257274e99957df5b15ac8c889b
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44254
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>

3 files changed, 20 insertions, 7 deletions

diff --git a/src/occ_405/sensor/sensor_enum.h b/src/occ_405/sensor/sensor_enum.h
index 4d2d483..62745d3 100755
--- a/src/occ_405/sensor/sensor_enum.h
+++ b/src/occ_405/sensor/sensor_enum.h
@@ -689,6 +689,9 @@ enum e_gsid
     TEMPGPU0,
     TEMPGPU1,
     TEMPGPU2,
+    TEMPGPU0MEM,
+    TEMPGPU1MEM,
+    TEMPGPU2MEM,
 
     // ------------------------------------------------------
     // Partition Sensors
diff --git a/src/occ_405/sensor/sensor_info.c b/src/occ_405/sensor/sensor_info.c
index 99cd069..0592908 100755
--- a/src/occ_405/sensor/sensor_info.c
+++ b/src/occ_405/sensor/sensor_info.c
@@ -35,6 +35,7 @@
 #define AMEEFP_16MS_IN_HZ   AMEFP(625,-1)    //  62.5 Hz
 #define AMEEFP_32MS_IN_HZ   AMEFP(3125,-2)   // 31.25 Hz
 #define AMEEFP_64MS_IN_HZ   AMEFP(15625,-3)  // 15.625 Hz
+#define AMEEFP_1S_IN_HZ     AMEFP(1,0)       //   1.0 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%
 
@@ -376,10 +377,13 @@ const sensor_info_t G_sensor_info[]   =
   SENSOR_INFO_T_ENTRY(       TEMPCENT,   "C\0",   AMEC_SENSOR_TYPE_TEMP,  AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM,   AMEEFP_EVERY_8TH_TICK_HZ, AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(   TEMPDIMMTHRM,   "C\0",   AMEC_SENSOR_TYPE_TEMP,  AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_128TH_TICK_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_EVERY_128TH_TICK_HZ, AMEFP(  1, 0)  ),
-  SENSOR_INFO_T_ENTRY(   TEMPGPU1,   "C\0",    AMEC_SENSOR_TYPE_TEMP,  AMEC_SENSOR_LOC_GPU, AMEC_SENSOR_NONUM,  AMEEFP_EVERY_128TH_TICK_HZ, AMEFP(  1, 0)  ),
-  SENSOR_INFO_T_ENTRY(   TEMPGPU2,   "C\0",    AMEC_SENSOR_TYPE_TEMP,  AMEC_SENSOR_LOC_GPU, AMEC_SENSOR_NONUM,  AMEEFP_EVERY_128TH_TICK_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_1S_IN_HZ, AMEFP(  1, 0)  ),
+  SENSOR_INFO_T_ENTRY(   TEMPGPU1,    "C\0",   AMEC_SENSOR_TYPE_TEMP,  AMEC_SENSOR_LOC_GPU, AMEC_SENSOR_NONUM,  AMEEFP_1S_IN_HZ, AMEFP(  1, 0)  ),
+  SENSOR_INFO_T_ENTRY(   TEMPGPU2,    "C\0",   AMEC_SENSOR_TYPE_TEMP,  AMEC_SENSOR_LOC_GPU, AMEC_SENSOR_NONUM,  AMEEFP_1S_IN_HZ, AMEFP(  1, 0)  ),
+  SENSOR_INFO_T_ENTRY(   TEMPGPU0MEM, "C\0",   AMEC_SENSOR_TYPE_TEMP,  AMEC_SENSOR_LOC_GPU, AMEC_SENSOR_NONUM,  AMEEFP_1S_IN_HZ, AMEFP(  1, 0)  ),
+  SENSOR_INFO_T_ENTRY(   TEMPGPU1MEM, "C\0",   AMEC_SENSOR_TYPE_TEMP,  AMEC_SENSOR_LOC_GPU, AMEC_SENSOR_NONUM,  AMEEFP_1S_IN_HZ, AMEFP(  1, 0)  ),
+  SENSOR_INFO_T_ENTRY(   TEMPGPU2MEM, "C\0",   AMEC_SENSOR_TYPE_TEMP,  AMEC_SENSOR_LOC_GPU, AMEC_SENSOR_NONUM,  AMEEFP_1S_IN_HZ, AMEFP(  1, 0)  ),
 
   /* ==PartSummarySensors== NameString Units                   Type              Location             Number                Freq          ScaleFactor   */
   SENSOR_INFO_T_ENTRY(   UTILSLCG000,  "%\0", AMEC_SENSOR_TYPE_UTIL,  AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM,  AMEEFP_EVERY_8TH_TICK_HZ, AMEFP_SCALE_0_16384),
diff --git a/src/occ_405/sensor/sensor_table.c b/src/occ_405/sensor/sensor_table.c
index 11fffd9..b4128a3 100755
--- a/src/occ_405/sensor/sensor_table.c
+++ b/src/occ_405/sensor/sensor_table.c
@@ -424,9 +424,12 @@ const sensor_ptr_t G_amec_sensor_list[] =
   // ------------------------------------------------------
   // GPU Sensors
   // ------------------------------------------------------
-  SENSOR_PTR(TEMPGPU0,              &g_amec_sys.proc[0].tempgpu0),
-  SENSOR_PTR(TEMPGPU1,              &g_amec_sys.proc[0].tempgpu1),
-  SENSOR_PTR(TEMPGPU2,              &g_amec_sys.proc[0].tempgpu2),
+  SENSOR_PTR(TEMPGPU0,              &g_amec_sys.gpu[0].tempgpu),
+  SENSOR_PTR(TEMPGPU1,              &g_amec_sys.gpu[1].tempgpu),
+  SENSOR_PTR(TEMPGPU2,              &g_amec_sys.gpu[2].tempgpu),
+  SENSOR_PTR(TEMPGPU0MEM,           &g_amec_sys.gpu[0].tempgpumem),
+  SENSOR_PTR(TEMPGPU1MEM,           &g_amec_sys.gpu[1].tempgpumem),
+  SENSOR_PTR(TEMPGPU2MEM,           &g_amec_sys.gpu[2].tempgpumem),
 
   // ------------------------------------------------------
   // Partition Sensors
@@ -620,6 +623,9 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION =
   MINI_SENSOR_PTR( TEMPGPU0,     NULL),
   MINI_SENSOR_PTR( TEMPGPU1,     NULL),
   MINI_SENSOR_PTR( TEMPGPU2,     NULL),
+  MINI_SENSOR_PTR( TEMPGPU0MEM,  NULL),
+  MINI_SENSOR_PTR( TEMPGPU1MEM,  NULL),
+  MINI_SENSOR_PTR( TEMPGPU2MEM,  NULL),
 
   // ------------------------------------------------------
   // Partition Sensors