* [PATCH v2 01/17] power: supply: olpc_battery: correct the temperature units
[not found] <20181116162403.49854-1-lkundrak@v3.sk>
@ 2018-11-16 16:23 ` Lubomir Rintel
2018-12-05 21:05 ` Sebastian Reichel
0 siblings, 1 reply; 2+ messages in thread
From: Lubomir Rintel @ 2018-11-16 16:23 UTC (permalink / raw)
To: Mark Brown, Geert Uytterhoeven, Darren Hart, Andy Shevchenko
Cc: Greg Kroah-Hartman, James Cameron, Sebastian Reichel,
Rob Herring, Mark Rutland, Eric Miao, Haojian Zhuang,
Daniel Mack, Robert Jarzmik, linux-spi, devicetree, linux-kernel,
linux-arm-kernel, platform-driver-x86, devel, linux-pm,
Lubomir Rintel, stable
According to [1] and [2], the temperature values are in tenths of degree
Celsius. Exposing the Celsius value makes the battery appear on fire:
$ upower -i /org/freedesktop/UPower/devices/battery_olpc_battery
...
temperature: 236.9 degrees C
Tested on OLPC XO-1 and OLPC XO-1.75 laptops.
[1] include/linux/power_supply.h
[2] Documentation/power/power_supply_class.txt
Fixes: fb972873a767 ("[BATTERY] One Laptop Per Child power/battery driver")
Cc: stable@vger.kernel.org
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Acked-by: Pavel Machek <pavel@ucw.cz>
---
Changes since v1:
- Add Fixes tag and an Ack
drivers/power/supply/olpc_battery.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/power/supply/olpc_battery.c b/drivers/power/supply/olpc_battery.c
index 6da79ae14860..5a97e42a3547 100644
--- a/drivers/power/supply/olpc_battery.c
+++ b/drivers/power/supply/olpc_battery.c
@@ -428,14 +428,14 @@ static int olpc_bat_get_property(struct power_supply *psy,
if (ret)
return ret;
- val->intval = (s16)be16_to_cpu(ec_word) * 100 / 256;
+ val->intval = (s16)be16_to_cpu(ec_word) * 10 / 256;
break;
case POWER_SUPPLY_PROP_TEMP_AMBIENT:
ret = olpc_ec_cmd(EC_AMB_TEMP, NULL, 0, (void *)&ec_word, 2);
if (ret)
return ret;
- val->intval = (int)be16_to_cpu(ec_word) * 100 / 256;
+ val->intval = (int)be16_to_cpu(ec_word) * 10 / 256;
break;
case POWER_SUPPLY_PROP_CHARGE_COUNTER:
ret = olpc_ec_cmd(EC_BAT_ACR, NULL, 0, (void *)&ec_word, 2);
--
2.19.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2 01/17] power: supply: olpc_battery: correct the temperature units
2018-11-16 16:23 ` [PATCH v2 01/17] power: supply: olpc_battery: correct the temperature units Lubomir Rintel
@ 2018-12-05 21:05 ` Sebastian Reichel
0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Reichel @ 2018-12-05 21:05 UTC (permalink / raw)
To: Lubomir Rintel
Cc: Mark Brown, Geert Uytterhoeven, Darren Hart, Andy Shevchenko,
Greg Kroah-Hartman, James Cameron, Rob Herring, Mark Rutland,
Eric Miao, Haojian Zhuang, Daniel Mack, Robert Jarzmik,
linux-spi, devicetree, linux-kernel, linux-arm-kernel,
platform-driver-x86, devel, linux-pm, stable
[-- Attachment #1: Type: text/plain, Size: 1800 bytes --]
Hi,
On Fri, Nov 16, 2018 at 05:23:47PM +0100, Lubomir Rintel wrote:
> According to [1] and [2], the temperature values are in tenths of degree
> Celsius. Exposing the Celsius value makes the battery appear on fire:
>
> $ upower -i /org/freedesktop/UPower/devices/battery_olpc_battery
> ...
> temperature: 236.9 degrees C
>
> Tested on OLPC XO-1 and OLPC XO-1.75 laptops.
>
> [1] include/linux/power_supply.h
> [2] Documentation/power/power_supply_class.txt
>
> Fixes: fb972873a767 ("[BATTERY] One Laptop Per Child power/battery driver")
> Cc: stable@vger.kernel.org
> Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> Acked-by: Pavel Machek <pavel@ucw.cz>
>
> ---
This is queued to next.
-- Sebastian
> Changes since v1:
> - Add Fixes tag and an Ack
>
> drivers/power/supply/olpc_battery.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/power/supply/olpc_battery.c b/drivers/power/supply/olpc_battery.c
> index 6da79ae14860..5a97e42a3547 100644
> --- a/drivers/power/supply/olpc_battery.c
> +++ b/drivers/power/supply/olpc_battery.c
> @@ -428,14 +428,14 @@ static int olpc_bat_get_property(struct power_supply *psy,
> if (ret)
> return ret;
>
> - val->intval = (s16)be16_to_cpu(ec_word) * 100 / 256;
> + val->intval = (s16)be16_to_cpu(ec_word) * 10 / 256;
> break;
> case POWER_SUPPLY_PROP_TEMP_AMBIENT:
> ret = olpc_ec_cmd(EC_AMB_TEMP, NULL, 0, (void *)&ec_word, 2);
> if (ret)
> return ret;
>
> - val->intval = (int)be16_to_cpu(ec_word) * 100 / 256;
> + val->intval = (int)be16_to_cpu(ec_word) * 10 / 256;
> break;
> case POWER_SUPPLY_PROP_CHARGE_COUNTER:
> ret = olpc_ec_cmd(EC_BAT_ACR, NULL, 0, (void *)&ec_word, 2);
> --
> 2.19.1
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-12-05 21:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20181116162403.49854-1-lkundrak@v3.sk>
2018-11-16 16:23 ` [PATCH v2 01/17] power: supply: olpc_battery: correct the temperature units Lubomir Rintel
2018-12-05 21:05 ` Sebastian Reichel
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).