show sensor: add critical controller temperatures

Signed-off-by: Amy Wang <[email protected]> Signed-off-by: Juston Li <[email protected]>
intel · Aug 9, 2018 · 63b8823 · 63b8823
1 parent 57fcc1c
commit 63b8823
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/DcpmemPkg/cli/ShowSensorCommand.c b/DcpmemPkg/cli/ShowSensorCommand.c
@@ -383,8 +383,9 @@ ShowSensor(
         **/
         if (!DisplayOptionSet || (DisplayOptionSet && ContainsValue(pDisplayValues, LOWER_THRESHOLD_CRITICAL_STR))) {
           switch (Index2) {
+          case SENSOR_TYPE_CONTROLLER_TEMPERATURE:
           case SENSOR_TYPE_MEDIA_TEMPERATURE:
-            // Only Media temperature sensor got lower critical threshold
+            // Only Media temperature sensor and Controller Temperature Sensor got lower critical threshold
             pTempBuff = GetSensorValue(DimmSensorsSet[Index2].CriticalLowerThreshold, DimmSensorsSet[Index2].Type);
             break;
           default:
@@ -400,8 +401,9 @@ ShowSensor(
         **/
         if (!DisplayOptionSet || (DisplayOptionSet && ContainsValue(pDisplayValues, UPPER_THRESHOLD_CRITICAL_STR))) {
           switch (Index2) {
+          case SENSOR_TYPE_CONTROLLER_TEMPERATURE:
           case SENSOR_TYPE_MEDIA_TEMPERATURE:
-            // Only Media temperature sensor got upper critical threshold
+        	  // Only Media temperature sensor and Controller Temperature Sensor got lower critical threshold
             pTempBuff = GetSensorValue(DimmSensorsSet[Index2].CriticalUpperThreshold, DimmSensorsSet[Index2].Type);
             break;
           default:

diff --git a/DcpmemPkg/common/NvmHealth.c b/DcpmemPkg/common/NvmHealth.c
@@ -77,17 +77,19 @@ GetSensorsInfo(
 
   /** Copy SMART & Health values **/
   DimmSensorsSet[SENSOR_TYPE_MEDIA_TEMPERATURE].Value = SensorInfo.MediaTemperature;
+  DimmSensorsSet[SENSOR_TYPE_MEDIA_TEMPERATURE].CriticalLowerThreshold = SensorInfo.MediaThrottlingStopThresh;
+  DimmSensorsSet[SENSOR_TYPE_MEDIA_TEMPERATURE].CriticalUpperThreshold = SensorInfo.MediaThrottlingStartThresh;
+  DimmSensorsSet[SENSOR_TYPE_MEDIA_TEMPERATURE].FatalThreshold = SensorInfo.MediaTempShutdownThresh;
   DimmSensorsSet[SENSOR_TYPE_CONTROLLER_TEMPERATURE].Value = SensorInfo.ControllerTemperature;
+  DimmSensorsSet[SENSOR_TYPE_CONTROLLER_TEMPERATURE].FatalThreshold = SensorInfo.ContrTempShutdownThresh;
+  DimmSensorsSet[SENSOR_TYPE_CONTROLLER_TEMPERATURE].CriticalLowerThreshold = SensorInfo.ControllerThrottlingStopThresh;
+  DimmSensorsSet[SENSOR_TYPE_CONTROLLER_TEMPERATURE].CriticalUpperThreshold = SensorInfo.ControllerThrottlingStartThresh;
   DimmSensorsSet[SENSOR_TYPE_PERCENTAGE_REMAINING].Value = SensorInfo.PercentageRemaining;
   DimmSensorsSet[SENSOR_TYPE_POWER_CYCLES].Value = SensorInfo.PowerCycles;
   DimmSensorsSet[SENSOR_TYPE_POWER_ON_TIME].Value = SensorInfo.PowerOnTime;
   DimmSensorsSet[SENSOR_TYPE_DIRTY_SHUTDOWNS].Value = SensorInfo.DirtyShutdowns;
   DimmSensorsSet[SENSOR_TYPE_FW_ERROR_COUNT].Value = SensorInfo.MediaErrorCount + SensorInfo.ThermalErrorCount;
   DimmSensorsSet[SENSOR_TYPE_UP_TIME].Value = SensorInfo.UpTime;
-  DimmSensorsSet[SENSOR_TYPE_MEDIA_TEMPERATURE].CriticalLowerThreshold = SensorInfo.MediaThrottlingStopThresh;
-  DimmSensorsSet[SENSOR_TYPE_MEDIA_TEMPERATURE].CriticalUpperThreshold = SensorInfo.MediaThrottlingStartThresh;
-  DimmSensorsSet[SENSOR_TYPE_MEDIA_TEMPERATURE].FatalThreshold = SensorInfo.MediaTempShutdownThresh;
-  DimmSensorsSet[SENSOR_TYPE_CONTROLLER_TEMPERATURE].FatalThreshold = SensorInfo.ContrTempShutdownThresh;
 
   /** Determine Health State based on Health Status Bit Mask **/
   ConvertHealthBitmask(SensorInfo.HealthStatus, &DimmHealthState);

diff --git a/DcpmemPkg/common/Types.h b/DcpmemPkg/common/Types.h
@@ -146,6 +146,8 @@ typedef struct _SENSOR_INFO {
   INT16 MediaTempShutdownThresh;        ///< Media temperature shutdown threshold in C
   INT16 MediaThrottlingStartThresh;     ///< Media throttling start temperature threshold in C
   INT16 MediaThrottlingStopThresh;      ///< Media throttling stop temperature threshold in C
+  INT16 ControllerThrottlingStartThresh;///< Controller throttling stop temperature threshold in C
+  INT16 ControllerThrottlingStopThresh; ///< Controller throttling stop temperature threshold in C
 } SENSOR_INFO;
 
 /**

diff --git a/DcpmemPkg/driver/Core/NvmDimmPassThru.h b/DcpmemPkg/driver/Core/NvmDimmPassThru.h
@@ -422,7 +422,9 @@ typedef struct {
   TEMPERATURE MediaShutdownThreshold;
   TEMPERATURE MediaThrottlingStartThreshold;
   TEMPERATURE MediaThrottlingStopThreshold;
-  UINT8 Reserved[120];
+  TEMPERATURE ControllerThrottlingStartThreshold;
+  TEMPERATURE ControllerThrottlingStopThreshold;
+  UINT8 Reserved[116];
 } PT_DEVICE_CHARACTERISTICS_PAYLOAD;
 
 /**

diff --git a/DcpmemPkg/driver/Protocol/Driver/NvmDimmConfig.c b/DcpmemPkg/driver/Protocol/Driver/NvmDimmConfig.c
@@ -2346,6 +2346,10 @@ GetSmartAndHealth (
   /** Get Device Characteristics data **/
   pSensorInfo->ContrTempShutdownThresh =
       TransformFwTempToRealValue(pDevCharacteristics->ControllerShutdownThreshold);
+  pSensorInfo->ControllerThrottlingStartThresh =
+      TransformFwTempToRealValue(pDevCharacteristics->ControllerThrottlingStartThreshold);
+  pSensorInfo->ControllerThrottlingStopThresh =
+      TransformFwTempToRealValue(pDevCharacteristics->ControllerThrottlingStopThreshold);
   pSensorInfo->MediaTempShutdownThresh =
       TransformFwTempToRealValue(pDevCharacteristics->MediaShutdownThreshold);
   pSensorInfo->MediaThrottlingStartThresh =