From: Rafael David Tinoco <rafael.tinoco@linaro.org>
To: sashal@kernel.org
Cc: rafael.tinoco@linaro.org, gregkh@linuxfoundation.org,
rui.zhang@intel.com, edubezval@gmail.com,
daniel.lezcano@linaro.org, linux-pm@vger.kernel.org,
linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: [PATCH 4/5] thermal/drivers/hisi: Fix configuration register setting
Date: Mon, 3 Dec 2018 11:31:06 -0200 [thread overview]
Message-ID: <20181203133107.4002-5-rafael.tinoco@linaro.org> (raw)
In-Reply-To: <20181203133107.4002-1-rafael.tinoco@linaro.org>
From: Daniel Lezcano <daniel.lezcano@linaro.org>
patch b424315a287c70eeb5f920f84c92492bd2f5658e upstream.
The TEMP0_CFG configuration register contains different field to set up the
temperature controller. However in the code, nothing prevents a setup to
overwrite the previous one: eg. writing the hdak value overwrites the sensor
selection, the sensor selection overwrites the hdak value.
In order to prevent such thing, use a regmap-like mechanism by reading the
value before, set the corresponding bits and write the result.
Link: https://bugs.linaro.org/show_bug.cgi?id=4053 (PATCH 4/5)
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
(cherry picked from commit b424315a287c70eeb5f920f84c92492bd2f5658e)
Signed-off-by: Rafael David Tinoco <rafael.tinoco@linaro.org>
---
drivers/thermal/hisi_thermal.c | 34 +++++++++++++++++++++++++++++-----
1 file changed, 29 insertions(+), 5 deletions(-)
diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index a803043f37ae..31b52ebf426f 100644
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -30,6 +30,8 @@
#define TEMP0_TH (0x4)
#define TEMP0_RST_TH (0x8)
#define TEMP0_CFG (0xC)
+#define TEMP0_CFG_SS_MSK (0xF000)
+#define TEMP0_CFG_HDAK_MSK (0x30)
#define TEMP0_EN (0x10)
#define TEMP0_INT_EN (0x14)
#define TEMP0_INT_CLR (0x18)
@@ -132,19 +134,41 @@ static inline void hisi_thermal_enable(void __iomem *addr, int value)
writel(value, addr + TEMP0_EN);
}
-static inline void hisi_thermal_sensor_select(void __iomem *addr, int sensor)
+static inline int hisi_thermal_get_temperature(void __iomem *addr)
{
- writel((sensor << 12), addr + TEMP0_CFG);
+ return hisi_thermal_step_to_temp(readl(addr + TEMP0_VALUE));
}
-static inline int hisi_thermal_get_temperature(void __iomem *addr)
+/*
+ * Temperature configuration register - Sensor selection
+ *
+ * Bits [19:12]
+ *
+ * 0x0: local sensor (default)
+ * 0x1: remote sensor 1 (ACPU cluster 1)
+ * 0x2: remote sensor 2 (ACPU cluster 0)
+ * 0x3: remote sensor 3 (G3D)
+ */
+static inline void hisi_thermal_sensor_select(void __iomem *addr, int sensor)
{
- return hisi_thermal_step_to_temp(readl(addr + TEMP0_VALUE));
+ writel((readl(addr + TEMP0_CFG) & ~TEMP0_CFG_SS_MSK) |
+ (sensor << 12), addr + TEMP0_CFG);
}
+/*
+ * Temperature configuration register - Hdak conversion polling interval
+ *
+ * Bits [5:4]
+ *
+ * 0x0 : 0.768 ms
+ * 0x1 : 6.144 ms
+ * 0x2 : 49.152 ms
+ * 0x3 : 393.216 ms
+ */
static inline void hisi_thermal_hdak_set(void __iomem *addr, int value)
{
- writel(value, addr + TEMP0_CFG);
+ writel((readl(addr + TEMP0_CFG) & ~TEMP0_CFG_HDAK_MSK) |
+ (value << 4), addr + TEMP0_CFG);
}
static long hisi_thermal_get_sensor_temp(struct hisi_thermal_data *data,
--
2.20.0.rc1
next prev parent reply other threads:[~2018-12-03 13:31 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-03 13:31 v4.14 fix for Hikey 960 unbalanced IRQ enablement Rafael David Tinoco
2018-12-03 13:31 ` [PATCH 1/5] thermal/drivers/hisi: Remove the multiple sensors support Rafael David Tinoco
2018-12-03 13:31 ` [PATCH 2/5] thermal/drivers/hisi: Remove pointless lock Rafael David Tinoco
2018-12-03 13:31 ` [PATCH 3/5] thermal/drivers/hisi: Encapsulate register writes into helpers Rafael David Tinoco
2018-12-03 13:31 ` Rafael David Tinoco [this message]
2018-12-03 13:31 ` [PATCH 5/5] thermal/drivers/hisi: Remove costly sensor inspection Rafael David Tinoco
2018-12-03 14:14 ` v4.14 fix for Hikey 960 unbalanced IRQ enablement Greg KH
2018-12-03 14:42 ` Daniel Lezcano
2018-12-03 15:19 ` Sasha Levin
2018-12-03 18:05 ` Greg KH
2018-12-03 18:24 ` Rafael David Tinoco
2018-12-06 11:05 ` Greg KH
2018-12-03 18:33 ` 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=20181203133107.4002-5-rafael.tinoco@linaro.org \
--to=rafael.tinoco@linaro.org \
--cc=daniel.lezcano@linaro.org \
--cc=edubezval@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rui.zhang@intel.com \
--cc=sashal@kernel.org \
--cc=stable@vger.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).