Skip to contentSkip to conversation

ACPI: battery: fix incorrect charging status when current is zero

PATCH Applied Ata İlhan Köktürk 2 participants 2 messages Jan 29 – Feb 1 ACPI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ACPI: battery: fix incorrect charging status when current is zero

On some laptops, such as the Huawei Matebook series the Embedded Controller continues to report "Charging" status even when the charge threshold is reached and no current is being drawn.

This incorrect reporting prevents the
system from switching to battery
power profiles, leading to significantly
higher power consumption (e.g., 18W
instead of 7W during browsing) and
broken battery remaining time estimation.

Validate the "Charging" state
by checking if rate_now is zero. If the hardware reports charging but the current is zero, report "Not Charging" to user space.

---
 drivers/acpi/battery.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/acpi/battery.c +7 -1
index 34181fa52..b4ba8085f 100644
@@ -211,7 +211,13 @@ static int acpi_battery_get_property(struct power_supply *psy,
 		if (battery->state & ACPI_BATTERY_STATE_DISCHARGING)
 			val->intval = acpi_battery_handle_discharging(battery);
 		else if (battery->state & ACPI_BATTERY_STATE_CHARGING)
-			val->intval = POWER_SUPPLY_STATUS_CHARGING;
+			/* Check if we can fetch ACPI current info */
+			if (battery->rate_now != ACPI_BATTERY_VALUE_UNKNOWN &&
+				battery->rate_now == 0)
+				/* On charge but no current (0W/0mA) */
+				val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
+			else
+				val->intval = POWER_SUPPLY_STATUS_CHARGING;
 		else if (battery->state & ACPI_BATTERY_STATE_CHARGE_LIMITING)
 			val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
 		else if (acpi_battery_is_charged(battery))
Signature · 1 line
2.43.0
maintainer Applied
#1 lore raw
Quoted 33 lines · Ata İlhan Köktürk

On some laptops, such as the Huawei Matebook series the Embedded Controller continues to report "Charging" status even when the charge threshold is reached and no current is being drawn.

This incorrect reporting prevents the
system from switching to battery
power profiles, leading to significantly
higher power consumption (e.g., 18W
instead of 7W during browsing) and
broken battery remaining time estimation.

Validate the "Charging" state
by checking if rate_now is zero. If the hardware reports charging but the current is zero, report "Not Charging" to user space.

---
 drivers/acpi/battery.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/acpi/battery.c +1 -1
index 34181fa52..b4ba8085f 100644
@@ -211,7 +211,13 @@ static int acpi_battery_get_property(struct power_supply *psy,
                if (battery->state & ACPI_BATTERY_STATE_DISCHARGING)
                        val->intval = acpi_battery_handle_discharging(battery);
                else if (battery->state & ACPI_BATTERY_STATE_CHARGING)
-                       val->intval = POWER_SUPPLY_STATUS_CHARGING;
+                       /* Check if we can fetch ACPI current info */

drivers/acpi/battery.c static int acpi_battery_get_property(struct power_supply *psy,

Quoted 10 lines
drivers/acpi/battery.c +6 -1
+                       if (battery->rate_now != ACPI_BATTERY_VALUE_UNKNOWN &&
+                               battery->rate_now == 0)
+                               /* On charge but no current (0W/0mA) */
+                               val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
+                       else
+                               val->intval = POWER_SUPPLY_STATUS_CHARGING;
                else if (battery->state & ACPI_BATTERY_STATE_CHARGE_LIMITING)
                        val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
                else if (acpi_battery_is_charged(battery))
--

Applied as 6.20/7.0 material, thanks!