|
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
|
