Merge ~ghadi-rahme/ubuntu/+source/powermgmt-base:lp-1980991 into ubuntu/+source/powermgmt-base:ubuntu/devel

[Ghadi Rahme]

on_ac_power: improve reporting of AC power status in more scenarios

- If no battery is detected, do not report that the machine is offline.
    This fixes an issue with intel nuc devices that incorrectly report
    their typec ports as sink ports.
- Improve how the typec power role is determined by checking only
    the typec ports that are part of the UCSI device rather than checking
    the entire array of typec ports.

(LP: #1980991)

This adds a battery check that is already available in systemd: https://github.com/systemd/systemd/pull/24220
The only difference with this implementation is that it will run the other checks instead of directly assuming that the power is online. If other checks fail 255 will be returned.

It also makes typec power role checks tighter by only checking the typec ports related to each UCSI interface instead of checking all of them.

These two changes should massively improve the accuracy of on_ac_power

Unmerged commits

e669f9e... by Ghadi Rahme on 2025-03-11

update changelog

a017489... by Ghadi Rahme on 2025-03-11

on_ac_power: improve reporting of AC power status in more scenarios

- If no battery is detected, do not report that the machine is offline.
This fixes an issue with intel nuc devices that incorrectly report
their typec ports as sink ports.
- Improve how the typec power role is determined by checking only
the typec ports that are part of the UCSI device rather than checking
the entire array of typec ports.

(LP: #1980991)

diff --git a/debian/changelog b/debian/changelog
index 883a5a6..2b2dc32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+powermgmt-base (1.38+nmu1) unstable; urgency=medium
+
+  * on_ac_power: improve reporting of AC power status in more scenarios
+    (LP: #1980991)
+
+ -- Ghadi Elie Rahme <[e-mail]>  Tue, 11 Mar 2025 17:49:39 +0000
+
 powermgmt-base (1.38) unstable; urgency=medium
 
   * Team upload, salsa.d.o debian namespace
diff --git a/on_ac_power b/on_ac_power
index 2e65fc0..700861e 100755
--- a/on_ac_power
+++ b/on_ac_power
@@ -23,48 +23,61 @@ set -e
 OFF_LINE_P=no
 USB_IS_SINK=no
 USB_IS_SOURCE=no
-power_type="Mains"
+POWER_TYPE="Mains"
+HAS_BATTERY=no
 
 # USB-C sysfs documentation:
 # https://www.kernel.org/doc/Documentation/ABI/testing/sysfs-class-typec
 #
-# We verify first if there are any USB-C devices in power sink mode to
-# check if we should consider USB as a power source.  If no source ports
-# are found assume they are sink ports.
-#
-if [ -d /sys/class/typec/ ]; then
-	for FN in /sys/class/typec/*; do
-		if test -d "${FN}" && test -r "${FN}/power_role"; then
-			power_role="$(cat "${FN}/power_role")"
-			if echo $power_role | grep -q '\[source\]'; then
-				USB_IS_SOURCE=yes
-			elif echo $power_role | grep -q '\[sink\]'; then
-				USB_IS_SINK=yes
-			fi
-		fi
-	done
-	# Add USB* power type if any USB ports are sink or no source is found
-	if [ "${USB_IS_SINK}" = "yes" ] || [ "${USB_IS_SOURCE}" = "no" ]; then
-		power_type="USB*"
-	fi
-fi
-
+# We verify first if the USB-C port is is in sink or source mode before
+# checking it's connection status. Many typec devices might be linked to
+# one ucsi. If no source is found, treat it like a sink.
+check_usb_power_role() {
+    USB_IS_SINK=no
+    USB_IS_SOURCE=no
+    POWER_TYPE="Mains"
+    if [ -d $1/device/typec ]; then
+        for FN in $1/device/typec/*; do
+            if test -d "${FN}" && test -r "${FN}/power_role"; then
+                power_role="$(cat "${FN}/power_role")"
+                if echo $power_role | grep -q '\[source\]'; then
+                    USB_IS_SOURCE=yes
+                elif echo $power_role | grep -q '\[sink\]'; then
+                    USB_IS_SINK=yes
+                fi
+            fi
+        done
+        # Add USB* power type if any USB ports are sink or no source is found
+        if [ "${USB_IS_SINK}" = "yes" ] || [ "${USB_IS_SOURCE}" = "no" ]; then
+            POWER_TYPE="USB*"
+        fi
+    fi
+}
 
 if [ -d /sys/class/power_supply/ ]; then
     for FN in /sys/class/power_supply/*; do
-	if test -d "${FN}" && test -r "${FN}/type"; then
-	    type="$(cat "${FN}/type")"
-	    case "${type}" in
-	    Mains|$power_type|BrickID|Wireless)
-		if [ -r "${FN}/online" ]; then
-		    online="$(cat "${FN}/online")"
-		    [ "$online" = 1 ] && exit 0
-		    [ "$online" = 0 ] && OFF_LINE_P=yes
-		fi;;
-	    esac
-	fi
+        if test -d "${FN}" && test -r "${FN}/type"; then
+            type="$(cat "${FN}/type")"
+            # check if the device has a battery
+            if echo "$FN" | grep -qE '/BAT[0-9]+$' && [ "$type" = "Battery" ]; then
+                HAS_BATTERY=yes
+            fi
+            # check if it's a typec and it's power role if it is.
+            # Also set $POWER_TYPE accordingly and reset variables after last run
+            check_usb_power_role "$FN"
+            case "${type}" in
+            Mains|$POWER_TYPE|BrickID|Wireless)
+            if [ -r "${FN}/online" ]; then
+                online="$(cat "${FN}/online")"
+                [ "$online" = 1 ] && exit 0
+                [ "$online" = 0 ] && OFF_LINE_P=yes
+            fi;;
+            esac
+        fi
     done
-    [ "${OFF_LINE_P}" = "yes" ] && exit 1
+    # if no battery is present then we cannot be offline. Run the other checks in case
+    # the true state can be determined.
+    [ "${OFF_LINE_P}" = "yes" ] && [ "${HAS_BATTERY}" = "yes" ] && exit 1
 fi
 
 # PMU