From: Daniel Lezcano <daniel.lezcano@linaro.org> To: rui.zhang@intel.com, edubezval@gmail.com Cc: daniel.lezcano@linaro.org, linux-pm@vger.kernel.org, kevin.wangtao@linaro.org, leo.yan@linaro.org, linux-kernel@vger.kernel.org (open list) Subject: [PATCH 04/13] thermal/drivers/hisi: Simplify the temperature/step computation Date: Wed, 30 Aug 2017 10:47:28 +0200 [thread overview] Message-ID: <1504082857-21702-4-git-send-email-daniel.lezcano@linaro.org> (raw) In-Reply-To: <1504082857-21702-1-git-send-email-daniel.lezcano@linaro.org> The step and the base temperature are fixed values, we can simplify the computation by converting the base temperature to milli celsius and use a pre-computed step value. That saves us a lot of mult + div for nothing at runtime. Take also the opportunity to change the function names to be consistent with the rest of the code. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- drivers/thermal/hisi_thermal.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c index 67db523..b58ad40 100644 --- a/drivers/thermal/hisi_thermal.c +++ b/drivers/thermal/hisi_thermal.c @@ -35,8 +35,9 @@ #define TEMP0_RST_MSK (0x1C) #define TEMP0_VALUE (0x28) -#define HISI_TEMP_BASE (-60) +#define HISI_TEMP_BASE (-60000) #define HISI_TEMP_RESET (100000) +#define HISI_TEMP_STEP (784) #define HISI_MAX_SENSORS 4 #define HISI_DEFAULT_SENSOR 2 @@ -61,19 +62,32 @@ struct hisi_thermal_data { void __iomem *regs; }; -/* in millicelsius */ -static inline int _step_to_temp(int step) +/* + * The temperature computation on the tsensor is as follow: + * Unit: millidegree Celsius + * Step: 255/200 (0.7843) + * Temperature base: -60°C + * + * The register is programmed in temperature steps, every step is 784 + * millidegree and begins at -60 000 m°C + * + * The temperature from the steps: + * + * Temp = TempBase + (steps x 784) + * + * and the steps from the temperature: + * + * steps = (Temp - TempBase) / 784 + * + */ +static inline int hisi_thermal_step_to_temp(int step) { - /* - * Every step equals (1 * 200) / 255 celsius, and finally - * need convert to millicelsius. - */ - return (HISI_TEMP_BASE * 1000 + (step * 200000 / 255)); + return HISI_TEMP_BASE + (step * HISI_TEMP_STEP); } -static inline long _temp_to_step(long temp) +static inline long hisi_thermal_temp_to_step(long temp) { - return ((temp - HISI_TEMP_BASE * 1000) * 255) / 200000; + return (temp - HISI_TEMP_BASE) / HISI_TEMP_STEP; } static long hisi_thermal_get_sensor_temp(struct hisi_thermal_data *data, @@ -99,7 +113,7 @@ static long hisi_thermal_get_sensor_temp(struct hisi_thermal_data *data, usleep_range(3000, 5000); val = readl(data->regs + TEMP0_VALUE); - val = _step_to_temp(val); + val = hisi_thermal_step_to_temp(val); mutex_unlock(&data->thermal_lock); @@ -126,10 +140,11 @@ static void hisi_thermal_enable_bind_irq_sensor writel((sensor->id << 12), data->regs + TEMP0_CFG); /* enable for interrupt */ - writel(_temp_to_step(sensor->thres_temp) | 0x0FFFFFF00, + writel(hisi_thermal_temp_to_step(sensor->thres_temp) | 0x0FFFFFF00, data->regs + TEMP0_TH); - writel(_temp_to_step(HISI_TEMP_RESET), data->regs + TEMP0_RST_TH); + writel(hisi_thermal_temp_to_step(HISI_TEMP_RESET), + data->regs + TEMP0_RST_TH); /* enable module */ writel(0x1, data->regs + TEMP0_RST_MSK); -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Lezcano <daniel.lezcano@linaro.org> To: rui.zhang@intel.com, edubezval@gmail.com Cc: daniel.lezcano@linaro.org, linux-pm@vger.kernel.org, kevin.wangtao@linaro.org, leo.yan@linaro.org, open list <linux-kernel@vger.kernel.org> Subject: [PATCH 04/13] thermal/drivers/hisi: Simplify the temperature/step computation Date: Wed, 30 Aug 2017 10:47:28 +0200 [thread overview] Message-ID: <1504082857-21702-4-git-send-email-daniel.lezcano@linaro.org> (raw) In-Reply-To: <1504082857-21702-1-git-send-email-daniel.lezcano@linaro.org> The step and the base temperature are fixed values, we can simplify the computation by converting the base temperature to milli celsius and use a pre-computed step value. That saves us a lot of mult + div for nothing at runtime. Take also the opportunity to change the function names to be consistent with the rest of the code. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- drivers/thermal/hisi_thermal.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c index 67db523..b58ad40 100644 --- a/drivers/thermal/hisi_thermal.c +++ b/drivers/thermal/hisi_thermal.c @@ -35,8 +35,9 @@ #define TEMP0_RST_MSK (0x1C) #define TEMP0_VALUE (0x28) -#define HISI_TEMP_BASE (-60) +#define HISI_TEMP_BASE (-60000) #define HISI_TEMP_RESET (100000) +#define HISI_TEMP_STEP (784) #define HISI_MAX_SENSORS 4 #define HISI_DEFAULT_SENSOR 2 @@ -61,19 +62,32 @@ struct hisi_thermal_data { void __iomem *regs; }; -/* in millicelsius */ -static inline int _step_to_temp(int step) +/* + * The temperature computation on the tsensor is as follow: + * Unit: millidegree Celsius + * Step: 255/200 (0.7843) + * Temperature base: -60°C + * + * The register is programmed in temperature steps, every step is 784 + * millidegree and begins at -60 000 m°C + * + * The temperature from the steps: + * + * Temp = TempBase + (steps x 784) + * + * and the steps from the temperature: + * + * steps = (Temp - TempBase) / 784 + * + */ +static inline int hisi_thermal_step_to_temp(int step) { - /* - * Every step equals (1 * 200) / 255 celsius, and finally - * need convert to millicelsius. - */ - return (HISI_TEMP_BASE * 1000 + (step * 200000 / 255)); + return HISI_TEMP_BASE + (step * HISI_TEMP_STEP); } -static inline long _temp_to_step(long temp) +static inline long hisi_thermal_temp_to_step(long temp) { - return ((temp - HISI_TEMP_BASE * 1000) * 255) / 200000; + return (temp - HISI_TEMP_BASE) / HISI_TEMP_STEP; } static long hisi_thermal_get_sensor_temp(struct hisi_thermal_data *data, @@ -99,7 +113,7 @@ static long hisi_thermal_get_sensor_temp(struct hisi_thermal_data *data, usleep_range(3000, 5000); val = readl(data->regs + TEMP0_VALUE); - val = _step_to_temp(val); + val = hisi_thermal_step_to_temp(val); mutex_unlock(&data->thermal_lock); @@ -126,10 +140,11 @@ static void hisi_thermal_enable_bind_irq_sensor writel((sensor->id << 12), data->regs + TEMP0_CFG); /* enable for interrupt */ - writel(_temp_to_step(sensor->thres_temp) | 0x0FFFFFF00, + writel(hisi_thermal_temp_to_step(sensor->thres_temp) | 0x0FFFFFF00, data->regs + TEMP0_TH); - writel(_temp_to_step(HISI_TEMP_RESET), data->regs + TEMP0_RST_TH); + writel(hisi_thermal_temp_to_step(HISI_TEMP_RESET), + data->regs + TEMP0_RST_TH); /* enable module */ writel(0x1, data->regs + TEMP0_RST_MSK); -- 2.7.4
next prev parent reply other threads:[~2017-08-30 8:48 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-08-30 8:47 [PATCH 01/13] thermal/drivers/hisi: Fix missing interrupt enablement Daniel Lezcano 2017-08-30 8:47 ` Daniel Lezcano 2017-08-30 8:47 ` [PATCH 02/13] thermal/drivers/hisi: Remove the multiple sensors support Daniel Lezcano 2017-08-30 8:47 ` Daniel Lezcano 2017-09-01 14:05 ` Leo Yan 2017-09-01 20:48 ` Daniel Lezcano 2017-08-30 8:47 ` [PATCH 03/13] thermal/drivers/hisi: Fix kernel panic on alarm interrupt Daniel Lezcano 2017-08-30 8:47 ` Daniel Lezcano 2017-09-01 14:14 ` Leo Yan 2017-08-30 8:47 ` Daniel Lezcano [this message] 2017-08-30 8:47 ` [PATCH 04/13] thermal/drivers/hisi: Simplify the temperature/step computation Daniel Lezcano 2017-09-01 14:24 ` Leo Yan 2017-08-30 8:47 ` [PATCH 05/13] thermal/drivers/hisi: Fix multiple alarm interrupts firing Daniel Lezcano 2017-08-30 8:47 ` Daniel Lezcano 2017-09-01 14:40 ` Leo Yan 2017-08-30 8:47 ` [PATCH 06/13] thermal/drivers/hisi: Remove pointless lock Daniel Lezcano 2017-08-30 8:47 ` Daniel Lezcano 2017-09-01 14:44 ` Leo Yan 2017-08-30 8:47 ` [PATCH 07/13] thermal/drivers/hisi: Encapsulate register writes into helpers Daniel Lezcano 2017-08-30 8:47 ` Daniel Lezcano 2017-09-02 2:09 ` Leo Yan 2017-09-02 2:17 ` Leo Yan 2017-08-30 8:47 ` [PATCH 08/13] thermal/drivers/hisi: Fix configuration register setting Daniel Lezcano 2017-08-30 8:47 ` Daniel Lezcano 2017-09-02 2:54 ` Leo Yan 2017-09-02 8:34 ` Daniel Lezcano 2017-09-04 0:58 ` Leo Yan 2017-09-04 9:16 ` Daniel Lezcano 2017-08-30 8:47 ` [PATCH 09/13] thermal/drivers/hisi: Remove costly sensor inspection Daniel Lezcano 2017-08-30 8:47 ` Daniel Lezcano 2017-09-02 3:29 ` Leo Yan 2017-09-02 13:10 ` Daniel Lezcano 2017-09-04 0:50 ` Leo Yan 2017-09-04 11:29 ` Daniel Lezcano 2017-09-04 14:30 ` Leo Yan 2017-08-30 8:47 ` [PATCH 10/13] thermal/drivers/hisi: Rename and remove unused field Daniel Lezcano 2017-08-30 8:47 ` Daniel Lezcano 2017-09-02 3:36 ` Leo Yan 2017-08-30 8:47 ` [PATCH 11/13] thermal/drivers/hisi: Convert long to int Daniel Lezcano 2017-08-30 8:47 ` Daniel Lezcano 2017-09-02 3:41 ` Leo Yan 2017-08-30 8:47 ` [PATCH 12/13] thermal/drivers/hisi: Remove thermal data back pointer Daniel Lezcano 2017-08-30 8:47 ` Daniel Lezcano 2017-08-30 8:47 ` [PATCH 13/13] thermal/drivers/hisi: Remove mutex_lock in the code Daniel Lezcano 2017-08-30 8:47 ` Daniel Lezcano 2017-09-02 4:04 ` Leo Yan 2017-09-02 13:11 ` Daniel Lezcano 2017-09-01 8:31 ` [PATCH 01/13] thermal/drivers/hisi: Fix missing interrupt enablement Leo Yan
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=1504082857-21702-4-git-send-email-daniel.lezcano@linaro.org \ --to=daniel.lezcano@linaro.org \ --cc=edubezval@gmail.com \ --cc=kevin.wangtao@linaro.org \ --cc=leo.yan@linaro.org \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.