Skip to contentSkip to conversation

acpi: battery: Query BCT method for steamdeck

PATCH In review Umang Jain 2 participants 7 messages Oct 14 – Nov 13 ACPI

lore
Share & tools
lore

Umang Jain

author
#0 lore raw

v3 cover acpi: battery: Query BCT method for steamdeck

Short series to query Battery charge time ("_BCT") from ACPI tables for steamdeck devices.

Patch 1/2 introduces the steamdeck device battery quirk. Patch 2/2 handles the case where steamdeck devices can report "Charging" even when low power PSU is connected which is discharging the device.

Changes in v3:
- Only query BCT method for the steamdeck quirk
- Drop charge_time member from battery object
- check for returned value from acpi_evaluate_integer for max ACPI_UINT32_MAX bounds as per the spec

Changes in v2:
- comment improvements
- split off BCT method handling into separate patch
- https://lore.kernel.org/all/[email protected]/

v1:
https://lore.kernel.org/all/[email protected]/

Umang Jain (2):
acpi: battery: Introduce Valve steamdeck devices quirk
acpi: battery: Read Battery charge time for Steamdeck devices

 drivers/acpi/battery.c | 45 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)
Signature · 1 line
2.55.0
author
#1 lore raw

PATCH v3 1/2 acpi: battery: Introduce Valve steamdeck devices quirk

Introduce a battery quirk for Valve Steamdeck devices ACPI_BATTERY_QUIRK_VALVE_STEAMDECK. This is required to detect if a low-power supply unit is connected to the device, which can report charging status through sysfs as "charging", even though in reality, it is discharging. We shall read Battery Charge Time ("_BCT") information to handle these cases, in a subsequent commit.

---
 drivers/acpi/battery.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
drivers/acpi/battery.c +20 -0
index 670853ec3a4d..fa20900bea0e 100644
@@ -94,6 +94,14 @@ enum {
 	 * on a full charge, but showing degradation in full charge cap.
 	 */
 	ACPI_BATTERY_QUIRK_DEGRADED_FULL_CHARGE,
+	/*
+	 * Valve steamdeck devices can get discharged even when battery status
+	 * is charging. This happens typically when low power supply unit is
+	 * connected. To accurately determine this scenario, we shall read
+	 * battery charge time ("_BCT"). This is the key differentiator to
+	 * determine whether the steamdeck is actually charging or not.
+	 */
+	ACPI_BATTERY_QUIRK_VALVE_STEAMDECK,
 };
 
 struct acpi_battery {
@@ -1057,6 +1065,18 @@ static void acpi_battery_quirks(struct acpi_battery *battery)
 		set_bit(ACPI_BATTERY_QUIRK_DEGRADED_FULL_CHARGE, &battery->flags);
 		battery->capacity_now = battery->full_charge_capacity;
 	}
+
+	if (test_bit(ACPI_BATTERY_QUIRK_VALVE_STEAMDECK, &battery->flags))
+		return;
+
+	if (dmi_name_in_vendors("Valve")) {
+		const char *name;
+
+		name = dmi_get_system_info(DMI_PRODUCT_NAME);
+		if ((name && (!strncmp("Jupiter", name, 7))) ||
+		    (name && (!strncmp("Galileo", name, 7))))
+			set_bit(ACPI_BATTERY_QUIRK_VALVE_STEAMDECK, &battery->flags);
+	}
 }
 
 static int acpi_battery_update(struct acpi_battery *battery, bool resume)
Signature · 1 line
2.55.0
author
#2 lore raw

PATCH v3 2/2 acpi: battery: Read Battery charge time for Steamdeck devices

In reply to Umang Jain

Valve steamdeck devices can report battery status as charging, even when low-powered power supply is connected to the device. The battery status is reported as charging through sysfs, even though in reality, it is discharging.

To handle this case, read out Battery charge time ("_BCT") as it is reported accurately on these devices, hence use that information for report charging vs discharging status. Battery charge time ("_BCT") with an eligible power supply unit will have valid values whereas with a low-powered supply unit, it shall report ACPI_BATTERY_VALUE_UNKNOWN. Use this as a differentiator to determine, whether the battery of steamdeck devices is really charging or not.

---
 drivers/acpi/battery.c | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)
drivers/acpi/battery.c +24 -1
index fa20900bea0e..b7818695b6cb 100644
@@ -242,7 +242,7 @@ static int acpi_battery_get_property(struct power_supply *psy,
 					: POWER_SUPPLY_STATUS_DISCHARGING;
 				return 0;
 			}
-		else if (battery->state & ACPI_BATTERY_STATE_CHARGING)
+		else if (battery->state & ACPI_BATTERY_STATE_CHARGING) {
 			/* Check the rate and capacity to validate the status. */
 			if (!acpi_battery_is_full(battery) ||
 			    (battery->rate_now != ACPI_BATTERY_VALUE_UNKNOWN &&
@@ -252,6 +252,29 @@ static int acpi_battery_get_property(struct power_supply *psy,
 				/* Full and zero rate. */
 				val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
 			}
+
+			/*
+			 * For Valve Steamdeck devices, evaluate _BCT to determine
+			 * if we are really charging.
+			 */
+			if (test_bit(ACPI_BATTERY_QUIRK_VALVE_STEAMDECK, &battery->flags) &&
+			    acpi_has_method(battery->device->handle, "_BCT")) {
+				unsigned long long bct;
+				acpi_status status;
+				union acpi_object arg0 = { ACPI_TYPE_INTEGER };
+				struct acpi_object_list args = { 1, &arg0 };
+
+				arg0.integer.value = 100;
+				status = acpi_evaluate_integer(battery->device->handle, "_BCT",
+							       &args, &bct);
+				if (ACPI_FAILURE(status) || bct > ACPI_UINT32_MAX)
+					acpi_handle_info(battery->device->handle,
+							 "_BCT evaluation failed: %s",
+							 acpi_format_exception(status));
+				else if (bct == ACPI_BATTERY_VALUE_UNKNOWN)
+					val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
+			}
+		}
 		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.55.0
#3 lore raw

Re: [PATCH v3 2/2] acpi: battery: Read Battery charge time for Steamdeck devices

Quoted 15 lines · Umang Jain

Valve steamdeck devices can report battery status as charging, even when low-powered power supply is connected to the device. The battery status is reported as charging through sysfs, even though in reality, it is discharging.

To handle this case, read out Battery charge time ("_BCT") as it is reported accurately on these devices, hence use that information for report charging vs discharging status. Battery charge time ("_BCT") with an eligible power supply unit will have valid values whereas with a low-powered supply unit, it shall report ACPI_BATTERY_VALUE_UNKNOWN. Use this as a differentiator to determine, whether the battery of steamdeck devices is really charging or not.

Quoted 1 line

I think that it would be better to merge this patch with the [1/2].

Quoted 18 lines
---
 drivers/acpi/battery.c | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)
drivers/acpi/battery.c +1 -1
index fa20900bea0e..b7818695b6cb 100644
@@ -242,7 +242,7 @@ static int acpi_battery_get_property(struct power_supply *psy,
                                        : POWER_SUPPLY_STATUS_DISCHARGING;
                                return 0;
                        }
-               else if (battery->state & ACPI_BATTERY_STATE_CHARGING)
+               else if (battery->state & ACPI_BATTERY_STATE_CHARGING) {
                        /* Check the rate and capacity to validate the status. */
                        if (!acpi_battery_is_full(battery) ||
                            (battery->rate_now != ACPI_BATTERY_VALUE_UNKNOWN &&

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

Quoted 10 lines
drivers/acpi/battery.c +7 -0
@@ -252,6 +252,29 @@ static int acpi_battery_get_property(struct power_supply *psy,
                                /* Full and zero rate. */
                                val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
                        }
+
+                       /*
+                        * For Valve Steamdeck devices, evaluate _BCT to determine
+                        * if we are really charging.
+                        */
+                       if (test_bit(ACPI_BATTERY_QUIRK_VALVE_STEAMDECK, &battery->flags) &&
+                           acpi_has_method(battery->device->handle, "_BCT")) {

Can you check the _BCT presence at the time when the quirk bit is set and avoid setting the bit when _BCT is not present? That would allow you to just test the bit here.

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

Quoted 10 lines
drivers/acpi/battery.c +10 -0
+                               unsigned long long bct;
+                               acpi_status status;
+                               union acpi_object arg0 = { ACPI_TYPE_INTEGER };
+                               struct acpi_object_list args = { 1, &arg0 };
+
+                               arg0.integer.value = 100;
+                               status = acpi_evaluate_integer(battery->device->handle, "_BCT",
+                                                              &args, &bct);
+                               if (ACPI_FAILURE(status) || bct > ACPI_UINT32_MAX)
+                                       acpi_handle_info(battery->device->handle,

This should be acpi_handle_debug(), but I'm not sure if this message is interesting at all, especially if _BCT fails every time. Also, it may be confusing in the bct > ACPI_UINT32_MAX case because it may print "success" then.

Quoted 10 lines
drivers/acpi/battery.c +6 -1
+                                                        "_BCT evaluation failed: %s",
+                                                        acpi_format_exception(status));
+                               else if (bct == ACPI_BATTERY_VALUE_UNKNOWN)
+                                       val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
+                       }
+               }
                else if (battery->state & ACPI_BATTERY_STATE_CHARGE_LIMITING)
                        val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
                else if (acpi_battery_is_charged(battery))
--
author
#4 lore raw

Re: [PATCH v3 2/2] acpi: battery: Read Battery charge time for Steamdeck devices

Hi Rafael,

Thanks for the review

Quoted 64 lines · Rafael J. Wysocki (Intel)
Quoted 15 lines · Umang Jain

Valve steamdeck devices can report battery status as charging, even when low-powered power supply is connected to the device. The battery status is reported as charging through sysfs, even though in reality, it is discharging.

To handle this case, read out Battery charge time ("_BCT") as it is reported accurately on these devices, hence use that information for report charging vs discharging status. Battery charge time ("_BCT") with an eligible power supply unit will have valid values whereas with a low-powered supply unit, it shall report ACPI_BATTERY_VALUE_UNKNOWN. Use this as a differentiator to determine, whether the battery of steamdeck devices is really charging or not.

Quoted 1 line

I think that it would be better to merge this patch with the [1/2].

Quoted 18 lines
---
 drivers/acpi/battery.c | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)
drivers/acpi/battery.c +1 -1
index fa20900bea0e..b7818695b6cb 100644
@@ -242,7 +242,7 @@ static int acpi_battery_get_property(struct power_supply *psy,
                                        : POWER_SUPPLY_STATUS_DISCHARGING;
                                return 0;
                        }
-               else if (battery->state & ACPI_BATTERY_STATE_CHARGING)
+               else if (battery->state & ACPI_BATTERY_STATE_CHARGING) {
                        /* Check the rate and capacity to validate the status. */
                        if (!acpi_battery_is_full(battery) ||
                            (battery->rate_now != ACPI_BATTERY_VALUE_UNKNOWN &&

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

Quoted 10 lines
drivers/acpi/battery.c +7 -0
@@ -252,6 +252,29 @@ static int acpi_battery_get_property(struct power_supply *psy,
                                /* Full and zero rate. */
                                val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
                        }
+
+                       /*
+                        * For Valve Steamdeck devices, evaluate _BCT to determine
+                        * if we are really charging.
+                        */
+                       if (test_bit(ACPI_BATTERY_QUIRK_VALVE_STEAMDECK, &battery->flags) &&
+                           acpi_has_method(battery->device->handle, "_BCT")) {

Can you check the _BCT presence at the time when the quirk bit is set and avoid setting the bit when _BCT is not present? That would allow you to just test the bit here.

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

Quoted 10 lines
drivers/acpi/battery.c +10 -0
+                               unsigned long long bct;
+                               acpi_status status;
+                               union acpi_object arg0 = { ACPI_TYPE_INTEGER };
+                               struct acpi_object_list args = { 1, &arg0 };
+
+                               arg0.integer.value = 100;
+                               status = acpi_evaluate_integer(battery->device->handle, "_BCT",
+                                                              &args, &bct);
+                               if (ACPI_FAILURE(status) || bct > ACPI_UINT32_MAX)
+                                       acpi_handle_info(battery->device->handle,
Quoted 4 lines

This should be acpi_handle_debug(), but I'm not sure if this message is interesting at all, especially if _BCT fails every time. Also, it may be confusing in the bct > ACPI_UINT32_MAX case because it may print "success" then.

Agree with the ACPI_UINT32_MAX comment. I would like to keep the message with acpi_handle_debug and split the if branch to handle the bct > ACPI_UINT32_MAX separately. In this case, I won't print the acpi_format_exception(status) and simply write that bct value is just invalid. How does that sound?

Thanks.

Quoted 11 lines
Quoted 11 lines
drivers/acpi/battery.c +6 -1
+                                                        "_BCT evaluation failed: %s",
+                                                        acpi_format_exception(status));
+                               else if (bct == ACPI_BATTERY_VALUE_UNKNOWN)
+                                       val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
+                       }
+               }
                else if (battery->state & ACPI_BATTERY_STATE_CHARGE_LIMITING)
                        val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
                else if (acpi_battery_is_charged(battery))
--
author
#5 lore raw
In reply to Umang Jain

Hello,

Gentle ping for review?

Quoted 28 lines · Umang Jain

Short series to query Battery charge time ("_BCT") from ACPI tables for steamdeck devices.

Patch 1/2 introduces the steamdeck device battery quirk. Patch 2/2 handles the case where steamdeck devices can report "Charging" even when low power PSU is connected which is discharging the device.

Changes in v3:
- Only query BCT method for the steamdeck quirk
- Drop charge_time member from battery object
- check for returned value from acpi_evaluate_integer for max ACPI_UINT32_MAX bounds as per the spec

Changes in v2:
- comment improvements
- split off BCT method handling into separate patch
- https://lore.kernel.org/all/[email protected]/

v1:
https://lore.kernel.org/all/[email protected]/

Umang Jain (2):
acpi: battery: Introduce Valve steamdeck devices quirk
acpi: battery: Read Battery charge time for Steamdeck devices

 drivers/acpi/battery.c | 45 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)
#6 lore raw
Quoted 4 lines · Umang Jain

Hello,

Gentle ping for review?

I'd suggest finding somebody near you who can give you some feedback on the list instead of sending messages like this.

The patch is in my queue of things to look at, FWIW.

Thanks!

Quoted 29 lines · Umang Jain
Quoted 28 lines

Short series to query Battery charge time ("_BCT") from ACPI tables for steamdeck devices.

Patch 1/2 introduces the steamdeck device battery quirk. Patch 2/2 handles the case where steamdeck devices can report "Charging" even when low power PSU is connected which is discharging the device.

Changes in v3:
- Only query BCT method for the steamdeck quirk
- Drop charge_time member from battery object
- check for returned value from acpi_evaluate_integer for max ACPI_UINT32_MAX bounds as per the spec

Changes in v2:
- comment improvements
- split off BCT method handling into separate patch
- https://lore.kernel.org/all/[email protected]/

v1:
https://lore.kernel.org/all/[email protected]/

Umang Jain (2):
acpi: battery: Introduce Valve steamdeck devices quirk
acpi: battery: Read Battery charge time for Steamdeck devices

 drivers/acpi/battery.c | 45 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)