OCC support for no APSS and new GPU Config Data

Change-Id: Id58a06378f3c0a7fd9fb436b96823eca15028031
RTC: 160889
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41513
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>

4 files changed, 20 insertions, 0 deletions

diff --git a/src/occ_405/sensor/sensor.h b/src/occ_405/sensor/sensor.h
index 535b434..7b49865 100755
--- a/src/occ_405/sensor/sensor.h
+++ b/src/occ_405/sensor/sensor.h
@@ -93,6 +93,7 @@ typedef enum
     AMEC_SENSOR_LOC_VRM         = 0x0010,
     AMEC_SENSOR_LOC_OCC         = 0x0020,
     AMEC_SENSOR_LOC_CORE        = 0x0040,
+    AMEC_SENSOR_LOC_GPU         = 0x0080,
     AMEC_SENSOR_LOC_ALL         = 0xffff,
 }AMEC_SENSOR_LOC;
 
diff --git a/src/occ_405/sensor/sensor_enum.h b/src/occ_405/sensor/sensor_enum.h
index b41e9e4..3937f7d 100755
--- a/src/occ_405/sensor/sensor_enum.h
+++ b/src/occ_405/sensor/sensor_enum.h
@@ -727,6 +727,13 @@ enum e_gsid
     MEMSP2MS,
 
     // ------------------------------------------------------
+    // GPU Sensors
+    // ------------------------------------------------------
+    TEMPGPU0,
+    TEMPGPU1,
+    TEMPGPU2,
+
+    // ------------------------------------------------------
     // Partition Sensors
     // ------------------------------------------------------
     UTIL2MSSLCG000,
diff --git a/src/occ_405/sensor/sensor_info.c b/src/occ_405/sensor/sensor_info.c
index 6ee5da4..926cced 100755
--- a/src/occ_405/sensor/sensor_info.c
+++ b/src/occ_405/sensor/sensor_info.c
@@ -370,6 +370,11 @@ const sensor_info_t G_sensor_info[]   =
   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)  ),
+  SENSOR_INFO_T_ENTRY(    TEMPGPU1,   "C\0",    AMEC_SENSOR_TYPE_TEMP,  AMEC_SENSOR_LOC_GPU, AMEC_SENSOR_NONUM,  AMEEFP_32MS_IN_HZ,   AMEFP(  1, 0)  ),
+  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),
diff --git a/src/occ_405/sensor/sensor_table.c b/src/occ_405/sensor/sensor_table.c
index 1cb2ac6..e5f92ca 100755
--- a/src/occ_405/sensor/sensor_table.c
+++ b/src/occ_405/sensor/sensor_table.c
@@ -417,6 +417,13 @@ const sensor_ptr_t G_amec_sensor_list[] =
   SENSOR_PTR(MEMSP2MS,              &g_amec_sys.proc[0].memsp2ms_tls),
 
   // ------------------------------------------------------
+  // 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),
+
+  // ------------------------------------------------------
   // Regulator Sensors
   // ------------------------------------------------------
   SENSOR_PTR( UVOLT250USP0V0,       &g_amec_sys.proc[0].vrm[0].uvolt250us),