linux-pm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: Zhang Rui <rui.zhang@intel.com>
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>,
	Daniel Lezcano <daniel.lezcano@linaro.org>,
	Lucas Stach <l.stach@pengutronix.de>,
	Chris Healy <cphealy@gmail.com>,
	Eduardo Valentin <edubezval@gmail.com>,
	Angus Ainslie <angus@akkea.ca>,
	linux-imx@nxp.com, linux-pm@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH v7 10/12] thermal: qoriq: Do not report invalid temperature reading
Date: Wed, 11 Sep 2019 18:34:45 -0700	[thread overview]
Message-ID: <20190912013447.2977-4-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190912013447.2977-1-andrew.smirnov@gmail.com>

Before returning measured temperature data to upper layer we need to
make sure that the reading was marked as "valid" to avoid reporting
bogus data.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Tested-by: Lucas Stach <l.stach@pengutronix.de>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Eduardo Valentin <edubezval@gmail.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Angus Ainslie (Purism) <angus@akkea.ca>
Cc: linux-imx@nxp.com
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
 drivers/thermal/qoriq_thermal.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
index 1cc53a4a5c47..48853192514a 100644
--- a/drivers/thermal/qoriq_thermal.c
+++ b/drivers/thermal/qoriq_thermal.c
@@ -38,6 +38,7 @@
 #define REGS_TRITSR(n)	(0x100 + 16 * (n)) /* Immediate Temperature
 					    * Site Register
 					    */
+#define TRITSR_V	BIT(31)
 #define REGS_TTRnCR(n)	(0xf10 + 4 * (n)) /* Temperature Range n
 					   * Control Register
 					   */
@@ -64,8 +65,24 @@ static int tmu_get_temp(void *p, int *temp)
 	struct qoriq_sensor *qsensor = p;
 	struct qoriq_tmu_data *qdata = qoriq_sensor_to_data(qsensor);
 	u32 val;
+	/*
+	 * REGS_TRITSR(id) has the following layout:
+	 *
+	 * 31  ... 7 6 5 4 3 2 1 0
+	 *  V          TEMP
+	 *
+	 * Where V bit signifies if the measurement is ready and is
+	 * within sensor range. TEMP is an 8 bit value representing
+	 * temperature in C.
+	 */
+	if (regmap_read_poll_timeout(qdata->regmap,
+				     REGS_TRITSR(qsensor->id),
+				     val,
+				     val & TRITSR_V,
+				     USEC_PER_MSEC,
+				     10 * USEC_PER_MSEC))
+		return -ENODATA;
 
-	regmap_read(qdata->regmap, REGS_TRITSR(qsensor->id), &val);
 	*temp = (val & 0xff) * 1000;
 
 	return 0;
-- 
2.21.0


  parent reply	other threads:[~2019-09-12  1:35 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-12  1:29 [PATCH v7 00/12] QorIQ TMU multi-sensor and HWMON support Andrey Smirnov
2019-09-12  1:29 ` [PATCH v7 01/12] thermal: qoriq: Add local struct device pointer Andrey Smirnov
2019-09-12  1:29 ` [PATCH v7 02/12] thermal: qoriq: Don't store struct thermal_zone_device reference Andrey Smirnov
2019-09-12  1:29 ` [PATCH v7 03/12] thermal: qoriq: Add local struct qoriq_sensor pointer Andrey Smirnov
2019-09-12  1:29 ` [PATCH v7 04/12] thermal: qoriq: Embed per-sensor data into struct qoriq_tmu_data Andrey Smirnov
2019-09-12  1:29 ` [PATCH v7 05/12] thermal: qoriq: Pass data to qoriq_tmu_register_tmu_zone() directly Andrey Smirnov
2019-09-12  1:29 ` [PATCH v7 06/12] thermal: qoriq: Pass data to qoriq_tmu_calibration() directly Andrey Smirnov
2019-09-12  1:34 ` [PATCH v7 07/12] thermal: qoriq: Drop unnecessary drvdata cleanup Andrey Smirnov
2019-09-12  1:34   ` [PATCH v7 08/12] thermal: qoriq: Convert driver to use regmap API Andrey Smirnov
2019-09-12  1:34   ` [PATCH v7 09/12] thermal: qoriq: Enable all sensors before registering them Andrey Smirnov
2019-09-12  1:34   ` Andrey Smirnov [this message]
2019-09-12  1:34   ` [PATCH v7 11/12] thermal_hwmon: Add devres wrapper for thermal_add_hwmon_sysfs() Andrey Smirnov
2019-09-12  1:34   ` [PATCH v7 12/12] thermal: qoriq: Add hwmon support Andrey Smirnov
2019-12-06 11:46 ` [PATCH v7 00/12] QorIQ TMU multi-sensor and HWMON support Lucas Stach
2019-12-06 12:01   ` Daniel Lezcano
2019-12-09 18:20   ` Daniel Lezcano
2019-12-09 18:49     ` Andrey Smirnov
2019-12-09 18:54       ` Daniel Lezcano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190912013447.2977-4-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=angus@akkea.ca \
    --cc=cphealy@gmail.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=edubezval@gmail.com \
    --cc=l.stach@pengutronix.de \
    --cc=linux-imx@nxp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=rui.zhang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).