[2/3] battery: Add the ThinkPad "Not Charging" quirk

Commit Message

Ognjen Galic Dec. 6, 2017, 10:53 p.m. UTC

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 <[e-mail]>
---
 drivers/acpi/battery.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

Comments

Christoph Böhmwalder Dec. 6, 2017, 11:55 p.m. UTC | #1

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

Patch

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"),
+		},
+	},
 	{},
 };