summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Soldatov <a.soldatov@yadro.com>2019-04-17 21:03:29 +0300
committerAndrew Jeffery <andrew@aj.id.au>2019-04-18 11:15:19 +0930
commited068475e807a70e1c6dfaa4782ed4d252967ed8 (patch)
treeaded982b23db973d9e28f67dbf752d714d5c69e8
parent7300893c7ce63918c72b2e9121d183dac5465bfa (diff)
downloadtalos-obmc-linux-ed068475e807a70e1c6dfaa4782ed4d252967ed8.tar.gz
talos-obmc-linux-ed068475e807a70e1c6dfaa4782ed4d252967ed8.zip
hwmon (occ): Add temp sensor value check
The occ driver supports two formats for the temp sensor value. The OCC firmware for P8 supports only the first format, for which no range checking or error processing is performed in the driver. Inspecting the OCC sources for P8 reveals that OCC may send a special value 0xFFFF to indicate that a sensor read timeout has occurred, see https://github.com/open-power/occ/blob/master_p8/src/occ/cmdh/cmdh_fsp_cmds.c#L395 That situation wasn't handled in the driver. This patch adds invalid temp value check for the sensor data format 1 and handles it the same way as it is done for the format 2, where EREMOTEIO is reported for this case. Signed-off-by: Alexander Soldatov <a.soldatov@yadro.com> Signed-off-by: Alexander Amelkin <a.amelkin@yadro.com> Reviewed-by: Alexander Amelkin <a.amelkin@yadro.com> Cc: Edward A. James <eajames@us.ibm.com> Cc: Joel Stanley <joel@jms.id.au> Reviewed-by: Eddie James <eajames@linux.ibm.com>
-rw-r--r--drivers/hwmon/occ/common.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hwmon/occ/common.c b/drivers/hwmon/occ/common.c
index 0e812effba6a..e6d3fb54769b 100644
--- a/drivers/hwmon/occ/common.c
+++ b/drivers/hwmon/occ/common.c
@@ -238,6 +238,12 @@ static ssize_t occ_show_temp_1(struct device *dev,
val = get_unaligned_be16(&temp->sensor_id);
break;
case 1:
+ /*
+ * If a sensor reading has expired and couldn't be refreshed,
+ * OCC returns 0xFFFF for that sensor.
+ */
+ if (temp->value == 0xFFFF)
+ return -EREMOTEIO;
val = get_unaligned_be16(&temp->value) * 1000;
break;
default:
OpenPOWER on IntegriCloud