platform/x86: asus-wmi: temporarily revert to setting a charge limit

A userspace regression has been observed leaving the battery charging
threshold unconfigured, so while the fix is being shipped revert
the change keeping the infrastructure in place to return to the
preferred behaviour as soon as it's appropriate to do.

Link: https://lore.kernel.org/all/5db117b7-aad1-437f-a3d4-ba7b29fc68b3@redhat.com/
Link: https://gitlab.freedesktop.org/upower/upower/-/work_items/347
Closes: https://lore.kernel.org/all/CABsFS_g+V_Owum6knLhenhM15EXJRrsF0FcLiw30WZxarsTpUA@mail.gmail.com/
Fixes: 186bf9031666 ("platform/x86: asus-wmi: do not enforce a battery charge threshold")
Reported-by: Travers Biddle <traversbiddle@gmail.com>
Signed-off-by: Denis Benato <denis.benato@linux.dev>
Link: https://patch.msgid.link/20260710165841.59957-1-denis.benato@linux.dev
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 3c9ef826551d3fb2690d71c86b3e3cb271819377..e835779b6f5f1a807b21a765a701ccd2b308f121 100644 (file)
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -1618,6 +1618,8 @@ static DEVICE_ATTR_RW(charge_control_end_threshold);
 
 static int asus_wmi_battery_add(struct power_supply *battery, struct acpi_battery_hook *hook)
 {
+       int ret, rv;
+
        /* The WMI method does not provide a way to specific a battery, so we
         * just assume it is the first battery.
         * Note: On some newer ASUS laptops (Zenbook UM431DA), the primary/first
@@ -1635,12 +1637,30 @@ static int asus_wmi_battery_add(struct power_supply *battery, struct acpi_batter
 
        /* The charge threshold is only reset when the system is power cycled,
         * and we can't read the current threshold, however the majority of
-        * platforms retains it, therefore signal the threshold as unknown
-        * until user explicitly sets it to a new value.
+        * platforms retains it.
+        *
+        * Setting a negative value would signal the threshold as unknown
+        * until user explicitly sets it to a new value, however to avoid
+        * regressing userspace, we initialize it to a value of 100.
         */
-       charge_end_threshold = -1;
+       charge_end_threshold = 100;
+       ret = asus_wmi_set_devstate(ASUS_WMI_DEVID_RSOC, charge_end_threshold, &rv);
+       if (ret) {
+               pr_err("Failed to reset battery charge threshold\n");
+               goto asus_wmi_battery_add_err;
+       }
+
+       if (rv != 1) {
+               pr_err("Error in battery charge threshold reset\n");
+               ret = -EIO;
+               goto asus_wmi_battery_add_err;
+       }
 
        return 0;
+asus_wmi_battery_add_err:
+       device_remove_file(&battery->dev,
+                          &dev_attr_charge_control_end_threshold);
+       return ret;
 }
 
 static int asus_wmi_battery_remove(struct power_supply *battery, struct acpi_battery_hook *hook)