Commit bb1256e0 authored by Ata İlhan Köktürk's avatar Ata İlhan Köktürk Committed by Rafael J. Wysocki
Browse files

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 (e.g., 18W instead
of 7W during browsing) and missed remaining battery 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.

Signed-off-by: default avatarAta İlhan Köktürk <atailhan2006@gmail.com>
[ rjw: Whitespace fix, braces added to an inner if (), new comment rewrite ]
[ rjw: Changelog edits ]
Link: https://patch.msgid.link/20260129144856.43058-1-atailhan2006@gmail.com


Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 0a869409

drivers/acpi/battery.c

+8 −1
Original line number Diff line number Diff line
@@ -212,7 +212,14 @@ 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)

			/* Validate the status by checking the current. */

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