[v2,5/5] thermal: tsens: Check if we have valid data before reading

Message ID 021331bdb04642e9ddf34accda65a93b850c4a23.1528799892.git.amit.kucheria@linaro.org
State New
Headers show
Series
  • [v2,1/5] thermal: tsens: Get rid of unused fields in structure
Related show

Commit Message

Amit Kucheria June 12, 2018, 10:54 a.m.
Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>

---
 drivers/thermal/qcom/tsens-common.c | 9 +++++++++
 1 file changed, 9 insertions(+)

-- 
2.7.4

Comments

Bjorn Andersson June 12, 2018, 7:43 p.m. | #1
On Tue 12 Jun 03:54 PDT 2018, Amit Kucheria wrote:

> Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>


Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>


Regards,
Bjorn

> ---

>  drivers/thermal/qcom/tsens-common.c | 9 +++++++++

>  1 file changed, 9 insertions(+)

> 

> diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c

> index 961ace4..f510e61 100644

> --- a/drivers/thermal/qcom/tsens-common.c

> +++ b/drivers/thermal/qcom/tsens-common.c

> @@ -114,6 +114,9 @@ int get_temp_common(struct tsens_device *tmdev, int id, int *temp)

>  #define STATUS_VALID_BIT	BIT(21)

>  #define CODE_SIGN_BIT		BIT(11)

>  

> +#define TRDY_OFFSET     	0xe4

> +#define TRDY_READY_BIT  	BIT(0)

> +

>  int get_temp_tsens_v2(struct tsens_device *tmdev, int id, int *temp)

>  {

>  	struct tsens_sensor *s = &tmdev->sensor[id];

> @@ -121,6 +124,12 @@ int get_temp_tsens_v2(struct tsens_device *tmdev, int id, int *temp)

>  	unsigned int sensor_addr;

>  	int last_temp = 0, last_temp2 = 0, last_temp3 = 0, ret;

>  

> +	ret = regmap_read(tmdev->map, TRDY_OFFSET, &code);

> +	if (ret)

> +		return ret;

> +	if (code & TRDY_READY_BIT)

> +		return -ENODATA;

> +

>  	sensor_addr = STATUS_OFFSET + s->hw_id * 4;

>  	ret = regmap_read(tmdev->map, sensor_addr, &code);

>  	if (ret)

> -- 

> 2.7.4

>

Patch

diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c
index 961ace4..f510e61 100644
--- a/drivers/thermal/qcom/tsens-common.c
+++ b/drivers/thermal/qcom/tsens-common.c
@@ -114,6 +114,9 @@  int get_temp_common(struct tsens_device *tmdev, int id, int *temp)
 #define STATUS_VALID_BIT	BIT(21)
 #define CODE_SIGN_BIT		BIT(11)
 
+#define TRDY_OFFSET     	0xe4
+#define TRDY_READY_BIT  	BIT(0)
+
 int get_temp_tsens_v2(struct tsens_device *tmdev, int id, int *temp)
 {
 	struct tsens_sensor *s = &tmdev->sensor[id];
@@ -121,6 +124,12 @@  int get_temp_tsens_v2(struct tsens_device *tmdev, int id, int *temp)
 	unsigned int sensor_addr;
 	int last_temp = 0, last_temp2 = 0, last_temp3 = 0, ret;
 
+	ret = regmap_read(tmdev->map, TRDY_OFFSET, &code);
+	if (ret)
+		return ret;
+	if (code & TRDY_READY_BIT)
+		return -ENODATA;
+
 	sensor_addr = STATUS_OFFSET + s->hw_id * 4;
 	ret = regmap_read(tmdev->map, sensor_addr, &code);
 	if (ret)