From 696f17ae72ededfd5cf05341bc50e00ce8b08fa6 Mon Sep 17 00:00:00 2001 From: Matt Derksen Date: Tue, 5 Sep 2017 10:30:29 -0500 Subject: [PATCH] Small cleanup for OCC/HTMGT GPU sensor support Made const more generic instead of system specific Change-Id: I6229c727428c0c077d335e5c1eb66e06651ea39d RTC:178218 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/45654 Reviewed-by: Martin Gloff Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Tested-by: Jenkins OP HW Reviewed-by: Christian R. Geddes Reviewed-by: Daniel M. Crowell --- src/usr/ipmi/ipmisensor.C | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/usr/ipmi/ipmisensor.C b/src/usr/ipmi/ipmisensor.C index 59cfcd41f47..4ee831fa840 100644 --- a/src/usr/ipmi/ipmisensor.C +++ b/src/usr/ipmi/ipmisensor.C @@ -1283,9 +1283,8 @@ namespace SENSOR /** * @brief All sensors returned cfgID bit - * NV keyword = 0x02 --> 0b0100 -> 4 */ - static const uint16_t NVCFG_ALL_SENSORS_RETURNED = 4; + static const uint16_t NVCFG_ALL_SENSORS_RETURNED = 0xFFFF; /** * @brief Helper function to getGpuSensors() @@ -1411,9 +1410,10 @@ namespace SENSOR row_ptr[3], row_ptr[4], row_ptr[5], row_ptr[6]); // Include Sensor if the GPU is present in the current OBUS_CFG - if ((L_obus_cfgID_bit & - row_ptr[TARGETING::GPU_SENSOR_ARRAY_OBUS_CFG_OFFSET]) - == L_obus_cfgID_bit ) + if ( (L_obus_cfgID_bit == NVCFG_ALL_SENSORS_RETURNED) || + ((L_obus_cfgID_bit & + row_ptr[TARGETING::GPU_SENSOR_ARRAY_OBUS_CFG_OFFSET]) + == L_obus_cfgID_bit) ) { switch(i_type) { @@ -1549,9 +1549,10 @@ namespace SENSOR StatusSensor::statusEnum newStatus = i_gpu_status[index]; // Include Sensor if the GPU is present in the current OBUS_CFG - if ((obus_cfgID_bit & + if ( (obus_cfgID_bit == NVCFG_ALL_SENSORS_RETURNED) || + ((obus_cfgID_bit & sensor_row_ptr[TARGETING::GPU_SENSOR_ARRAY_OBUS_CFG_OFFSET]) - == obus_cfgID_bit ) + == obus_cfgID_bit) ) { // Only update the GPU status sensors, skip temperature ones // GPU core Status/Functional Sensor