From: Amit Kucheria <amit.kucheria@linaro.org>
To: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
bjorn.andersson@linaro.org, edubezval@gmail.com,
agross@kernel.org, sboyd@kernel.org, masneyb@onstation.org,
marc.w.gonzalez@free.fr,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Mark Rutland <mark.rutland@arm.com>,
Rob Herring <robh+dt@kernel.org>, Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org
Subject: [PATCH v2 14/15] drivers: thermal: tsens: Create function to return sign-extended temperature
Date: Tue, 27 Aug 2019 17:44:10 +0530 [thread overview]
Message-ID: <64a3d07ebe5c4cfb4643d91f5f6605e8a4ffa48b.1566907161.git.amit.kucheria@linaro.org> (raw)
In-Reply-To: <cover.1566907161.git.amit.kucheria@linaro.org>
In-Reply-To: <cover.1566907161.git.amit.kucheria@linaro.org>
Hide the details of how to convert values read from TSENS HW to mCelsius
behind a function. All versions of the IP can be supported as a result.
Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
---
drivers/thermal/qcom/tsens-common.c | 50 +++++++++++++++++++++--------
drivers/thermal/qcom/tsens.h | 2 ++
2 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c
index ea2c46cc6a66a..06b44cfd5eab9 100644
--- a/drivers/thermal/qcom/tsens-common.c
+++ b/drivers/thermal/qcom/tsens-common.c
@@ -84,13 +84,43 @@ static inline int code_to_degc(u32 adc_code, const struct tsens_sensor *s)
return degc;
}
+/**
+ * tsens_hw_to_mC - Return sign-extended temperature in mCelsius.
+ * @s: Pointer to sensor struct
+ * @field: Index into regmap_field array pointing to temperature data
+ *
+ * This function handles temperature returned in ADC code or deciCelsius
+ * depending on IP version.
+ *
+ * Return: Temperature in milliCelsius on success, a negative errno will
+ * be returned in error cases
+ */
+static int tsens_hw_to_mC(struct tsens_sensor *s, int field)
+{
+ struct tsens_priv *priv = s->priv;
+ u32 temp = 0;
+ int ret;
+
+ ret = regmap_field_read(priv->rf[field], &temp);
+ if (ret)
+ return ret;
+
+ if (priv->feat->adc) {
+ /* Convert temperature from ADC code to milliCelsius */
+ return code_to_degc(temp, s) * 1000;
+ }
+
+ /* deciCelsius -> milliCelsius along with sign extension */
+ return sign_extend32(temp, priv->tempres) * 100;
+}
+
int get_temp_tsens_valid(struct tsens_sensor *s, int *temp)
{
struct tsens_priv *priv = s->priv;
int hw_id = s->hw_id;
u32 temp_idx = LAST_TEMP_0 + hw_id;
u32 valid_idx = VALID_0 + hw_id;
- u32 last_temp = 0, valid, mask;
+ u32 valid;
int ret;
ret = regmap_field_read(priv->rf[valid_idx], &valid);
@@ -108,19 +138,7 @@ int get_temp_tsens_valid(struct tsens_sensor *s, int *temp)
}
/* Valid bit is set, OK to read the temperature */
- ret = regmap_field_read(priv->rf[temp_idx], &last_temp);
- if (ret)
- return ret;
-
- if (priv->feat->adc) {
- /* Convert temperature from ADC code to milliCelsius */
- *temp = code_to_degc(last_temp, s) * 1000;
- } else {
- mask = GENMASK(priv->fields[LAST_TEMP_0].msb,
- priv->fields[LAST_TEMP_0].lsb);
- /* Convert temperature from deciCelsius to milliCelsius */
- *temp = sign_extend32(last_temp, fls(mask) - 1) * 100;
- }
+ *temp = tsens_hw_to_mC(s, temp_idx);
return 0;
}
@@ -310,6 +328,10 @@ int __init init_common(struct tsens_priv *priv)
goto err_put_device;
}
}
+
+ /* Save away resolution of signed temperature value for this IP */
+ priv->tempres = priv->fields[LAST_TEMP_0].msb - priv->fields[LAST_TEMP_0].lsb;
+
for (i = 0, j = VALID_0; i < priv->feat->max_sensors; i++, j++) {
priv->rf[j] = devm_regmap_field_alloc(dev, priv->tm_map,
priv->fields[j]);
diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
index e1d6af71b2b9a..409395e436f32 100644
--- a/drivers/thermal/qcom/tsens.h
+++ b/drivers/thermal/qcom/tsens.h
@@ -283,6 +283,7 @@ struct tsens_context {
* struct tsens_priv - private data for each instance of the tsens IP
* @dev: pointer to struct device
* @num_sensors: number of sensors enabled on this device
+ * @tempres: number of bits used to represent signed temperature (resolution)
* @tm_map: pointer to TM register address space
* @srot_map: pointer to SROT register address space
* @tm_offset: deal with old device trees that don't address TM and SROT
@@ -299,6 +300,7 @@ struct tsens_context {
struct tsens_priv {
struct device *dev;
u32 num_sensors;
+ u32 tempres;
struct regmap *tm_map;
struct regmap *srot_map;
u32 tm_offset;
--
2.17.1
next prev parent reply other threads:[~2019-08-27 12:15 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-27 12:13 [PATCH v2 00/15] thermal: qcom: tsens: Add interrupt support Amit Kucheria
2019-08-27 12:13 ` [PATCH v2 01/15] drivers: thermal: tsens: Get rid of id field in tsens_sensor Amit Kucheria
2019-08-27 12:13 ` [PATCH v2 02/15] drivers: thermal: tsens: Simplify code flow in tsens_probe Amit Kucheria
2019-08-27 12:13 ` [PATCH v2 03/15] drivers: thermal: tsens: Add __func__ identifier to debug statements Amit Kucheria
2019-08-29 14:04 ` Daniel Thompson
2019-08-29 14:28 ` Amit Kucheria
2019-08-29 15:19 ` Daniel Thompson
2019-08-29 16:14 ` Amit Kucheria
2019-08-29 16:34 ` Daniel Thompson
2019-08-27 12:14 ` [PATCH v2 04/15] drivers: thermal: tsens: Add debugfs support Amit Kucheria
2019-08-28 0:31 ` Stephen Boyd
2019-08-27 12:14 ` [PATCH v2 05/15] arm: dts: msm8974: thermal: Add thermal zones for each sensor Amit Kucheria
2019-08-28 0:32 ` Stephen Boyd
2019-08-27 12:14 ` [PATCH v2 06/15] arm64: dts: msm8916: thermal: Fixup HW ids for cpu sensors Amit Kucheria
2019-08-28 0:32 ` Stephen Boyd
2019-08-27 12:14 ` [PATCH v2 07/15] dt: thermal: tsens: Document interrupt support in tsens driver Amit Kucheria
2019-08-28 0:33 ` Stephen Boyd
2019-08-29 8:48 ` Amit Kucheria
2019-08-29 14:53 ` Stephen Boyd
2019-08-29 16:34 ` Amit Kucheria
2019-08-30 11:32 ` Amit Kucheria
2019-08-30 15:55 ` Stephen Boyd
2019-08-30 16:40 ` Amit Kucheria
2019-08-27 12:14 ` [PATCH v2 08/15] arm64: dts: sdm845: thermal: Add interrupt support Amit Kucheria
2019-08-28 0:34 ` Stephen Boyd
2019-08-27 12:14 ` [PATCH v2 09/15] arm64: dts: msm8996: " Amit Kucheria
2019-08-28 0:35 ` Stephen Boyd
2019-08-30 20:10 ` Amit Kucheria
2019-08-27 12:14 ` [PATCH v2 10/15] arm64: dts: msm8998: " Amit Kucheria
2019-08-27 12:14 ` [PATCH v2 11/15] arm64: dts: qcs404: " Amit Kucheria
2019-08-27 12:14 ` [PATCH v2 12/15] arm: dts: msm8974: " Amit Kucheria
2019-08-27 12:14 ` [PATCH v2 13/15] arm64: dts: msm8916: " Amit Kucheria
2019-08-27 12:14 ` Amit Kucheria [this message]
2019-08-28 0:38 ` [PATCH v2 14/15] drivers: thermal: tsens: Create function to return sign-extended temperature Stephen Boyd
[not found] ` <CAP245DVGY6+vue_REqy=Tbvka2fcBx6XhSBePW4L3=pNagX=Dw@mail.gmail.com>
2019-08-28 15:44 ` Stephen Boyd
2019-08-27 12:14 ` [PATCH v2 15/15] drivers: thermal: tsens: Add interrupt support Amit Kucheria
2019-08-28 21:42 ` Stephen Boyd
2019-08-29 12:30 ` Amit Kucheria
2019-08-29 14:54 ` Stephen Boyd
2019-08-29 3:53 ` Thara Gopinath
2019-09-10 16:01 ` Amit Kucheria
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=64a3d07ebe5c4cfb4643d91f5f6605e8a4ffa48b.1566907161.git.amit.kucheria@linaro.org \
--to=amit.kucheria@linaro.org \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=daniel.lezcano@linaro.org \
--cc=edubezval@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=marc.w.gonzalez@free.fr \
--cc=mark.rutland@arm.com \
--cc=masneyb@onstation.org \
--cc=robh+dt@kernel.org \
--cc=rui.zhang@intel.com \
--cc=sboyd@kernel.org \
/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).