Add individual DIMM temperature sensor support

Change-Id: If5b024f031d4b266603720d126fce88bf2362e1a
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36528
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com>

6 files changed, 9 insertions, 36 deletions

diff --git a/src/occ_405/amec/amec_amester.c b/src/occ_405/amec/amec_amester.c
index e70b7e1..90107ca 100755
--- a/src/occ_405/amec/amec_amester.c
+++ b/src/occ_405/amec/amec_amester.c
@@ -754,23 +754,6 @@ uint8_t amester_manual_throttle( const IPMIMsg_t * i_msg,
                 }
 
 
-                case 24:   // parameter 24: set ambient and fan speed sensors
-                {
-                    // Set ambient temperature (8 bits)
-                    temp16=(uint16_t)i_msg->au8CmdData_ptr[2];
-                    sensor_update(AMECSENSOR_PTR(TEMPAMBIENT), temp16);
-                    // Set average fan speed (16 bits)
-                    temp16=((uint16_t)i_msg->au8CmdData_ptr[3]<<8)+(uint16_t)i_msg->au8CmdData_ptr[4];
-                    sensor_update(AMECSENSOR_PTR(FANSPEEDAVG), temp16);
-                    o_resp[0]=i_msg->au8CmdData_ptr[2];
-                    o_resp[1]=i_msg->au8CmdData_ptr[3];
-                    o_resp[2]=i_msg->au8CmdData_ptr[3];
-                     *io_resp_length=3;
-                    l_rc = COMPCODE_NORMAL;
-                    break;
-                }
-
-
                 case 29:   // parameter 29: Control vector recording modes and stream rates.
                 {
                     g_amec->stream_vector_rate=255; // First step is to set an invalid rate so no recording done at all
diff --git a/src/occ_405/amec/amec_analytics.c b/src/occ_405/amec/amec_analytics.c
index c806292..80bb2ce 100755
--- a/src/occ_405/amec/amec_analytics.c
+++ b/src/occ_405/amec/amec_analytics.c
@@ -437,11 +437,6 @@ void amec_analytics_main(void)
                 // Now, update Group 45 analytics packed array
                 switch (g_amec->analytics_thermal_offset)
                 {
-                    case 0:
-                        tempreg = (g_amec->sys.tempambient.sample) << 8;   // upper byte
-                        tempreg = tempreg | 0x8000;    // Turn on MSBit for temporal frame sync
-                        break;
-
                     case 1:
                          if (g_amec->mst_ips_parms.active == 0)
                          {
@@ -459,12 +454,8 @@ void amec_analytics_main(void)
                         tempreg=(g_amec->mst_ips_parms.active)<<8;   // upper byte
                         break;
 
-                    case 3:
-                        tempreg = (g_amec->fan.fanspeedavg.sample / 100) << 8;   // upper byte (100 RPM resolution)
-                        break;
-
                     case 4:
-                        tempreg = (g_amec->proc[0].temp16msdimm.sample) << 8;   // upper byte
+                        tempreg = (g_amec->proc[0].tempdimmthrm.sample) << 8;   // upper byte
                         break;
 
                     case 5:
@@ -472,7 +463,7 @@ void amec_analytics_main(void)
                         break;
 
                     case 6:
-                        // tempreg=(g_amec->proc[2].temp16msdimm.sample)<<8;   // upper byte
+                        // tempreg=(g_amec->proc[2].tempdimmthrm.sample)<<8;   // upper byte
                         tempreg = 0;
                         break;
 
diff --git a/src/occ_405/amec/amec_controller.c b/src/occ_405/amec/amec_controller.c
index 1ee5169..5bc858c 100644
--- a/src/occ_405/amec/amec_controller.c
+++ b/src/occ_405/amec/amec_controller.c
@@ -176,8 +176,8 @@ void amec_controller_dimm_thermal()
     /*------------------------------------------------------------------------*/
     /*  Code                                                                  */
     /*------------------------------------------------------------------------*/
-    // Get TEMP16MSDIMM sensor value
-    l_sensor = getSensorByGsid(TEMP16MSDIMM);
+    // Get TEMPDIMMTHRM sensor value
+    l_sensor = getSensorByGsid(TEMPDIMMTHRM);
 
     if(G_dimm_temp_expired_bitmap.bigword)
     {
diff --git a/src/occ_405/amec/amec_health.c b/src/occ_405/amec/amec_health.c
index 0495a92..0f0edf7 100755
--- a/src/occ_405/amec/amec_health.c
+++ b/src/occ_405/amec/amec_health.c
@@ -165,7 +165,7 @@ void amec_health_check_dimm_temp()
     }
 
     l_ot_error = g_amec->thermaldimm.ot_error;
-    l_sensor = getSensorByGsid(TEMP16MSDIMM);
+    l_sensor = getSensorByGsid(TEMPDIMMTHRM);
     l_cur_temp = l_sensor->sample;
     l_max_temp = l_sensor->sample_max;
     TRAC_ERR("amec_health_check_dimm_temp: DIMM reached error temp[%d]. cur_max[%d], hist_max[%d]",
diff --git a/src/occ_405/amec/amec_sensors_centaur.c b/src/occ_405/amec/amec_sensors_centaur.c
index 3e050f9..6871a56 100644
--- a/src/occ_405/amec/amec_sensors_centaur.c
+++ b/src/occ_405/amec/amec_sensors_centaur.c
@@ -415,7 +415,7 @@ void amec_update_centaur_temp_sensors(void)
             l_hot = g_amec->proc[0].memctl[k].centaur.tempdimmax.sample;
         }
     }
-    sensor_update(&g_amec->proc[0].temp16msdimm,l_hot);
+    sensor_update(&g_amec->proc[0].tempdimmthrm,l_hot);
     AMEC_DBG("HotDimm=%d\n",l_hot);
 }
 
diff --git a/src/occ_405/amec/amec_sys.h b/src/occ_405/amec/amec_sys.h
index e2335cd..7fd0f95 100755
--- a/src/occ_405/amec/amec_sys.h
+++ b/src/occ_405/amec/amec_sys.h
@@ -95,7 +95,6 @@ typedef struct
 typedef struct
 {
   // Sensors
-  sensor_t fanspeedavg;
   sensor_t pwr250usfan;
 
 } amec_fans_t;
@@ -358,8 +357,6 @@ typedef struct
 typedef struct
 {
   // System Sensors
-  sensor_t tempambient;
-  sensor_t altitude;
   sensor_t pwr250us;
   sensor_t pwr250usgpu;
   sensor_t pwrapssch[MAX_APSS_ADC_CHANNELS];
@@ -468,8 +465,10 @@ typedef struct
 
   // Memory Summary Sensors
   sensor_t temp2mscent;
-  sensor_t temp16msdimm;
+  sensor_t tempdimmthrm;
   sensor_t memsp2ms_tls;
+  // Nimbus DIMM Sensors
+  sensor_t       tempdimm[NUM_DIMM_PORTS*NUM_DIMMS_PER_I2CPORT];
 
   sensor_t curvdn;
   sensor_t pwrvdd;