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 3/5] thermal/drivers/hisi: Encapsulate register writes into helpers
Date: Mon, 3 Dec 2018 11:31:05 -0200 [thread overview]
Message-ID: <20181203133107.4002-4-rafael.tinoco@linaro.org> (raw)
In-Reply-To: <20181203133107.4002-1-rafael.tinoco@linaro.org>
From: Daniel Lezcano <daniel.lezcano@linaro.org>
commit 1e11b014271ceccb5ea04ae58f4829ac8209a86d upstream.
Hopefully, the function name can help to clarify the semantic of the operations
when writing in the register.
Link: https://bugs.linaro.org/show_bug.cgi?id=4053 (PATCH 3/5)
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
(cherry picked from commit 1e11b014271ceccb5ea04ae58f4829ac8209a86d)
Signed-off-by: Rafael David Tinoco <rafael.tinoco@linaro.org>
---
drivers/thermal/hisi_thermal.c | 92 ++++++++++++++++++++++++++--------
1 file changed, 70 insertions(+), 22 deletions(-)
diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index 0c2966c285b1..a803043f37ae 100644
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -26,6 +26,7 @@
#include "thermal_core.h"
+#define TEMP0_LAG (0x0)
#define TEMP0_TH (0x4)
#define TEMP0_RST_TH (0x8)
#define TEMP0_CFG (0xC)
@@ -96,6 +97,56 @@ static inline long hisi_thermal_round_temp(int temp)
hisi_thermal_temp_to_step(temp));
}
+static inline void hisi_thermal_set_lag(void __iomem *addr, int value)
+{
+ writel(value, addr + TEMP0_LAG);
+}
+
+static inline void hisi_thermal_alarm_clear(void __iomem *addr, int value)
+{
+ writel(value, addr + TEMP0_INT_CLR);
+}
+
+static inline void hisi_thermal_alarm_enable(void __iomem *addr, int value)
+{
+ writel(value, addr + TEMP0_INT_EN);
+}
+
+static inline void hisi_thermal_alarm_set(void __iomem *addr, int temp)
+{
+ writel(hisi_thermal_temp_to_step(temp) | 0x0FFFFFF00, addr + TEMP0_TH);
+}
+
+static inline void hisi_thermal_reset_set(void __iomem *addr, int temp)
+{
+ writel(hisi_thermal_temp_to_step(temp), addr + TEMP0_RST_TH);
+}
+
+static inline void hisi_thermal_reset_enable(void __iomem *addr, int value)
+{
+ writel(value, addr + TEMP0_RST_MSK);
+}
+
+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)
+{
+ writel((sensor << 12), addr + TEMP0_CFG);
+}
+
+static inline int hisi_thermal_get_temperature(void __iomem *addr)
+{
+ return hisi_thermal_step_to_temp(readl(addr + TEMP0_VALUE));
+}
+
+static inline void hisi_thermal_hdak_set(void __iomem *addr, int value)
+{
+ writel(value, addr + TEMP0_CFG);
+}
+
static long hisi_thermal_get_sensor_temp(struct hisi_thermal_data *data,
struct hisi_thermal_sensor *sensor)
{
@@ -104,22 +155,21 @@ static long hisi_thermal_get_sensor_temp(struct hisi_thermal_data *data,
mutex_lock(&data->thermal_lock);
/* disable interrupt */
- writel(0x0, data->regs + TEMP0_INT_EN);
- writel(0x1, data->regs + TEMP0_INT_CLR);
+ hisi_thermal_alarm_enable(data->regs, 0);
+ hisi_thermal_alarm_clear(data->regs, 1);
/* disable module firstly */
- writel(0x0, data->regs + TEMP0_EN);
+ hisi_thermal_enable(data->regs, 0);
/* select sensor id */
- writel((sensor->id << 12), data->regs + TEMP0_CFG);
+ hisi_thermal_sensor_select(data->regs, sensor->id);
/* enable module */
- writel(0x1, data->regs + TEMP0_EN);
+ hisi_thermal_enable(data->regs, 1);
usleep_range(3000, 5000);
- val = readl(data->regs + TEMP0_VALUE);
- val = hisi_thermal_step_to_temp(val);
+ val = hisi_thermal_get_temperature(data->regs);
mutex_unlock(&data->thermal_lock);
@@ -136,28 +186,26 @@ static void hisi_thermal_enable_bind_irq_sensor
sensor = &data->sensors;
/* setting the hdak time */
- writel(0x0, data->regs + TEMP0_CFG);
+ hisi_thermal_hdak_set(data->regs, 0);
/* disable module firstly */
- writel(0x0, data->regs + TEMP0_RST_MSK);
- writel(0x0, data->regs + TEMP0_EN);
+ hisi_thermal_reset_enable(data->regs, 0);
+ hisi_thermal_enable(data->regs, 0);
/* select sensor id */
- writel((sensor->id << 12), data->regs + TEMP0_CFG);
+ hisi_thermal_sensor_select(data->regs, sensor->id);
/* enable for interrupt */
- writel(hisi_thermal_temp_to_step(sensor->thres_temp) | 0x0FFFFFF00,
- data->regs + TEMP0_TH);
+ hisi_thermal_alarm_set(data->regs, sensor->thres_temp);
- writel(hisi_thermal_temp_to_step(HISI_TEMP_RESET),
- data->regs + TEMP0_RST_TH);
+ hisi_thermal_reset_set(data->regs, HISI_TEMP_RESET);
/* enable module */
- writel(0x1, data->regs + TEMP0_RST_MSK);
- writel(0x1, data->regs + TEMP0_EN);
+ hisi_thermal_reset_enable(data->regs, 1);
+ hisi_thermal_enable(data->regs, 1);
- writel(0x0, data->regs + TEMP0_INT_CLR);
- writel(0x1, data->regs + TEMP0_INT_EN);
+ hisi_thermal_alarm_clear(data->regs, 0);
+ hisi_thermal_alarm_enable(data->regs, 1);
usleep_range(3000, 5000);
@@ -169,9 +217,9 @@ static void hisi_thermal_disable_sensor(struct hisi_thermal_data *data)
mutex_lock(&data->thermal_lock);
/* disable sensor module */
- writel(0x0, data->regs + TEMP0_INT_EN);
- writel(0x0, data->regs + TEMP0_RST_MSK);
- writel(0x0, data->regs + TEMP0_EN);
+ hisi_thermal_enable(data->regs, 0);
+ hisi_thermal_alarm_enable(data->regs, 0);
+ hisi_thermal_reset_enable(data->regs, 0);
mutex_unlock(&data->thermal_lock);
}
--
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 ` Rafael David Tinoco [this message]
2018-12-03 13:31 ` [PATCH 4/5] thermal/drivers/hisi: Fix configuration register setting Rafael David Tinoco
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-4-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).