[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAGS+omCx-e8DWkLCjopCuOKknwSvvNTsKcO70_xAcLMB4eYr1w@mail.gmail.com>
Date: Fri, 23 Jan 2015 15:49:25 +0800
From: Daniel Kurtz <djkurtz@...omium.org>
To: Caesar Wang <wxt@...k-chips.com>
Cc: Heiko Stuebner <heiko@...ech.de>, Zhang Rui <rui.zhang@...el.com>,
Eduardo Valentin <edubezval@...il.com>,
Dmitry Torokhov <dmitry.torokhov@...il.com>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>,
"open list:ARM/Rockchip SoC..." <linux-rockchip@...ts.infradead.org>,
linux-pm@...r.kernel.org,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v4] thermal: rockchip: make temperature reporting much
more accurate
On Fri, Jan 23, 2015 at 12:01 AM, Caesar Wang <wxt@...k-chips.com> wrote:
> In general, the kernel should report temperature readings exactly as
> reported by the hardware. The cpu / gpu thermal driver works in 5 degree
> increments,but we ought to do more accurate. The temperature will do
> linear interpolation between the entries in the table.
>
> Test= $md5sum /dev/zero &
> $while true; do grep "" /sys/class/thermal/thermal_zone[1-2]/temp;
> sleep .5; done
>
> e.g. We can get the result as follows:
> /sys/class/thermal/thermal_zone1/temp:39994
> /sys/class/thermal/thermal_zone2/temp:39086
> /sys/class/thermal/thermal_zone1/temp:39994
> /sys/class/thermal/thermal_zone2/temp:39540
> /sys/class/thermal/thermal_zone1/temp:39540
> /sys/class/thermal/thermal_zone2/temp:39540
> /sys/class/thermal/thermal_zone1/temp:39540
> /sys/class/thermal/thermal_zone2/temp:39994
>
> Signed-off-by: Caesar Wang <wxt@...k-chips.com>
> Reviewed-by: Dmitry Torokhov <dmitry.torokhov@...il.com>
>
> ---
>
> Changes in v4:
> "return -EAGAIN" instead of "return rk_tsadcv2_code_to_temp(code)"
>
> Changes in v3:
> Suggested-by Daniel Kurtz,
> the check doesn't reject "code == 0xfff"
> Fixed in rk_tsadcv2_code_to_temp(u32 code)
>
> Changes in v2:
> Reviewed-by: Dmitry Torokhov <dmitry.torokhov@...il.com>
>
> drivers/thermal/rockchip_thermal.c | 32 ++++++++++++++++++++++----------
> 1 file changed, 22 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c
> index 1bcddfc..6267349 100644
> --- a/drivers/thermal/rockchip_thermal.c
> +++ b/drivers/thermal/rockchip_thermal.c
> @@ -193,19 +193,22 @@ static u32 rk_tsadcv2_temp_to_code(long temp)
>
> static long rk_tsadcv2_code_to_temp(u32 code)
> {
> - int high, low, mid;
> -
> - low = 0;
> - high = ARRAY_SIZE(v2_code_table) - 1;
> - mid = (high + low) / 2;
> + unsigned int low = 0;
> + unsigned int high = ARRAY_SIZE(v2_code_table) - 1;
> + unsigned int mid = (low + high) / 2;
> + unsigned int num;
> + unsigned long denom;
>
> + /* No code available, return -EAGAIN */
> if (code > v2_code_table[low].code || code < v2_code_table[high].code)
> - return 125000; /* No code available, return max temperature */
> + return -EAGAIN;
I think the following is more clear:
(a) reject invalid codes:
/* Invalid code, return -EAGAIN */
if (code >= TSADCV2_DATA_MASK)
return -EAGAIN;
(b) do not allow mid to be 0:
while (low < high && mid) {
> - if (code >= v2_code_table[mid].code && code <
> - v2_code_table[mid - 1].code)
> - return v2_code_table[mid].temp;
> + if (code >= v2_code_table[mid].code &&
> + code < v2_code_table[mid - 1].code)
> + break;
> + else if (code == TSADCV2_DATA_MASK)
> + break;
> else if (code < v2_code_table[mid].code)
> low = mid + 1;
> else
> @@ -213,7 +216,16 @@ static long rk_tsadcv2_code_to_temp(u32 code)
> mid = (low + high) / 2;
> }
>
> - return 125000;
> + /*
> + * The 5C granularity provided by the table is too much. Let's
> + * assume that the relationship between sensor readings and
> + * temperature between 2 table entries is linear and interpolate
> + * to produce less granular result.
> + */
> + num = v2_code_table[mid].temp - v2_code_table[mid - 1].temp;
> + num *= v2_code_table[mid - 1].code - code;
> + denom = v2_code_table[mid - 1].code - v2_code_table[mid].code;
> + return v2_code_table[mid - 1].temp + (num / denom);
> }
>
> /**
> --
> 1.9.1
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists