From: biju.das@bp.renesas.com (Biju Das)
To: cip-dev@lists.cip-project.org
Subject: [cip-dev] [PATCH 4.19.y-cip 16/22] thermal: rcar_gen3_thermal: Update calculation formula of IRQTEMP
Date: Mon, 2 Sep 2019 16:57:50 +0100 [thread overview]
Message-ID: <1567439876-1886-17-git-send-email-biju.das@bp.renesas.com> (raw)
In-Reply-To: <1567439876-1886-1-git-send-email-biju.das@bp.renesas.com>
From: Yoshihiro Kaneko <ykaneko0929@gmail.com>
commit bdc4480a669d476814061b4da6bb006f7048c8e5 upstream.
Update the formula to calculate CTEMP:
Currently, the CTEMP is average of val1 (is calculated by
formula 1) and val2 (is calculated by formula 2). But,
as description in HWM (chapter 10A.3.1.1 Setting of Normal Mode)
If (STEMP < Tj_T) CTEMP value should be val1.
If (STEMP > Tj_T) CTEMP value should be val2.
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
---
drivers/thermal/rcar_gen3_thermal.c | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c
index 0830b9e..ad3908a 100644
--- a/drivers/thermal/rcar_gen3_thermal.c
+++ b/drivers/thermal/rcar_gen3_thermal.c
@@ -76,6 +76,7 @@ struct rcar_gen3_thermal_tsc {
struct equation_coefs coef;
int low;
int high;
+ int tj_t;
};
struct rcar_gen3_thermal_priv {
@@ -124,28 +125,26 @@ static inline void rcar_gen3_thermal_write(struct rcar_gen3_thermal_tsc *tsc,
/* no idea where these constants come from */
#define TJ_3 -41
-static void rcar_gen3_thermal_calc_coefs(struct equation_coefs *coef,
+static void rcar_gen3_thermal_calc_coefs(struct rcar_gen3_thermal_tsc *tsc,
int *ptat, int *thcode,
int ths_tj_1)
{
- int tj_2;
-
/* TODO: Find documentation and document constant calculation formula */
/*
* Division is not scaled in BSP and if scaled it might overflow
* the dividend (4095 * 4095 << 14 > INT_MAX) so keep it unscaled
*/
- tj_2 = (FIXPT_INT((ptat[1] - ptat[2]) * 157)
- / (ptat[0] - ptat[2])) + FIXPT_INT(TJ_3);
+ tsc->tj_t = (FIXPT_INT((ptat[1] - ptat[2]) * 157)
+ / (ptat[0] - ptat[2])) + FIXPT_INT(TJ_3);
- coef->a1 = FIXPT_DIV(FIXPT_INT(thcode[1] - thcode[2]),
- tj_2 - FIXPT_INT(TJ_3));
- coef->b1 = FIXPT_INT(thcode[2]) - coef->a1 * TJ_3;
+ tsc->coef.a1 = FIXPT_DIV(FIXPT_INT(thcode[1] - thcode[2]),
+ tsc->tj_t - FIXPT_INT(TJ_3));
+ tsc->coef.b1 = FIXPT_INT(thcode[2]) - tsc->coef.a1 * TJ_3;
- coef->a2 = FIXPT_DIV(FIXPT_INT(thcode[1] - thcode[0]),
- tj_2 - FIXPT_INT(ths_tj_1));
- coef->b2 = FIXPT_INT(thcode[0]) - coef->a2 * ths_tj_1;
+ tsc->coef.a2 = FIXPT_DIV(FIXPT_INT(thcode[1] - thcode[0]),
+ tsc->tj_t - FIXPT_INT(ths_tj_1));
+ tsc->coef.b2 = FIXPT_INT(thcode[0]) - tsc->coef.a2 * ths_tj_1;
}
static int rcar_gen3_thermal_round(int temp)
@@ -184,13 +183,15 @@ static int rcar_gen3_thermal_get_temp(void *devdata, int *temp)
static int rcar_gen3_thermal_mcelsius_to_temp(struct rcar_gen3_thermal_tsc *tsc,
int mcelsius)
{
- int celsius, val1, val2;
+ int celsius, val;
celsius = DIV_ROUND_CLOSEST(mcelsius, 1000);
- val1 = celsius * tsc->coef.a1 + tsc->coef.b1;
- val2 = celsius * tsc->coef.a2 + tsc->coef.b2;
+ if (celsius <= INT_FIXPT(tsc->tj_t))
+ val = celsius * tsc->coef.a1 + tsc->coef.b1;
+ else
+ val = celsius * tsc->coef.a2 + tsc->coef.b2;
- return INT_FIXPT((val1 + val2) / 2);
+ return INT_FIXPT(val);
}
static int rcar_gen3_thermal_set_trips(void *devdata, int low, int high)
@@ -413,7 +414,7 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev)
priv->tscs[i] = tsc;
priv->thermal_init(tsc);
- rcar_gen3_thermal_calc_coefs(&tsc->coef, ptat, thcode[i],
+ rcar_gen3_thermal_calc_coefs(tsc, ptat, thcode[i],
*rcar_gen3_ths_tj_1);
zone = devm_thermal_zone_of_sensor_register(dev, i, tsc,
--
2.7.4
next prev parent reply other threads:[~2019-09-02 15:57 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-02 15:57 [cip-dev] [PATCH 4.19.y-cip 00/22] Add Watchdog/CMT/TMU/Thermal support Biju Das
2019-09-02 15:57 ` [cip-dev] [PATCH 4.19.y-cip 01/22] watchdog: renesas_wdt: stop when unregistering Biju Das
2019-09-02 15:57 ` [cip-dev] [PATCH 4.19.y-cip 02/22] watchdog: renesas_wdt: Fix typos Biju Das
2019-09-02 15:57 ` [cip-dev] [PATCH 4.19.y-cip 03/22] watchdog: renesas_wdt: don't keep timer value during suspend/resume Biju Das
2019-09-02 15:57 ` [cip-dev] [PATCH 4.19.y-cip 04/22] watchdog: renesas_wdt: drop superfluous glob pattern Biju Das
2019-09-02 15:57 ` [cip-dev] [PATCH 4.19.y-cip 05/22] watchdog: renesas_wdt: Use 'dev' instead of dereferencing it repeatedly Biju Das
2019-09-02 15:57 ` [cip-dev] [PATCH 4.19.y-cip 06/22] watchdog: renesas_wdt: Add a few cycles delay Biju Das
2019-09-02 15:57 ` [cip-dev] [PATCH 4.19.y-cip 07/22] arm64: dts: renesas: hihope-common: Add RWDT support Biju Das
2019-09-02 15:57 ` [cip-dev] [PATCH 4.19.y-cip 08/22] arm64: dts: renesas: r8a774a1: Add CMT device nodes Biju Das
2019-09-02 15:57 ` [cip-dev] [PATCH 4.19.y-cip 09/22] clk: renesas: r8a774a1: Add TMU clock Biju Das
2019-09-02 15:57 ` [cip-dev] [PATCH 4.19.y-cip 10/22] arm64: dts: renesas: r8a774a1: Add TMU device nodes Biju Das
2019-09-02 15:57 ` [cip-dev] [PATCH 4.19.y-cip 11/22] thermal: rcar_gen3_thermal: Register hwmon sysfs interface Biju Das
2019-09-02 15:57 ` [cip-dev] [PATCH 4.19.y-cip 12/22] thermal: rcar_gen3_thermal: Fix init value of IRQCTL register Biju Das
2019-09-02 15:57 ` [cip-dev] [PATCH 4.19.y-cip 13/22] thermal: rcar_gen3_thermal: fix interrupt type Biju Das
2019-09-02 15:57 ` [cip-dev] [PATCH 4.19.y-cip 14/22] thermal: rcar_gen3_thermal: Fix to show correct trip points number Biju Das
2019-09-02 15:57 ` [cip-dev] [PATCH 4.19.y-cip 15/22] thermal: rcar_gen3_thermal: Update value of Tj_1 Biju Das
2019-09-02 15:57 ` Biju Das [this message]
2019-09-02 15:57 ` [cip-dev] [PATCH 4.19.y-cip 17/22] thermal: rcar_gen3_thermal: Update temperature conversion method Biju Das
2019-09-02 15:57 ` [cip-dev] [PATCH 4.19.y-cip 18/22] arm64: dts: renesas: r8a774a1: Add operating points Biju Das
2019-09-02 15:57 ` [cip-dev] [PATCH 4.19.y-cip 19/22] arm64: dts: renesas: r8a774a1: Add CPU topology on r8a774a1 SoC Biju Das
2019-09-02 15:57 ` [cip-dev] [PATCH 4.19.y-cip 20/22] arm64: dts: renesas: r8a774a1: Add CPU capacity-dmips-mhz Biju Das
2019-09-02 15:57 ` [cip-dev] [PATCH 4.19.y-cip 21/22] arm64: dts: renesas: r8a774a1: Create thermal zone to support IPA Biju Das
2019-09-02 15:57 ` [cip-dev] [PATCH 4.19.y-cip 22/22] arm64: dts: renesas: r8a774a1: Add dynamic power coefficient Biju Das
2019-09-05 9:39 ` [cip-dev] [PATCH 4.19.y-cip 00/22] Add Watchdog/CMT/TMU/Thermal support nobuhiro1.iwamatsu at toshiba.co.jp
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=1567439876-1886-17-git-send-email-biju.das@bp.renesas.com \
--to=biju.das@bp.renesas.com \
--cc=cip-dev@lists.cip-project.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 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.