|
From: Ognjen G. <smc...@gm...> - 2017-12-06 22:53:15
|
The EC/ACPI firmware on Lenovo ThinkPads used to report a status
of "Unknown" when the battery is between the charge start and
charge stop thresholds. On Windows, it reports "Not Charging"
so the quirk has been added to also report correctly.
Now the "status" attribute returns "Not Charging" when the
battery on ThinkPads is not physicaly charging.
Signed-off-by: Ognjen Galic <smc...@gm...>
---
drivers/acpi/battery.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 2951d07..1afc9c7 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -57,6 +57,13 @@
#define ACPI_BATTERY_STATE_DISCHARGING 0x1
#define ACPI_BATTERY_STATE_CHARGING 0x2
#define ACPI_BATTERY_STATE_CRITICAL 0x4
+/*
+ * On Lenovo ThinkPads the ACPI firmware
+ * returns a custom response when the battery
+ * is configured with wear control and the battery
+ * is between the start and stop charge thresholds.
+ */
+#define ACPI_BATTERY_STATE_NOT_CHARGING 0x8
#define _COMPONENT ACPI_BATTERY_COMPONENT
@@ -71,6 +78,7 @@ static async_cookie_t async_cookie;
static bool battery_driver_registered;
static int battery_bix_broken_package;
static int battery_notification_delay_ms;
+static int battery_quirk_thinkpad_notcharging;
static unsigned int cache_time = 1000;
module_param(cache_time, uint, 0644);
MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
@@ -222,6 +230,9 @@ static int acpi_battery_get_property(struct power_supply *psy,
val->intval = POWER_SUPPLY_STATUS_CHARGING;
else if (acpi_battery_is_charged(battery))
val->intval = POWER_SUPPLY_STATUS_FULL;
+ else if (battery_quirk_thinkpad_notcharging &&
+ val->intval & ACPI_BATTERY_STATE_NOT_CHARGING)
+ val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
else
val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
break;
@@ -1301,6 +1312,13 @@ battery_notification_delay_quirk(const struct dmi_system_id *d)
return 0;
}
+static int __init
+battery_quirk_not_charging(const struct dmi_system_id *d)
+{
+ battery_quirk_thinkpad_notcharging = 1;
+ return 0;
+}
+
static const struct dmi_system_id bat_dmi_table[] __initconst = {
{
.callback = battery_bix_broken_package_quirk,
@@ -1318,6 +1336,14 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
DMI_MATCH(DMI_PRODUCT_NAME, "Aspire V5-573G"),
},
},
+ {
+ .callback = battery_quirk_not_charging,
+ .ident = "Lenovo ThinkPad",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"),
+ },
+ },
{},
};
--
2.7.4
|
|
From: Christoph B. <chr...@bo...> - 2017-12-06 23:55:42
|
On Wed, Dec 06, 2017 at 11:53:01PM +0100, Ognjen Galic wrote: > The EC/ACPI firmware on Lenovo ThinkPads used to report a status > of "Unknown" when the battery is between the charge start and > charge stop thresholds. On Windows, it reports "Not Charging" > so the quirk has been added to also report correctly. > > Now the "status" attribute returns "Not Charging" when the > battery on ThinkPads is not physicaly charging. Hi again, I just tried this patch(set) and it still seems to report "Unknown". We can also discuss this on the IRC you mentioned earlier if you want, as I said I'm open for testing. -- Regards, Christoph |
|
From: Ognjen G. <smc...@gm...> - 2017-12-10 18:05:39
|
The EC/ACPI firmware on Lenovo ThinkPads used to report a status
of "Unknown" when the battery is between the charge start and
charge stop thresholds. On Windows, it reports "Not Charging"
so the quirk has been added to also report correctly.
Now the "status" attribute returns "Not Charging" when the
battery on ThinkPads is not physicaly charging.
Tested-by: Kevin Locke <ke...@ke...>
Tested-by: Christoph Böhmwalder <chr...@bo...>
Signed-off-by: Ognjen Galic <smc...@gm...>
---
drivers/acpi/battery.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 2951d07..81e9b4e 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -71,6 +71,7 @@ static async_cookie_t async_cookie;
static bool battery_driver_registered;
static int battery_bix_broken_package;
static int battery_notification_delay_ms;
+static int battery_quirk_thinkpad_notcharging;
static unsigned int cache_time = 1000;
module_param(cache_time, uint, 0644);
MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
@@ -222,6 +223,13 @@ static int acpi_battery_get_property(struct power_supply *psy,
val->intval = POWER_SUPPLY_STATUS_CHARGING;
else if (acpi_battery_is_charged(battery))
val->intval = POWER_SUPPLY_STATUS_FULL;
+ /*
+ * On the Lenovo ThinkPad ACPI implementation, when
+ * neither bits 0 or 1 are set, that state is
+ * considered as "Not Charging".
+ */
+ else if (battery_quirk_thinkpad_notcharging)
+ val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
else
val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
break;
@@ -1301,6 +1309,13 @@ battery_notification_delay_quirk(const struct dmi_system_id *d)
return 0;
}
+static int __init
+battery_quirk_not_charging(const struct dmi_system_id *d)
+{
+ battery_quirk_thinkpad_notcharging = 1;
+ return 0;
+}
+
static const struct dmi_system_id bat_dmi_table[] __initconst = {
{
.callback = battery_bix_broken_package_quirk,
@@ -1318,6 +1333,14 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
DMI_MATCH(DMI_PRODUCT_NAME, "Aspire V5-573G"),
},
},
+ {
+ .callback = battery_quirk_not_charging,
+ .ident = "Lenovo ThinkPad",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"),
+ },
+ },
{},
};
--
2.7.4
|
|
From: Pavel M. <pa...@uc...> - 2017-12-18 14:47:23
Attachments:
signature.asc
|
On Sun 2017-12-10 19:05:29, Ognjen Galic wrote: > The EC/ACPI firmware on Lenovo ThinkPads used to report a status > of "Unknown" when the battery is between the charge start and > charge stop thresholds. On Windows, it reports "Not Charging" > so the quirk has been added to also report correctly. > > Now the "status" attribute returns "Not Charging" when the > battery on ThinkPads is not physicaly charging. > > Tested-by: Kevin Locke <ke...@ke...> > Tested-by: Christoph Böhmwalder <chr...@bo...> > Signed-off-by: Ognjen Galic <smc...@gm...> As mentioned before, it would be nice to add a state "not charging for battery lifetime reasons" and use it here. Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html |
|
From: Ognjen G. <smc...@gm...> - 2017-12-15 16:57:59
|
The EC/ACPI firmware on Lenovo ThinkPads used to report a status
of "Unknown" when the battery is between the charge start and
charge stop thresholds. On Windows, it reports "Not Charging"
so the quirk has been added to also report correctly.
Now the "status" attribute returns "Not Charging" when the
battery on ThinkPads is not physicaly charging.
Tested-by: Kevin Locke <ke...@ke...>
Tested-by: Christoph Böhmwalder <chr...@bo...>
Signed-off-by: Ognjen Galic <smc...@gm...>
---
drivers/acpi/battery.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 2951d07..81e9b4e 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -71,6 +71,7 @@ static async_cookie_t async_cookie;
static bool battery_driver_registered;
static int battery_bix_broken_package;
static int battery_notification_delay_ms;
+static int battery_quirk_thinkpad_notcharging;
static unsigned int cache_time = 1000;
module_param(cache_time, uint, 0644);
MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
@@ -222,6 +223,13 @@ static int acpi_battery_get_property(struct power_supply *psy,
val->intval = POWER_SUPPLY_STATUS_CHARGING;
else if (acpi_battery_is_charged(battery))
val->intval = POWER_SUPPLY_STATUS_FULL;
+ /*
+ * On the Lenovo ThinkPad ACPI implementation, when
+ * neither bits 0 or 1 are set, that state is
+ * considered as "Not Charging".
+ */
+ else if (battery_quirk_thinkpad_notcharging)
+ val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
else
val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
break;
@@ -1301,6 +1309,13 @@ battery_notification_delay_quirk(const struct dmi_system_id *d)
return 0;
}
+static int __init
+battery_quirk_not_charging(const struct dmi_system_id *d)
+{
+ battery_quirk_thinkpad_notcharging = 1;
+ return 0;
+}
+
static const struct dmi_system_id bat_dmi_table[] __initconst = {
{
.callback = battery_bix_broken_package_quirk,
@@ -1318,6 +1333,14 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
DMI_MATCH(DMI_PRODUCT_NAME, "Aspire V5-573G"),
},
},
+ {
+ .callback = battery_quirk_not_charging,
+ .ident = "Lenovo ThinkPad",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"),
+ },
+ },
{},
};
--
2.7.4
|
|
From: Rafael J. W. <ra...@ke...> - 2017-12-16 00:34:02
|
On Fri, Dec 15, 2017 at 5:57 PM, Ognjen Galic <smc...@gm...> wrote:
> The EC/ACPI firmware on Lenovo ThinkPads used to report a status
> of "Unknown" when the battery is between the charge start and
> charge stop thresholds. On Windows, it reports "Not Charging"
> so the quirk has been added to also report correctly.
>
> Now the "status" attribute returns "Not Charging" when the
> battery on ThinkPads is not physicaly charging.
>
> Tested-by: Kevin Locke <ke...@ke...>
> Tested-by: Christoph Böhmwalder <chr...@bo...>
> Signed-off-by: Ognjen Galic <smc...@gm...>
It doesn't look like this is related to the [1/3] and [3/3], so why do
you make it part of the series?
> ---
> drivers/acpi/battery.c | 23 +++++++++++++++++++++++
> 1 file changed, 23 insertions(+)
>
> diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
> index 2951d07..81e9b4e 100644
> --- a/drivers/acpi/battery.c
> +++ b/drivers/acpi/battery.c
> @@ -71,6 +71,7 @@ static async_cookie_t async_cookie;
> static bool battery_driver_registered;
> static int battery_bix_broken_package;
> static int battery_notification_delay_ms;
> +static int battery_quirk_thinkpad_notcharging;
Drop "thinkpad" from this name as somebody may need to use the quirk
for a machine from a different vendor in the future.
> static unsigned int cache_time = 1000;
> module_param(cache_time, uint, 0644);
> MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
> @@ -222,6 +223,13 @@ static int acpi_battery_get_property(struct power_supply *psy,
> val->intval = POWER_SUPPLY_STATUS_CHARGING;
> else if (acpi_battery_is_charged(battery))
> val->intval = POWER_SUPPLY_STATUS_FULL;
> + /*
> + * On the Lenovo ThinkPad ACPI implementation, when
> + * neither bits 0 or 1 are set, that state is
> + * considered as "Not Charging".
> + */
> + else if (battery_quirk_thinkpad_notcharging)
> + val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
> else
> val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
> break;
> @@ -1301,6 +1309,13 @@ battery_notification_delay_quirk(const struct dmi_system_id *d)
> return 0;
> }
>
> +static int __init
> +battery_quirk_not_charging(const struct dmi_system_id *d)
Don't break the above line (it will be over 80 chars long, but that's fine).
> +{
> + battery_quirk_thinkpad_notcharging = 1;
> + return 0;
> +}
> +
> static const struct dmi_system_id bat_dmi_table[] __initconst = {
> {
> .callback = battery_bix_broken_package_quirk,
> @@ -1318,6 +1333,14 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
> DMI_MATCH(DMI_PRODUCT_NAME, "Aspire V5-573G"),
> },
> },
> + {
Add a comment to describe this quirk (which it is needed in the first place).
> + .callback = battery_quirk_not_charging,
> + .ident = "Lenovo ThinkPad",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> + DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"),
> + },
> + },
> {},
> };
>
> --
Thanks,
Rafael
|
|
From: Rafael J. W. <ra...@ke...> - 2017-12-16 00:35:18
|
On Sat, Dec 16, 2017 at 1:33 AM, Rafael J. Wysocki <ra...@ke...> wrote:
> On Fri, Dec 15, 2017 at 5:57 PM, Ognjen Galic <smc...@gm...> wrote:
>> The EC/ACPI firmware on Lenovo ThinkPads used to report a status
>> of "Unknown" when the battery is between the charge start and
>> charge stop thresholds. On Windows, it reports "Not Charging"
>> so the quirk has been added to also report correctly.
>>
>> Now the "status" attribute returns "Not Charging" when the
>> battery on ThinkPads is not physicaly charging.
>>
>> Tested-by: Kevin Locke <ke...@ke...>
>> Tested-by: Christoph Böhmwalder <chr...@bo...>
>> Signed-off-by: Ognjen Galic <smc...@gm...>
>
> It doesn't look like this is related to the [1/3] and [3/3], so why do
> you make it part of the series?
>
>> ---
>> drivers/acpi/battery.c | 23 +++++++++++++++++++++++
>> 1 file changed, 23 insertions(+)
>>
>> diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
>> index 2951d07..81e9b4e 100644
>> --- a/drivers/acpi/battery.c
>> +++ b/drivers/acpi/battery.c
>> @@ -71,6 +71,7 @@ static async_cookie_t async_cookie;
>> static bool battery_driver_registered;
>> static int battery_bix_broken_package;
>> static int battery_notification_delay_ms;
>> +static int battery_quirk_thinkpad_notcharging;
>
> Drop "thinkpad" from this name as somebody may need to use the quirk
> for a machine from a different vendor in the future.
>
>> static unsigned int cache_time = 1000;
>> module_param(cache_time, uint, 0644);
>> MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
>> @@ -222,6 +223,13 @@ static int acpi_battery_get_property(struct power_supply *psy,
>> val->intval = POWER_SUPPLY_STATUS_CHARGING;
>> else if (acpi_battery_is_charged(battery))
>> val->intval = POWER_SUPPLY_STATUS_FULL;
>> + /*
>> + * On the Lenovo ThinkPad ACPI implementation, when
>> + * neither bits 0 or 1 are set, that state is
>> + * considered as "Not Charging".
>> + */
>> + else if (battery_quirk_thinkpad_notcharging)
>> + val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
>> else
>> val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
>> break;
>> @@ -1301,6 +1309,13 @@ battery_notification_delay_quirk(const struct dmi_system_id *d)
>> return 0;
>> }
>>
>> +static int __init
>> +battery_quirk_not_charging(const struct dmi_system_id *d)
>
> Don't break the above line (it will be over 80 chars long, but that's fine).
>
>> +{
>> + battery_quirk_thinkpad_notcharging = 1;
>> + return 0;
>> +}
>> +
>> static const struct dmi_system_id bat_dmi_table[] __initconst = {
>> {
>> .callback = battery_bix_broken_package_quirk,
>> @@ -1318,6 +1333,14 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
>> DMI_MATCH(DMI_PRODUCT_NAME, "Aspire V5-573G"),
>> },
>> },
>> + {
>
> Add a comment to describe this quirk (which it is needed in the first place).
s/whichj/why/
>
>> + .callback = battery_quirk_not_charging,
>> + .ident = "Lenovo ThinkPad",
>> + .matches = {
>> + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
>> + DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"),
>> + },
>> + },
>> {},
>> };
>>
>> --
|
|
From: Ognjen G. <smc...@gm...> - 2017-12-16 08:48:59
|
On Sat, Dec 16, 2017 at 01:33:55AM +0100, Rafael J. Wysocki wrote:
> On Fri, Dec 15, 2017 at 5:57 PM, Ognjen Galic <smc...@gm...> wrote:
> > The EC/ACPI firmware on Lenovo ThinkPads used to report a status
> > of "Unknown" when the battery is between the charge start and
> > charge stop thresholds. On Windows, it reports "Not Charging"
> > so the quirk has been added to also report correctly.
> >
> > Now the "status" attribute returns "Not Charging" when the
> > battery on ThinkPads is not physicaly charging.
> >
> > Tested-by: Kevin Locke <ke...@ke...>
> > Tested-by: Christoph Böhmwalder <chr...@bo...>
> > Signed-off-by: Ognjen Galic <smc...@gm...>
>
> It doesn't look like this is related to the [1/3] and [3/3], so why do
> you make it part of the series?
>
I made it the same series because it is practically the same feature
set. Without this patch and with 1/3 and 3/3 applied, there is a bug
where the status attribute would show "Unknown" for a battery that is
between the start and stop thresholds while attached to AC.
> > ---
> > drivers/acpi/battery.c | 23 +++++++++++++++++++++++
> > 1 file changed, 23 insertions(+)
> >
> > diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
> > index 2951d07..81e9b4e 100644
> > --- a/drivers/acpi/battery.c
> > +++ b/drivers/acpi/battery.c
> > @@ -71,6 +71,7 @@ static async_cookie_t async_cookie;
> > static bool battery_driver_registered;
> > static int battery_bix_broken_package;
> > static int battery_notification_delay_ms;
> > +static int battery_quirk_thinkpad_notcharging;
>
> Drop "thinkpad" from this name as somebody may need to use the quirk
> for a machine from a different vendor in the future.
>
> > static unsigned int cache_time = 1000;
> > module_param(cache_time, uint, 0644);
> > MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
> > @@ -222,6 +223,13 @@ static int acpi_battery_get_property(struct power_supply *psy,
> > val->intval = POWER_SUPPLY_STATUS_CHARGING;
> > else if (acpi_battery_is_charged(battery))
> > val->intval = POWER_SUPPLY_STATUS_FULL;
> > + /*
> > + * On the Lenovo ThinkPad ACPI implementation, when
> > + * neither bits 0 or 1 are set, that state is
> > + * considered as "Not Charging".
> > + */
> > + else if (battery_quirk_thinkpad_notcharging)
> > + val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
> > else
> > val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
> > break;
> > @@ -1301,6 +1309,13 @@ battery_notification_delay_quirk(const struct dmi_system_id *d)
> > return 0;
> > }
> >
> > +static int __init
> > +battery_quirk_not_charging(const struct dmi_system_id *d)
>
> Don't break the above line (it will be over 80 chars long, but that's fine).
>
> > +{
> > + battery_quirk_thinkpad_notcharging = 1;
> > + return 0;
> > +}
> > +
> > static const struct dmi_system_id bat_dmi_table[] __initconst = {
> > {
> > .callback = battery_bix_broken_package_quirk,
> > @@ -1318,6 +1333,14 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
> > DMI_MATCH(DMI_PRODUCT_NAME, "Aspire V5-573G"),
> > },
> > },
> > + {
>
> Add a comment to describe this quirk (which it is needed in the first place).
>
> > + .callback = battery_quirk_not_charging,
> > + .ident = "Lenovo ThinkPad",
> > + .matches = {
> > + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> > + DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"),
> > + },
> > + },
> > {},
> > };
> >
> > --
>
> Thanks,
> Rafael
|
|
From: Rafael J. W. <ra...@ke...> - 2017-12-16 10:18:19
|
On Sat, Dec 16, 2017 at 9:48 AM, Ognjen Galic <smc...@gm...> wrote: > On Sat, Dec 16, 2017 at 01:33:55AM +0100, Rafael J. Wysocki wrote: >> On Fri, Dec 15, 2017 at 5:57 PM, Ognjen Galic <smc...@gm...> wrote: >> > The EC/ACPI firmware on Lenovo ThinkPads used to report a status >> > of "Unknown" when the battery is between the charge start and >> > charge stop thresholds. On Windows, it reports "Not Charging" >> > so the quirk has been added to also report correctly. >> > >> > Now the "status" attribute returns "Not Charging" when the >> > battery on ThinkPads is not physicaly charging. >> > >> > Tested-by: Kevin Locke <ke...@ke...> >> > Tested-by: Christoph Böhmwalder <chr...@bo...> >> > Signed-off-by: Ognjen Galic <smc...@gm...> >> >> It doesn't look like this is related to the [1/3] and [3/3], so why do >> you make it part of the series? >> > > I made it the same series because it is practically the same feature > set. Without this patch and with 1/3 and 3/3 applied, there is a bug > where the status attribute would show "Unknown" for a battery that is > between the start and stop thresholds while attached to AC. OK, fair enough. I would reorder it as the first patch in the series, then, because the other two are more related to each other. Thanks, Rafael |
|
From: Ognjen G. <smc...@gm...> - 2017-12-18 10:21:36
|
On 16/12/2017, Rafael J. Wysocki <ra...@ke...> wrote: > On Sat, Dec 16, 2017 at 9:48 AM, Ognjen Galic <smc...@gm...> wrote: >> On Sat, Dec 16, 2017 at 01:33:55AM +0100, Rafael J. Wysocki wrote: >>> On Fri, Dec 15, 2017 at 5:57 PM, Ognjen Galic <smc...@gm...> >>> wrote: >>> > The EC/ACPI firmware on Lenovo ThinkPads used to report a status >>> > of "Unknown" when the battery is between the charge start and >>> > charge stop thresholds. On Windows, it reports "Not Charging" >>> > so the quirk has been added to also report correctly. >>> > >>> > Now the "status" attribute returns "Not Charging" when the >>> > battery on ThinkPads is not physicaly charging. >>> > >>> > Tested-by: Kevin Locke <ke...@ke...> >>> > Tested-by: Christoph Böhmwalder <chr...@bo...> >>> > Signed-off-by: Ognjen Galic <smc...@gm...> >>> >>> It doesn't look like this is related to the [1/3] and [3/3], so why do >>> you make it part of the series? >>> >> >> I made it the same series because it is practically the same feature >> set. Without this patch and with 1/3 and 3/3 applied, there is a bug >> where the status attribute would show "Unknown" for a battery that is >> between the start and stop thresholds while attached to AC. > > OK, fair enough. > > I would reorder it as the first patch in the series, then, because the > other two are more related to each other. > > Thanks, > Rafael > Do I really need now to re-order and re-send the whole patchset for it to get merged? Thanks. |
|
From: Rafael J. W. <ra...@ke...> - 2017-12-18 17:31:05
|
On Mon, Dec 18, 2017 at 11:21 AM, Ognjen Galić <smc...@gm...> wrote: > On 16/12/2017, Rafael J. Wysocki <ra...@ke...> wrote: >> On Sat, Dec 16, 2017 at 9:48 AM, Ognjen Galic <smc...@gm...> wrote: >>> On Sat, Dec 16, 2017 at 01:33:55AM +0100, Rafael J. Wysocki wrote: >>>> On Fri, Dec 15, 2017 at 5:57 PM, Ognjen Galic <smc...@gm...> >>>> wrote: >>>> > The EC/ACPI firmware on Lenovo ThinkPads used to report a status >>>> > of "Unknown" when the battery is between the charge start and >>>> > charge stop thresholds. On Windows, it reports "Not Charging" >>>> > so the quirk has been added to also report correctly. >>>> > >>>> > Now the "status" attribute returns "Not Charging" when the >>>> > battery on ThinkPads is not physicaly charging. >>>> > >>>> > Tested-by: Kevin Locke <ke...@ke...> >>>> > Tested-by: Christoph Böhmwalder <chr...@bo...> >>>> > Signed-off-by: Ognjen Galic <smc...@gm...> >>>> >>>> It doesn't look like this is related to the [1/3] and [3/3], so why do >>>> you make it part of the series? >>>> >>> >>> I made it the same series because it is practically the same feature >>> set. Without this patch and with 1/3 and 3/3 applied, there is a bug >>> where the status attribute would show "Unknown" for a battery that is >>> between the start and stop thresholds while attached to AC. >> >> OK, fair enough. >> >> I would reorder it as the first patch in the series, then, because the >> other two are more related to each other. >> >> Thanks, >> Rafael >> > > Do I really need now to re-order and re-send the whole patchset for it > to get merged? I'm not sure I will take anything of it at this time. Thanks, Rafael |
|
From: Andy S. <and...@gm...> - 2017-12-18 12:36:13
|
On Mon, Dec 18, 2017 at 12:21 PM, Ognjen Galić <smc...@gm...> wrote: > On 16/12/2017, Rafael J. Wysocki <ra...@ke...> wrote: >> I would reorder it as the first patch in the series, then, because the >> other two are more related to each other. > Do I really need now to re-order and re-send the whole patchset for it > to get merged? Through which tree it's supposed to go? -- With Best Regards, Andy Shevchenko |
|
From: Ognjen G. <smc...@gm...> - 2017-12-18 13:33:10
|
On 18/12/2017, Andy Shevchenko <and...@gm...> wrote: > On Mon, Dec 18, 2017 at 12:21 PM, Ognjen Galić <smc...@gm...> wrote: >> On 16/12/2017, Rafael J. Wysocki <ra...@ke...> wrote: > >>> I would reorder it as the first patch in the series, then, because the >>> other two are more related to each other. > >> Do I really need now to re-order and re-send the whole patchset for it >> to get merged? > > Through which tree it's supposed to go? > > -- > With Best Regards, > Andy Shevchenko > I'm afraid I don't understand the question. If you mean by Linux tree, it was written while 4.15-rc2 was active. Thanks, Gala |
|
From: Rafael J. W. <ra...@ke...> - 2017-12-18 17:32:05
|
On Mon, Dec 18, 2017 at 1:36 PM, Andy Shevchenko <and...@gm...> wrote: > On Mon, Dec 18, 2017 at 12:21 PM, Ognjen Galić <smc...@gm...> wrote: >> On 16/12/2017, Rafael J. Wysocki <ra...@ke...> wrote: > >>> I would reorder it as the first patch in the series, then, because the >>> other two are more related to each other. > >> Do I really need now to re-order and re-send the whole patchset for it >> to get merged? > > Through which tree it's supposed to go? Wait, wait. I haven't commented patches [1,3/3] yet, so no ACKs assumed, please. Thanks, Rafael |
|
From: Andy S. <and...@gm...> - 2017-12-19 14:34:54
|
On Mon, Dec 18, 2017 at 7:31 PM, Rafael J. Wysocki <ra...@ke...> wrote: > On Mon, Dec 18, 2017 at 1:36 PM, Andy Shevchenko > <and...@gm...> wrote: >> On Mon, Dec 18, 2017 at 12:21 PM, Ognjen Galić <smc...@gm...> wrote: >>> On 16/12/2017, Rafael J. Wysocki <ra...@ke...> wrote: >> >>>> I would reorder it as the first patch in the series, then, because the >>>> other two are more related to each other. >> >>> Do I really need now to re-order and re-send the whole patchset for it >>> to get merged? >> >> Through which tree it's supposed to go? > > Wait, wait. I haven't commented patches [1,3/3] yet, so no ACKs > assumed, please. I would prefer if you can take it through linux-pm. Whenever you are okay with the series let me know I would review PDx86 bits. -- With Best Regards, Andy Shevchenko |
|
From: Rafael J. W. <ra...@ke...> - 2017-12-19 16:24:55
|
On Tue, Dec 19, 2017 at 3:34 PM, Andy Shevchenko <and...@gm...> wrote: > On Mon, Dec 18, 2017 at 7:31 PM, Rafael J. Wysocki <ra...@ke...> wrote: >> On Mon, Dec 18, 2017 at 1:36 PM, Andy Shevchenko >> <and...@gm...> wrote: >>> On Mon, Dec 18, 2017 at 12:21 PM, Ognjen Galić <smc...@gm...> wrote: >>>> On 16/12/2017, Rafael J. Wysocki <ra...@ke...> wrote: >>> >>>>> I would reorder it as the first patch in the series, then, because the >>>>> other two are more related to each other. >>> >>>> Do I really need now to re-order and re-send the whole patchset for it >>>> to get merged? >>> >>> Through which tree it's supposed to go? >> >> Wait, wait. I haven't commented patches [1,3/3] yet, so no ACKs >> assumed, please. > > I would prefer if you can take it through linux-pm. No problem. > Whenever you are okay with the series let me know I would review PDx86 bits. OK Thanks, Rafael |
|
From: Ognjen G. <smc...@gm...> - 2017-12-20 15:16:24
|
The EC/ACPI firmware on Lenovo ThinkPads used to report a status
of "Unknown" when the battery is between the charge start and
charge stop thresholds. On Windows, it reports "Not Charging"
so the quirk has been added to also report correctly.
Now the "status" attribute returns "Not Charging" when the
battery on ThinkPads is not physicaly charging.
v7:
* Added all the style changes as suggested by Rafael
* Re-ordered the series to make this a post-implement
bugfix
Signed-off-by: Ognjen Galic <smc...@gm...>
---
drivers/acpi/battery.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 1794408..be47829 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -72,6 +72,7 @@ static async_cookie_t async_cookie;
static bool battery_driver_registered;
static int battery_bix_broken_package;
static int battery_notification_delay_ms;
+static int battery_quirk_notcharging;
static unsigned int cache_time = 1000;
module_param(cache_time, uint, 0644);
MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
@@ -223,6 +224,8 @@ static int acpi_battery_get_property(struct power_supply *psy,
val->intval = POWER_SUPPLY_STATUS_CHARGING;
else if (acpi_battery_is_charged(battery))
val->intval = POWER_SUPPLY_STATUS_FULL;
+ else if (battery_quirk_notcharging)
+ val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
else
val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
break;
@@ -1336,6 +1339,12 @@ battery_notification_delay_quirk(const struct dmi_system_id *d)
return 0;
}
+static int __init battery_quirk_not_charging(const struct dmi_system_id *d)
+{
+ battery_quirk_notcharging = 1;
+ return 0;
+}
+
static const struct dmi_system_id bat_dmi_table[] __initconst = {
{
.callback = battery_bix_broken_package_quirk,
@@ -1353,6 +1362,19 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
DMI_MATCH(DMI_PRODUCT_NAME, "Aspire V5-573G"),
},
},
+ {
+ /*
+ * On Lenovo ThinkPads the BIOS specification defines
+ * a state when the bits for charging and discharging
+ * are both set to 0. That state is "Not Charging".
+ */
+ .callback = battery_quirk_not_charging,
+ .ident = "Lenovo ThinkPad",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"),
+ },
+ },
{},
};
--
2.7.4
|
|
From: Ognjen G. <smc...@gm...> - 2017-12-21 10:01:28
|
The EC/ACPI firmware on Lenovo ThinkPads used to report a status
of "Unknown" when the battery is between the charge start and
charge stop thresholds. On Windows, it reports "Not Charging"
so the quirk has been added to also report correctly.
Now the "status" attribute returns "Not Charging" when the
battery on ThinkPads is not physicaly charging.
v7:
* Added all the style changes as suggested by Rafael
* Re-ordered the series to make this a post-implement
bugfix
v8:
* No changes in this patch in v8
Signed-off-by: Ognjen Galic <smc...@gm...>
---
drivers/acpi/battery.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index da56c3a..d07da7f 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -72,6 +72,7 @@ static async_cookie_t async_cookie;
static bool battery_driver_registered;
static int battery_bix_broken_package;
static int battery_notification_delay_ms;
+static int battery_quirk_notcharging;
static unsigned int cache_time = 1000;
module_param(cache_time, uint, 0644);
MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
@@ -223,6 +224,8 @@ static int acpi_battery_get_property(struct power_supply *psy,
val->intval = POWER_SUPPLY_STATUS_CHARGING;
else if (acpi_battery_is_charged(battery))
val->intval = POWER_SUPPLY_STATUS_FULL;
+ else if (battery_quirk_notcharging)
+ val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
else
val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
break;
@@ -1337,6 +1340,12 @@ battery_notification_delay_quirk(const struct dmi_system_id *d)
return 0;
}
+static int __init battery_quirk_not_charging(const struct dmi_system_id *d)
+{
+ battery_quirk_notcharging = 1;
+ return 0;
+}
+
static const struct dmi_system_id bat_dmi_table[] __initconst = {
{
.callback = battery_bix_broken_package_quirk,
@@ -1354,6 +1363,19 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
DMI_MATCH(DMI_PRODUCT_NAME, "Aspire V5-573G"),
},
},
+ {
+ /*
+ * On Lenovo ThinkPads the BIOS specification defines
+ * a state when the bits for charging and discharging
+ * are both set to 0. That state is "Not Charging".
+ */
+ .callback = battery_quirk_not_charging,
+ .ident = "Lenovo ThinkPad",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"),
+ },
+ },
{},
};
--
2.7.4
|
|
From: Ognjen G. <smc...@gm...> - 2017-12-21 19:55:21
|
The EC/ACPI firmware on Lenovo ThinkPads used to report a status
of "Unknown" when the battery is between the charge start and
charge stop thresholds. On Windows, it reports "Not Charging"
so the quirk has been added to also report correctly.
Now the "status" attribute returns "Not Charging" when the
battery on ThinkPads is not physicaly charging.
---
v7:
* Added all the style changes as suggested by Rafael
* Re-ordered the series to make this a post-implement
bugfix
v8:
* No changes in this patch in v8
v9:
* No changes in this patch in v9
Signed-off-by: Ognjen Galic <smc...@gm...>
---
drivers/acpi/battery.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index da56c3a..d07da7f 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -72,6 +72,7 @@ static async_cookie_t async_cookie;
static bool battery_driver_registered;
static int battery_bix_broken_package;
static int battery_notification_delay_ms;
+static int battery_quirk_notcharging;
static unsigned int cache_time = 1000;
module_param(cache_time, uint, 0644);
MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
@@ -223,6 +224,8 @@ static int acpi_battery_get_property(struct power_supply *psy,
val->intval = POWER_SUPPLY_STATUS_CHARGING;
else if (acpi_battery_is_charged(battery))
val->intval = POWER_SUPPLY_STATUS_FULL;
+ else if (battery_quirk_notcharging)
+ val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
else
val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
break;
@@ -1337,6 +1340,12 @@ battery_notification_delay_quirk(const struct dmi_system_id *d)
return 0;
}
+static int __init battery_quirk_not_charging(const struct dmi_system_id *d)
+{
+ battery_quirk_notcharging = 1;
+ return 0;
+}
+
static const struct dmi_system_id bat_dmi_table[] __initconst = {
{
.callback = battery_bix_broken_package_quirk,
@@ -1354,6 +1363,19 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
DMI_MATCH(DMI_PRODUCT_NAME, "Aspire V5-573G"),
},
},
+ {
+ /*
+ * On Lenovo ThinkPads the BIOS specification defines
+ * a state when the bits for charging and discharging
+ * are both set to 0. That state is "Not Charging".
+ */
+ .callback = battery_quirk_not_charging,
+ .ident = "Lenovo ThinkPad",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"),
+ },
+ },
{},
};
--
2.7.4
|
|
From: Ognjen G. <smc...@gm...> - 2017-12-23 10:53:59
|
The EC/ACPI firmware on Lenovo ThinkPads used to report a status
of "Unknown" when the battery is between the charge start and
charge stop thresholds. On Windows, it reports "Not Charging"
so the quirk has been added to also report correctly.
Now the "status" attribute returns "Not Charging" when the
battery on ThinkPads is not physicaly charging.
---
v7:
* Added all the style changes as suggested by Rafael
* Re-ordered the series to make this a post-implement
bugfix
v8:
* No changes in this patch in v8
v9:
* No changes in this patch in v9
v10:
* No changes in this patch in v10
Signed-off-by: Ognjen Galic <smc...@gm...>
---
drivers/acpi/battery.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index c86b373..08ef103 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -72,6 +72,7 @@ static async_cookie_t async_cookie;
static bool battery_driver_registered;
static int battery_bix_broken_package;
static int battery_notification_delay_ms;
+static int battery_quirk_notcharging;
static unsigned int cache_time = 1000;
module_param(cache_time, uint, 0644);
MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
@@ -223,6 +224,8 @@ static int acpi_battery_get_property(struct power_supply *psy,
val->intval = POWER_SUPPLY_STATUS_CHARGING;
else if (acpi_battery_is_charged(battery))
val->intval = POWER_SUPPLY_STATUS_FULL;
+ else if (battery_quirk_notcharging)
+ val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
else
val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
break;
@@ -1337,6 +1340,12 @@ battery_notification_delay_quirk(const struct dmi_system_id *d)
return 0;
}
+static int __init battery_quirk_not_charging(const struct dmi_system_id *d)
+{
+ battery_quirk_notcharging = 1;
+ return 0;
+}
+
static const struct dmi_system_id bat_dmi_table[] __initconst = {
{
.callback = battery_bix_broken_package_quirk,
@@ -1354,6 +1363,19 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
DMI_MATCH(DMI_PRODUCT_NAME, "Aspire V5-573G"),
},
},
+ {
+ /*
+ * On Lenovo ThinkPads the BIOS specification defines
+ * a state when the bits for charging and discharging
+ * are both set to 0. That state is "Not Charging".
+ */
+ .callback = battery_quirk_not_charging,
+ .ident = "Lenovo ThinkPad",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"),
+ },
+ },
{},
};
--
2.7.4
|
|
From: Ognjen G. <smc...@gm...> - 2017-12-31 14:17:54
|
The EC/ACPI firmware on Lenovo ThinkPads used to report a status
of "Unknown" when the battery is between the charge start and
charge stop thresholds. On Windows, it reports "Not Charging"
so the quirk has been added to also report correctly.
Now the "status" attribute returns "Not Charging" when the
battery on ThinkPads is not physicaly charging.
Signed-off-by: Ognjen Galic <smc...@gm...>
v7:
* Added all the style changes as suggested by Rafael
* Re-ordered the series to make this a post-implement
bugfix
v8:
* No changes in this patch in v8
v9:
* No changes in this patch in v9
v10:
* No changes in this patch in v10
v11:
* Fix formatting of changelog
---
drivers/acpi/battery.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index c86b373..08ef103 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -72,6 +72,7 @@ static async_cookie_t async_cookie;
static bool battery_driver_registered;
static int battery_bix_broken_package;
static int battery_notification_delay_ms;
+static int battery_quirk_notcharging;
static unsigned int cache_time = 1000;
module_param(cache_time, uint, 0644);
MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
@@ -223,6 +224,8 @@ static int acpi_battery_get_property(struct power_supply *psy,
val->intval = POWER_SUPPLY_STATUS_CHARGING;
else if (acpi_battery_is_charged(battery))
val->intval = POWER_SUPPLY_STATUS_FULL;
+ else if (battery_quirk_notcharging)
+ val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
else
val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
break;
@@ -1337,6 +1340,12 @@ battery_notification_delay_quirk(const struct dmi_system_id *d)
return 0;
}
+static int __init battery_quirk_not_charging(const struct dmi_system_id *d)
+{
+ battery_quirk_notcharging = 1;
+ return 0;
+}
+
static const struct dmi_system_id bat_dmi_table[] __initconst = {
{
.callback = battery_bix_broken_package_quirk,
@@ -1354,6 +1363,19 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
DMI_MATCH(DMI_PRODUCT_NAME, "Aspire V5-573G"),
},
},
+ {
+ /*
+ * On Lenovo ThinkPads the BIOS specification defines
+ * a state when the bits for charging and discharging
+ * are both set to 0. That state is "Not Charging".
+ */
+ .callback = battery_quirk_not_charging,
+ .ident = "Lenovo ThinkPad",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"),
+ },
+ },
{},
};
--
2.7.4
|
|
From: Ognjen G. <smc...@gm...> - 2018-01-03 11:59:49
|
The EC/ACPI firmware on Lenovo ThinkPads used to report a status
of "Unknown" when the battery is between the charge start and
charge stop thresholds. On Windows, it reports "Not Charging"
so the quirk has been added to also report correctly.
Now the "status" attribute returns "Not Charging" when the
battery on ThinkPads is not physicaly charging.
Signed-off-by: Ognjen Galic <smc...@gm...>
---
Notes:
v7:
* Added all the style changes as suggested by Rafael
* Re-ordered the series to make this a post-implement
bugfix
v8:
* No changes in this patch in v8
v9:
* No changes in this patch in v9
v10:
* No changes in this patch in v10
v11:
* Fix formatting of changelog
v12:
* No changes in this patch in v12
drivers/acpi/battery.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 7089e31..279516e 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -74,6 +74,7 @@ static async_cookie_t async_cookie;
static bool battery_driver_registered;
static int battery_bix_broken_package;
static int battery_notification_delay_ms;
+static int battery_quirk_notcharging;
static unsigned int cache_time = 1000;
module_param(cache_time, uint, 0644);
MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
@@ -225,6 +226,8 @@ static int acpi_battery_get_property(struct power_supply *psy,
val->intval = POWER_SUPPLY_STATUS_CHARGING;
else if (acpi_battery_is_charged(battery))
val->intval = POWER_SUPPLY_STATUS_FULL;
+ else if (battery_quirk_notcharging)
+ val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
else
val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
break;
@@ -1309,6 +1312,12 @@ battery_notification_delay_quirk(const struct dmi_system_id *d)
return 0;
}
+static int __init battery_quirk_not_charging(const struct dmi_system_id *d)
+{
+ battery_quirk_notcharging = 1;
+ return 0;
+}
+
static const struct dmi_system_id bat_dmi_table[] __initconst = {
{
.callback = battery_bix_broken_package_quirk,
@@ -1326,6 +1335,19 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
DMI_MATCH(DMI_PRODUCT_NAME, "Aspire V5-573G"),
},
},
+ {
+ /*
+ * On Lenovo ThinkPads the BIOS specification defines
+ * a state when the bits for charging and discharging
+ * are both set to 0. That state is "Not Charging".
+ */
+ .callback = battery_quirk_not_charging,
+ .ident = "Lenovo ThinkPad",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"),
+ },
+ },
{},
};
--
2.7.4
|
|
From: Andy S. <and...@gm...> - 2018-01-03 14:43:24
|
On Wed, Jan 3, 2018 at 1:59 PM, Ognjen Galic <smc...@gm...> wrote:
> The EC/ACPI firmware on Lenovo ThinkPads used to report a status
> of "Unknown" when the battery is between the charge start and
> charge stop thresholds. On Windows, it reports "Not Charging"
> so the quirk has been added to also report correctly.
>
> Now the "status" attribute returns "Not Charging" when the
> battery on ThinkPads is not physicaly charging.
>
> Signed-off-by: Ognjen Galic <smc...@gm...>
Reviewed-by: Andy Shevchenko <and...@gm...>
> ---
>
> Notes:
> v7:
> * Added all the style changes as suggested by Rafael
> * Re-ordered the series to make this a post-implement
> bugfix
>
> v8:
> * No changes in this patch in v8
>
> v9:
> * No changes in this patch in v9
>
> v10:
> * No changes in this patch in v10
>
> v11:
> * Fix formatting of changelog
>
> v12:
> * No changes in this patch in v12
>
> drivers/acpi/battery.c | 22 ++++++++++++++++++++++
> 1 file changed, 22 insertions(+)
>
> diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
> index 7089e31..279516e 100644
> --- a/drivers/acpi/battery.c
> +++ b/drivers/acpi/battery.c
> @@ -74,6 +74,7 @@ static async_cookie_t async_cookie;
> static bool battery_driver_registered;
> static int battery_bix_broken_package;
> static int battery_notification_delay_ms;
> +static int battery_quirk_notcharging;
> static unsigned int cache_time = 1000;
> module_param(cache_time, uint, 0644);
> MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
> @@ -225,6 +226,8 @@ static int acpi_battery_get_property(struct power_supply *psy,
> val->intval = POWER_SUPPLY_STATUS_CHARGING;
> else if (acpi_battery_is_charged(battery))
> val->intval = POWER_SUPPLY_STATUS_FULL;
> + else if (battery_quirk_notcharging)
> + val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
> else
> val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
> break;
> @@ -1309,6 +1312,12 @@ battery_notification_delay_quirk(const struct dmi_system_id *d)
> return 0;
> }
>
> +static int __init battery_quirk_not_charging(const struct dmi_system_id *d)
> +{
> + battery_quirk_notcharging = 1;
> + return 0;
> +}
> +
> static const struct dmi_system_id bat_dmi_table[] __initconst = {
> {
> .callback = battery_bix_broken_package_quirk,
> @@ -1326,6 +1335,19 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
> DMI_MATCH(DMI_PRODUCT_NAME, "Aspire V5-573G"),
> },
> },
> + {
> + /*
> + * On Lenovo ThinkPads the BIOS specification defines
> + * a state when the bits for charging and discharging
> + * are both set to 0. That state is "Not Charging".
> + */
> + .callback = battery_quirk_not_charging,
> + .ident = "Lenovo ThinkPad",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> + DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"),
> + },
> + },
> {},
> };
>
> --
> 2.7.4
>
--
With Best Regards,
Andy Shevchenko
|
|
From: Ognjen G. <smc...@gm...> - 2018-02-07 14:59:47
|
The EC/ACPI firmware on Lenovo ThinkPads used to report a status
of "Unknown" when the battery is between the charge start and
charge stop thresholds. On Windows, it reports "Not Charging"
so the quirk has been added to also report correctly.
Now the "status" attribute returns "Not Charging" when the
battery on ThinkPads is not physicaly charging.
Reviewed-by: Andy Shevchenko <and...@gm...>
Signed-off-by: Ognjen Galic <smc...@gm...>
---
Notes:
v7:
* Added all the style changes as suggested by Rafael
* Re-ordered the series to make this a post-implement
bugfix
v8:
* No changes in this patch in v8
v9:
* No changes in this patch in v9
v10:
* No changes in this patch in v10
v11:
* Fix formatting of changelog
v12:
* No changes in this patch in v12
v13:
* No changes in this patch in v13
drivers/acpi/battery.c | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 3fab2cb9e..e4b23738c 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -74,6 +74,7 @@ static async_cookie_t async_cookie;
static bool battery_driver_registered;
static int battery_bix_broken_package;
static int battery_notification_delay_ms;
+static int battery_quirk_notcharging;
static int battery_full_discharging;
static unsigned int cache_time = 1000;
module_param(cache_time, uint, 0644);
@@ -229,6 +230,8 @@ static int acpi_battery_get_property(struct power_supply *psy,
val->intval = POWER_SUPPLY_STATUS_CHARGING;
else if (acpi_battery_is_charged(battery))
val->intval = POWER_SUPPLY_STATUS_FULL;
+ else if (battery_quirk_notcharging)
+ val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
else
val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
break;
@@ -707,7 +710,7 @@ EXPORT_SYMBOL_GPL(battery_hook_register);
* This function gets called right after the battery sysfs
* attributes have been added, so that the drivers that
* define custom sysfs attributes can add their own.
-*/
+ */
static void battery_hook_add_battery(struct acpi_battery *battery)
{
struct acpi_battery_hook *hook_node;
@@ -1315,6 +1318,12 @@ static int __init battery_full_discharging_quirk(const struct dmi_system_id *d)
return 0;
}
+static int __init battery_quirk_not_charging(const struct dmi_system_id *d)
+{
+ battery_quirk_notcharging = 1;
+ return 0;
+}
+
static const struct dmi_system_id bat_dmi_table[] __initconst = {
{
.callback = battery_bix_broken_package_quirk,
@@ -1348,6 +1357,19 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
DMI_MATCH(DMI_PRODUCT_NAME, "UX305LA"),
},
},
+ {
+ /*
+ * On Lenovo ThinkPads the BIOS specification defines
+ * a state when the bits for charging and discharging
+ * are both set to 0. That state is "Not Charging".
+ */
+ .callback = battery_quirk_not_charging,
+ .ident = "Lenovo ThinkPad",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"),
+ },
+ },
{},
};
--
2.14.1
|
|
From: Henrique de M. H. <hm...@hm...> - 2018-02-09 10:45:42
|
On Wed, 07 Feb 2018, Ognjen Galic wrote: > The EC/ACPI firmware on Lenovo ThinkPads used to report a status > of "Unknown" when the battery is between the charge start and > charge stop thresholds. On Windows, it reports "Not Charging" > so the quirk has been added to also report correctly. > > Now the "status" attribute returns "Not Charging" when the > battery on ThinkPads is not physicaly charging. > > Reviewed-by: Andy Shevchenko <and...@gm...> > Signed-off-by: Ognjen Galic <smc...@gm...> AFAIK, This behavior goes back to the initial SBS implementation in the IBM era ECs of the Thinkpads... We've always called it "idle" in the linux-thinkpad community. The behavior comes from SBS (http://smartbattery.org/specs/), the EC was reporting its status (charging/not charging *THIS* battery) in one bit, and the battery's status (discharging/not discharging *THIS* battery) in a different bit. It was rather simple to observe the behavior of those bits in a two-battery system. Would that apply to these newer Lenovo models? If so, you might want to consider using "idle", instead. "not charging" does _not_ imply "neither charging nor discharging", while "idle" does. -- Henrique Holschuh |
