Re: [PATCH v4] platform/x86: lenovo-wmi-other: Deconflict battery with thinkpad_acpi
From: Rong Zhang
Date: Wed Nov 18 2026 - 06:56:10 EST
Hi Aaron,
On Wed, 2026-11-18 at 14:30 +0800, Aaron Ma wrote:
> ThinkPads expose battery charge thresholds and charge_behaviour through
> thinkpad_acpi's ACPI battery hook using raw sysfs attribute groups. The
> Lenovo WMI "Other Mode" driver also registers a power_supply_ext for
> charge_behaviour and charge_types on systems advertising those WMI
> capabilities.
>
> When lenovo-wmi-other registers first, thinkpad_acpi fails to create a
> duplicate charge_behaviour sysfs attribute and unregisters its battery
> extension. Conversely, registering or updating any power_supply_ext on
> the same battery runs sysfs_update_groups(), which removes standard
> power-supply attributes not owned by power_supply_core and wipes out
> thinkpad_acpi's charge_control_start_threshold,
> charge_control_end_threshold, and charge_behaviour files.
>
> Deconflict both ideapad_laptop (VPC2004 with GBMD and SBMC) and
> thinkpad_acpi (LEN0268, LEN0068, or IBM0068 with BDSG and BICG) via a
> per-driver table guarded by IS_ENABLED() in Kconfig, and update the
> force_load_psy_ext description accordingly.
>
> Fixes: 9ca8fc065b88b ("platform/x86: lenovo-wmi-other: Add WMI battery charge limiting")
> Reviewed-by: Derek J. Clark <derekjohn.clark@xxxxxxxxx>
> Co-developed-by: Rong Zhang <i@xxxxxxxx>
> Signed-off-by: Rong Zhang <i@xxxxxxxx>
> Signed-off-by: Aaron Ma <aaron.ma@xxxxxxxxxxxxx>
> ---
> Changes in v4:
> - Make hids const char * const * with separate HIDs and methods macros,
> as noted by Ilpo Järvinen.
> - Move HID lookup and method checks into lwmi_acpi_device_has_methods(),
> as suggested by Ilpo Järvinen.
>
> Changes in v3:
> - Wrap deconfliction table entries in #if IS_ENABLED(CONFIG_*) and drop
> driver_enabled, as suggested by Rong Zhang.
> - Group deconfliction entries per driver (HIDs list + methods list).
>
> Changes in v2:
> - Consolidate IdeaPad and ThinkPad deconfliction into a table of ACPI
> device IDs, method pairs, and driver configuration checks, as suggested
> by Derek J. Clark.
> - Check GBMD and SBMC for IdeaPads, and BDSG and BICG for ThinkPads,
> instead of relying only on ThinkPad ACPI device presence.
> - Check whether the corresponding driver is enabled before looking up
> its ACPI device, including for ideapad_laptop.
> - Update the force_load_psy_ext description to cover both drivers.
>
> v3: https://lore.kernel.org/platform-driver-x86/20261113055726.952551-1-aaron.ma@xxxxxxxxxxxxx/
> v2: https://lore.kernel.org/platform-driver-x86/20261112074823.853819-1-aaron.ma@xxxxxxxxxxxxx/
> v1: https://lore.kernel.org/platform-driver-x86/20261111083529.727285-1-aaron.ma@xxxxxxxxxxxxx/
>
> drivers/platform/x86/lenovo/wmi-other.c | 84 ++++++++++++++++++++-----
> 1 file changed, 70 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86/lenovo/wmi-other.c
> index bd64e7b44669d..485e9a9e4afbd 100644
> --- a/drivers/platform/x86/lenovo/wmi-other.c
> +++ b/drivers/platform/x86/lenovo/wmi-other.c
> @@ -189,10 +189,10 @@ MODULE_PARM_DESC(relax_fan_constraint,
> static bool force_load_psy_ext;
> module_param(force_load_psy_ext, bool, 0444);
> MODULE_PARM_DESC(force_load_psy_ext,
> - "This option will skip checking if the ideapad_laptop driver will conflict "
> + "This option will skip checking if the ideapad_laptop or thinkpad_acpi driver will conflict "
> "with adding an extension to set the battery charge behavior and battery charge "
> "control end threshold. It will also skip checking if the BIOS reports that "
> - "those features are fully supported. It is recommended to blacklist the ideapad "
> + "those features are fully supported. It is recommended to blacklist the conflicting "
> "driver before using this option.");
>
> /* ======== HWMON (component: lenovo-wmi-capdata 00 & fan) ======== */
> @@ -905,19 +905,69 @@ static acpi_status lwmi_acpi_match(acpi_handle handle, u32 lvl,
> return AE_CTRL_TERMINATE;
> }
>
> +struct lwmi_psy_deconflict {
> + const char * const *hids;
> + char * const *methods;
> +};
> +
> +#if IS_ENABLED(CONFIG_IDEAPAD_LAPTOP) || IS_ENABLED(CONFIG_THINKPAD_ACPI)
The #if did not exist in my original patch. Please don't increase the
maintenance burden simply because of a W=2 warning.
See also my reply to v3.
> +#define LWMI_PSY_DECONFLICT_HIDS(...) \
> + ((const char * const[]) { __VA_ARGS__, NULL })
> +#define LWMI_PSY_DECONFLICT_METHODS(...) \
> + ((char * const[]) { __VA_ARGS__, NULL })
My original patch safely dropped the const qualifier with cast when
calling acpi_has_method(). If you really don't want to introduce new
cast, please refactor acpi_has_method() instead of abusing the .data
section.
> +#endif
> +
> +static const struct lwmi_psy_deconflict lwmi_psy_deconflict_list[] = {
> +#if IS_ENABLED(CONFIG_IDEAPAD_LAPTOP)
> + {
> + .hids = LWMI_PSY_DECONFLICT_HIDS("VPC2004"),
> + .methods = LWMI_PSY_DECONFLICT_METHODS("GBMD", "SBMC"),
> + },
> +#endif /* IS_ENABLED(CONFIG_IDEAPAD_LAPTOP) */
> +#if IS_ENABLED(CONFIG_THINKPAD_ACPI)
> + {
> + .hids = LWMI_PSY_DECONFLICT_HIDS("LEN0268", "LEN0068", "IBM0068"),
> + .methods = LWMI_PSY_DECONFLICT_METHODS("BDSG", "BICG"),
> + },
> +#endif /* IS_ENABLED(CONFIG_THINKPAD_ACPI) */
> +};
> +
> +/**
> + * lwmi_acpi_device_has_methods() - Check if an ACPI device has all methods
> + * @hid: ACPI hardware ID to match
> + * @methods: NULL-terminated array of required ACPI method names
> + *
> + * Return: true if a matching ACPI device is present and exposes all @methods,
> + * or false otherwise.
> + */
> +static bool lwmi_acpi_device_has_methods(const char *hid, char * const *methods)
> +{
> + acpi_handle handle = NULL;
> + int ret;
> +
> + ret = acpi_get_devices(hid, lwmi_acpi_match, &handle, NULL);
> + if (ret || !handle)
> + return false;
> +
> + for (unsigned int i = 0; methods[i]; i++) {
> + if (!acpi_has_method(handle, methods[i]))
> + return false;
> + }
> +
> + return true;
> +}
> +
> /**
> * lwmi_om_psy_ext_init() - Hooks power supply extension to device battery
> * @priv: Pointer to the lwmi_om_priv drvdata.
> *
> - * Checks if the ideapad_laptop driver is going to manage charge attributes first,
> - * then if not, hooks the battery to our WMI methods if they are supported.
> + * Checks if the ideapad_laptop or thinkpad_acpi driver is going to manage
> + * charge attributes first, then if not, hooks the battery to our WMI methods
> + * if they are supported.
> */
> static void lwmi_om_psy_ext_init(struct lwmi_om_priv *priv)
> {
> - static const char * const ideapad_hid = "VPC2004";
> - acpi_handle handle = NULL;
> unsigned int props = 0;
> - int ret;
>
> if (lwmi_psy_prop_is_supported(priv, POWER_SUPPLY_PROP_CHARGE_BEHAVIOUR))
> props |= LWMI_PSY_PROP_BEHAVIOUR;
> @@ -928,14 +978,20 @@ static void lwmi_om_psy_ext_init(struct lwmi_om_priv *priv)
> if (force_load_psy_ext)
> goto load_psy_ext;
>
> - /* Deconflict ideapad_laptop driver */
> - ret = acpi_get_devices(ideapad_hid, lwmi_acpi_match, &handle, NULL);
> - if (ret)
> - return;
> + for (unsigned int i = 0; i < ARRAY_SIZE(lwmi_psy_deconflict_list); i++) {
> + const struct lwmi_psy_deconflict *entry = &lwmi_psy_deconflict_list[i];
>
> - if (handle && acpi_has_method(handle, "GBMD") && acpi_has_method(handle, "SBMC")) {
> - dev_dbg(&priv->wdev->dev, "ideapad_laptop driver manages battery for device\n");
> - return;
> + for (unsigned int j = 0; entry->hids[j]; j++) {
> + const char *hid = entry->hids[j];
> +
> + if (!lwmi_acpi_device_has_methods(hid, entry->methods))
> + continue;
Flip the branch to drop the `continue'.
Thanks,
Rong
> +
> + dev_dbg(&priv->wdev->dev,
> + "ACPI device %s manages battery for device\n",
> + hid);
> + return;
> + }
> }
>
> load_psy_ext: