platform/x86: ideapad: Expose charge_types

Some Ideapad models support a battery conservation mode which limits the
battery charge threshold for longer battery longevity. This is currently
exposed via a custom conservation_mode attribute in sysfs.

The newly introduced charge_types sysfs attribute is a standardized
replacement for laptops with a fixed end charge threshold. Setting it to
`Long Life` would enable battery conservation mode. The standardized
user space API would allow applications such as UPower to detect laptops
which support this battery longevity mode and set it.

Tested on an Lenovo ideapad U330p.

Signed-off-by: Jelle van der Waa <jvanderwaa@redhat.com>
Suggested-By: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Thomas Weißschuh <linux@weissschuh.net>
Reviewed-by: Armin Wolf <W_Armin@gmx.de>
Link: https://lore.kernel.org/r/20250514201054.381320-1-jvanderwaa@redhat.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/Documentation/ABI/obsolete/sysfs-platform-ideapad-laptop b/Documentation/ABI/obsolete/sysfs-platform-ideapad-laptop
new file mode 100644 (file)
index 0000000..c1dbd19
--- /dev/null
+++ b/Documentation/ABI/obsolete/sysfs-platform-ideapad-laptop
@@ -0,0 +1,8 @@
+What:          /sys/bus/platform/devices/VPC2004:*/conservation_mode
+Date:          Aug 2017
+KernelVersion: 4.14
+Contact:       platform-driver-x86@vger.kernel.org
+Description:
+               Controls whether the conservation mode is enabled or not.
+               This feature limits the maximum battery charge percentage to
+               around 50-60% in order to prolong the lifetime of the battery.

diff --git a/Documentation/ABI/testing/sysfs-platform-ideapad-laptop b/Documentation/ABI/testing/sysfs-platform-ideapad-laptop
index 4989ab266682c6da43c29a88d7f11cce13cccffb..5ec0dee9e7074f37f43d223632b47fe0640e638e 100644 (file)
--- a/Documentation/ABI/testing/sysfs-platform-ideapad-laptop
+++ b/Documentation/ABI/testing/sysfs-platform-ideapad-laptop
@@ -27,15 +27,6 @@ Description:
                        * 1 -> Switched On
                        * 0 -> Switched Off
 
-What:          /sys/bus/platform/devices/VPC2004:*/conservation_mode
-Date:          Aug 2017
-KernelVersion: 4.14
-Contact:       platform-driver-x86@vger.kernel.org
-Description:
-               Controls whether the conservation mode is enabled or not.
-               This feature limits the maximum battery charge percentage to
-               around 50-60% in order to prolong the lifetime of the battery.
-
 What:          /sys/bus/platform/devices/VPC2004:*/fn_lock
 Date:          May 2018
 KernelVersion: 4.18

diff --git a/drivers/platform/x86/lenovo/Kconfig b/drivers/platform/x86/lenovo/Kconfig
index e9cb7372a2ca0b907d46fdcb9135d8bc725e3284..05dab29a22f71d2a96837108d122d8a5acdd7f28 100644 (file)
--- a/drivers/platform/x86/lenovo/Kconfig
+++ b/drivers/platform/x86/lenovo/Kconfig
@@ -6,6 +6,7 @@
 config IDEAPAD_LAPTOP
        tristate "Lenovo IdeaPad Laptop Extras"
        depends on ACPI
+       depends on ACPI_BATTERY
        depends on RFKILL && INPUT
        depends on SERIO_I8042
        depends on BACKLIGHT_CLASS_DEVICE

diff --git a/drivers/platform/x86/lenovo/ideapad-laptop.c b/drivers/platform/x86/lenovo/ideapad-laptop.c
index ede483573fe0ddc8ca85575bd91a36bff0fc13d7..21db9646443e55f89da57f8247a80147c1de0b20 100644 (file)
--- a/drivers/platform/x86/lenovo/ideapad-laptop.c
+++ b/drivers/platform/x86/lenovo/ideapad-laptop.c
@@ -27,6 +27,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/platform_profile.h>
+#include <linux/power_supply.h>
 #include <linux/rfkill.h>
 #include <linux/seq_file.h>
 #include <linux/sysfs.h>
@@ -34,6 +35,7 @@
 #include <linux/wmi.h>
 #include "ideapad-laptop.h"
 
+#include <acpi/battery.h>
 #include <acpi/video.h>
 
 #include <dt-bindings/leds/common.h>
@@ -162,6 +164,7 @@ struct ideapad_private {
        struct backlight_device *blightdev;
        struct ideapad_dytc_priv *dytc;
        struct dentry *debug;
+       struct acpi_battery_hook battery_hook;
        unsigned long cfg;
        unsigned long r_touchpad_val;
        struct {
@@ -589,6 +592,11 @@ static ssize_t camera_power_store(struct device *dev,
 
 static DEVICE_ATTR_RW(camera_power);
 
+static void show_conservation_mode_deprecation_warning(struct device *dev)
+{
+       dev_warn_once(dev, "conservation_mode attribute has been deprecated, see charge_types.\n");
+}
+
 static ssize_t conservation_mode_show(struct device *dev,
                                      struct device_attribute *attr,
                                      char *buf)
@@ -597,6 +605,8 @@ static ssize_t conservation_mode_show(struct device *dev,
        unsigned long result;
        int err;
 
+       show_conservation_mode_deprecation_warning(dev);
+
        err = eval_gbmd(priv->adev->handle, &result);
        if (err)
                return err;
@@ -612,6 +622,8 @@ static ssize_t conservation_mode_store(struct device *dev,
        bool state;
        int err;
 
+       show_conservation_mode_deprecation_warning(dev);
+
        err = kstrtobool(buf, &state);
        if (err)
                return err;
@@ -1973,10 +1985,90 @@ static const struct dmi_system_id ctrl_ps2_aux_port_list[] = {
        {}
 };
 
-static void ideapad_check_features(struct ideapad_private *priv)
+static int ideapad_psy_ext_set_prop(struct power_supply *psy,
+                                   const struct power_supply_ext *ext,
+                                   void *ext_data,
+                                   enum power_supply_property psp,
+                                   const union power_supply_propval *val)
+{
+       struct ideapad_private *priv = ext_data;
+
+       switch (val->intval) {
+       case POWER_SUPPLY_CHARGE_TYPE_LONGLIFE:
+               return exec_sbmc(priv->adev->handle, SBMC_CONSERVATION_ON);
+       case POWER_SUPPLY_CHARGE_TYPE_STANDARD:
+               return exec_sbmc(priv->adev->handle, SBMC_CONSERVATION_OFF);
+       default:
+               return -EINVAL;
+       }
+}
+
+static int ideapad_psy_ext_get_prop(struct power_supply *psy,
+                                   const struct power_supply_ext *ext,
+                                   void *ext_data,
+                                   enum power_supply_property psp,
+                                   union power_supply_propval *val)
+{
+       struct ideapad_private *priv = ext_data;
+       unsigned long result;
+       int err;
+
+       err = eval_gbmd(priv->adev->handle, &result);
+       if (err)
+               return err;
+
+       if (test_bit(GBMD_CONSERVATION_STATE_BIT, &result))
+               val->intval = POWER_SUPPLY_CHARGE_TYPE_LONGLIFE;
+       else
+               val->intval = POWER_SUPPLY_CHARGE_TYPE_STANDARD;
+
+       return 0;
+}
+
+static int ideapad_psy_prop_is_writeable(struct power_supply *psy,
+                                        const struct power_supply_ext *ext,
+                                        void *data,
+                                        enum power_supply_property psp)
+{
+       return true;
+}
+
+static const enum power_supply_property ideapad_power_supply_props[] = {
+       POWER_SUPPLY_PROP_CHARGE_TYPES,
+};
+
+static const struct power_supply_ext ideapad_battery_ext = {
+       .name                   = "ideapad_laptop",
+       .properties             = ideapad_power_supply_props,
+       .num_properties         = ARRAY_SIZE(ideapad_power_supply_props),
+       .charge_types           = (BIT(POWER_SUPPLY_CHARGE_TYPE_STANDARD) |
+                                  BIT(POWER_SUPPLY_CHARGE_TYPE_LONGLIFE)),
+       .get_property           = ideapad_psy_ext_get_prop,
+       .set_property           = ideapad_psy_ext_set_prop,
+       .property_is_writeable  = ideapad_psy_prop_is_writeable,
+};
+
+static int ideapad_battery_add(struct power_supply *battery, struct acpi_battery_hook *hook)
+{
+       struct ideapad_private *priv = container_of(hook, struct ideapad_private, battery_hook);
+
+       return power_supply_register_extension(battery, &ideapad_battery_ext,
+                                              &priv->platform_device->dev, priv);
+}
+
+static int ideapad_battery_remove(struct power_supply *battery,
+                                 struct acpi_battery_hook *hook)
+{
+       power_supply_unregister_extension(battery, &ideapad_battery_ext);
+
+       return 0;
+}
+
+static int ideapad_check_features(struct ideapad_private *priv)
 {
        acpi_handle handle = priv->adev->handle;
        unsigned long val;
+       int err;
 
        priv->features.set_fn_lock_led =
                set_fn_lock_led || dmi_check_system(set_fn_lock_led_list);
@@ -1991,8 +2083,16 @@ static void ideapad_check_features(struct ideapad_private *priv)
        if (!read_ec_data(handle, VPCCMD_R_FAN, &val))
                priv->features.fan_mode = true;
 
-       if (acpi_has_method(handle, "GBMD") && acpi_has_method(handle, "SBMC"))
+       if (acpi_has_method(handle, "GBMD") && acpi_has_method(handle, "SBMC")) {
                priv->features.conservation_mode = true;
+               priv->battery_hook.add_battery = ideapad_battery_add;
+               priv->battery_hook.remove_battery = ideapad_battery_remove;
+               priv->battery_hook.name = "Ideapad Battery Extension";
+
+               err = devm_battery_hook_register(&priv->platform_device->dev, &priv->battery_hook);
+               if (err)
+                       return err;
+       }
 
        if (acpi_has_method(handle, "DYTC"))
                priv->features.dytc = true;
@@ -2027,6 +2127,8 @@ static void ideapad_check_features(struct ideapad_private *priv)
                        }
                }
        }
+
+       return 0;
 }
 
 #if IS_ENABLED(CONFIG_ACPI_WMI)
@@ -2175,7 +2277,9 @@ static int ideapad_acpi_add(struct platform_device *pdev)
        if (err)
                return err;
 
-       ideapad_check_features(priv);
+       err = ideapad_check_features(priv);
+       if (err)
+               return err;
 
        ideapad_debugfs_init(priv);