From 419b41864fff010338d7b2408cfa9bf00abd13ca Mon Sep 17 00:00:00 2001 From: "Derek J. Clark" Date: Tue, 24 Feb 2026 04:56:14 +0000 Subject: [PATCH 01/11] Revert "[FROM-ML] platform/x86: lenovo-wmi-other: Add WMI battery charge limiting." This reverts commit 6e887985b8a95342fd3a63a9bf8a3d515df5873b. --- drivers/platform/x86/lenovo/wmi-capdata.h | 1 - drivers/platform/x86/lenovo/wmi-other.c | 238 +--------------------- 2 files changed, 6 insertions(+), 233 deletions(-) diff --git a/drivers/platform/x86/lenovo/wmi-capdata.h b/drivers/platform/x86/lenovo/wmi-capdata.h index 00471551e7d60..b7f9ee7b301a5 100644 --- a/drivers/platform/x86/lenovo/wmi-capdata.h +++ b/drivers/platform/x86/lenovo/wmi-capdata.h @@ -26,7 +26,6 @@ enum lwmi_device_id { LWMI_DEVICE_ID_CPU = 0x01, LWMI_DEVICE_ID_GPU = 0x02, - LWMI_DEVICE_ID_PSU = 0x03, LWMI_DEVICE_ID_FAN = 0x04, }; diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86/lenovo/wmi-other.c index dc128fa9f99cd..07a654b6c6742 100644 --- a/drivers/platform/x86/lenovo/wmi-other.c +++ b/drivers/platform/x86/lenovo/wmi-other.c @@ -26,7 +26,6 @@ * - binding to Capability Data 00 and Fan */ -#include #include #include #include @@ -43,7 +42,6 @@ #include #include #include -#include #include #include @@ -82,17 +80,10 @@ enum lwmi_feature_id_gpu { LWMI_FEATURE_ID_GPU_NV_CPU_BOOST = 0x0b, }; -enum lwmi_feature_id_psu { - LWMI_FEATURE_ID_PSU_INSTANT_MODE = 0x01, - LWMI_FEATURE_ID_PSU_CHARGE_MODE = 0x02, -}; - #define LWMI_FEATURE_ID_FAN_RPM 0x03 #define LWMI_TYPE_ID_NONE 0x00 #define LWMI_TYPE_ID_CROSSLOAD 0x01 -#define LWMI_TYPE_ID_PSU_AC 0x01 -#define LWMI_TYPE_ID_PSU_PD 0x02 #define LWMI_FEATURE_VALUE_GET 17 #define LWMI_FEATURE_VALUE_SET 18 @@ -100,20 +91,15 @@ enum lwmi_feature_id_psu { #define LWMI_FAN_ID_BASE 1 #define LWMI_FAN_NR 4 #define LWMI_FAN_ID(x) ((x) + LWMI_FAN_ID_BASE) -#define LWMI_FAN_DIV 100 - -#define LWMI_CHARGE_MODE_ENABLED 0x00 -#define LWMI_CHARGE_MODE_DISABLED 0x01 #define LWMI_ATTR_ID_FAN_RPM(x) \ LWMI_ATTR_ID(LWMI_DEVICE_ID_FAN, LWMI_FEATURE_ID_FAN_RPM, \ LWMI_GZ_THERMAL_MODE_NONE, LWMI_FAN_ID(x)) -#define LWMI_ATTR_ID_PSU(feat, type) \ - LWMI_ATTR_ID(LWMI_DEVICE_ID_PSU, feat, \ - LWMI_GZ_THERMAL_MODE_NONE, type) +#define LWMI_FAN_DIV 100 -#define LWMI_OM_NAME "lenovo-wmi-other" +#define LWMI_OM_FW_ATTR_BASE_PATH "lenovo-wmi-other" +#define LWMI_OM_HWMON_NAME "lenovo_wmi_other" static BLOCKING_NOTIFIER_HEAD(om_chain_head); static DEFINE_IDA(lwmi_om_ida); @@ -153,8 +139,6 @@ struct lwmi_om_priv { bool capdata00_collected : 1; bool capdata_fan_collected : 1; } fan_flags; - - struct acpi_battery_hook battery_hook; }; /* @@ -470,7 +454,7 @@ static void lwmi_om_hwmon_add(struct lwmi_om_priv *priv) } priv->hwmon_dev = hwmon_device_register_with_info(&priv->wdev->dev, - LWMI_OM_NAME, priv, + LWMI_OM_HWMON_NAME, priv, &lwmi_om_hwmon_chip_info, NULL); if (IS_ERR(priv->hwmon_dev)) { @@ -579,216 +563,6 @@ static void lwmi_om_fan_info_collect_cd_fan(struct device *dev, struct cd_list * lwmi_om_hwmon_add(priv); } -/* ======== Power Supply Extension (component: lenovo-wmi-capdata 00) ======== */ - -/** - * lwmi_psy_prop_is_writeable() - Get a power_supply_ext property - * @ps: The battery that was extended - * @ext: The extension - * @ext_data: Pointer the lwmi_om_priv drvdata - * @prop: The property to read - * @val: The value to return - * - * Writes the given value to the power_supply_ext property - * - * Return: 0 on success, or an error - */ -static int lwmi_psy_ext_get_prop(struct power_supply *ps, - const struct power_supply_ext *ext, - void *data, - enum power_supply_property prop, - union power_supply_propval *val) -{ - struct lwmi_om_priv *priv = data; - struct wmi_method_args_32 args; - u32 retval; - int ret; - - args.arg0 = LWMI_ATTR_ID_PSU(LWMI_FEATURE_ID_PSU_INSTANT_MODE, LWMI_TYPE_ID_PSU_AC); - - ret = lwmi_dev_evaluate_int(priv->wdev, 0x0, LWMI_FEATURE_VALUE_GET, - (unsigned char *)&args, sizeof(args), - &retval); - if (ret) - return ret; - - dev_dbg(&priv->wdev->dev, "Got return value %x for property %x\n", retval, prop); - - if (retval == LWMI_CHARGE_MODE_DISABLED) - val->intval = POWER_SUPPLY_CHARGE_TYPE_LONGLIFE; - else - val->intval = POWER_SUPPLY_CHARGE_TYPE_STANDARD; - - return 0; -} - -/** - * lwmi_psy_prop_is_writeable() - Set a power_supply_ext property - * @ps: The battery that was extended - * @ext: The extension - * @ext_data: Pointer the lwmi_om_priv drvdata - * @prop: The property to write - * @val: The value to write - * - * Writes the given value to the power_supply_ext property - * - * Return: 0 on success, or an error - */ -static int lwmi_psy_ext_set_prop(struct power_supply *ps, - const struct power_supply_ext *ext, - void *ext_data, - enum power_supply_property prop, - const union power_supply_propval *val) -{ - struct lwmi_om_priv *priv = ext_data; - struct wmi_method_args_32 args; - - args.arg0 = LWMI_ATTR_ID_PSU(LWMI_FEATURE_ID_PSU_INSTANT_MODE, LWMI_TYPE_ID_PSU_AC); - if (val->intval == POWER_SUPPLY_CHARGE_TYPE_LONGLIFE) - args.arg1 = LWMI_CHARGE_MODE_DISABLED; - else - args.arg1 = LWMI_CHARGE_MODE_ENABLED; - - dev_dbg(&priv->wdev->dev, "Attempting to set %#08x for property %x to %x\n", - args.arg0, prop, args.arg1); - - return lwmi_dev_evaluate_int(priv->wdev, 0x0, LWMI_FEATURE_VALUE_SET, - (unsigned char *)&args, sizeof(args), NULL); -} - -/** - * lwmi_psy_prop_is_writeable() - Determine if the property is supported - * @ps: The battery that was extended - * @ext: The extension - * @ext_data: Pointer the lwmi_om_priv drvdata - * @prop: The property to check - * - * Checks capdata 00 to determine if the property is supported. - * - * Return: Support level, or false - */ -static int lwmi_psy_prop_is_writeable(struct power_supply *ps, - const struct power_supply_ext *ext, - void *ext_data, - enum power_supply_property prop) -{ - struct lwmi_om_priv *priv = ext_data; - struct capdata00 capdata; - u32 attribute_id = LWMI_ATTR_ID_PSU(LWMI_FEATURE_ID_PSU_INSTANT_MODE, LWMI_TYPE_ID_PSU_AC); - int ret; - - ret = lwmi_cd00_get_data(priv->cd00_list, attribute_id, &capdata); - if (ret) - return false; - - dev_dbg(&priv->wdev->dev, "Battery charge mode (%#08x) support level: %x\n", - attribute_id, capdata.supported); - - return capdata.supported; -} - -static const enum power_supply_property lwmi_psy_ext_props[] = { - POWER_SUPPLY_PROP_CHARGE_TYPES, -}; - -static const struct power_supply_ext lwmi_psy_ext = { - .name = LWMI_OM_NAME, - .properties = lwmi_psy_ext_props, - .num_properties = ARRAY_SIZE(lwmi_psy_ext_props), - .charge_types = (BIT(POWER_SUPPLY_CHARGE_TYPE_STANDARD) | - BIT(POWER_SUPPLY_CHARGE_TYPE_LONGLIFE)), - .get_property = lwmi_psy_ext_get_prop, - .set_property = lwmi_psy_ext_set_prop, - .property_is_writeable = lwmi_psy_prop_is_writeable, -}; - -/** - * lwmi_add_battery() - Connect the power_supply_ext - * @battery: The battery to extend - * @hook: The driver hook used to extend the battery - * - * Return: 0 on success, or an error. - */ -static int lwmi_add_battery(struct power_supply *battery, struct acpi_battery_hook *hook) -{ - struct lwmi_om_priv *priv = container_of(hook, struct lwmi_om_priv, battery_hook); - - return power_supply_register_extension(battery, &lwmi_psy_ext, &priv->wdev->dev, priv); -} - -/** - * lwmi_remove_battery() - Disconnect the power_supply_ext - * @battery: The battery that was extended - * @hook: The driver hook used to extend the battery - * - * Return: 0 on success, or an error. - */ -static int lwmi_remove_battery(struct power_supply *battery, struct acpi_battery_hook *hook) -{ - power_supply_unregister_extension(battery, &lwmi_psy_ext); - return 0; -} - -/** - * lwmi_acpi_match() - Attempts to return the ideapad acpi handle - * @acpi_handle: The ACPI handle that manages battery charging - * @lvl: Unused - * @context: Void pointer to the acpi_handle object to return - * @retval: Unused - * - * Checks if the ideapad_laptop driver is going to manage charge_type first, - * thenm if not, hooks the battery to our WMI methods. - * - * Return: AE_CTRL_TERMINATE if found, AE_OK if not found. - */ -static acpi_status lwmi_acpi_match(acpi_handle handle, u32 lvl, - void *context, void **retval) -{ - if (!handle) - return AE_OK; - - acpi_handle *ahand = context; - *ahand = handle; - - return AE_CTRL_TERMINATE; -} - -/** - * lwmi_om_ps_ext_init() - Hooks power supply extension to device battery - * @priv: Driver private data - * - * Checks if the ideapad_laptop driver is going to manage charge_type first, - * thenm if not, hooks the battery to our WMI methods. - */ -static void lwmi_om_ps_ext_init(struct lwmi_om_priv *priv) -{ - static const char * const ideapad_hid = "VPC2004"; - acpi_handle handle = NULL; - int ret; - - /* Deconflict ideapad_laptop driver */ - ret = acpi_get_devices(ideapad_hid, lwmi_acpi_match, &handle, NULL); - if (ret) - return; - - if (!handle) - return; - - if (acpi_has_method(handle, "GBMD") && acpi_has_method(handle, "SBMC")) { - dev_dbg(&priv->wdev->dev, "ideapad_laptop driver manages battery for device.\n"); - return; - } - - /* Add battery hooks */ - priv->battery_hook.add_battery = lwmi_add_battery, - priv->battery_hook.remove_battery = lwmi_remove_battery, - priv->battery_hook.name = "Lenovo WMI Other Battery Extension", - - ret = devm_battery_hook_register(&priv->wdev->dev, &priv->battery_hook); - if (ret) - dev_err(&priv->wdev->dev, "Error during battery hook: %i\n", ret); -} - /* ======== fw_attributes (component: lenovo-wmi-capdata 01) ======== */ struct tunable_attr_01 { @@ -1478,7 +1252,8 @@ static int lwmi_om_fw_attr_add(struct lwmi_om_priv *priv) priv->fw_attr_dev = device_create(&firmware_attributes_class, NULL, MKDEV(0, 0), NULL, "%s-%u", - LWMI_OM_NAME, priv->ida_id); + LWMI_OM_FW_ATTR_BASE_PATH, + priv->ida_id); if (IS_ERR(priv->fw_attr_dev)) { err = PTR_ERR(priv->fw_attr_dev); goto err_free_ida; @@ -1570,7 +1345,6 @@ static int lwmi_om_master_bind(struct device *dev) return -ENODEV; lwmi_om_fan_info_collect_cd00(priv); - lwmi_om_ps_ext_init(priv); return lwmi_om_fw_attr_add(priv); } From 04ba390cca7150426fd028316301b9b4c2a90541 Mon Sep 17 00:00:00 2001 From: "Derek J. Clark" Date: Tue, 24 Feb 2026 04:57:15 +0000 Subject: [PATCH 02/11] Revert "[FROM-ML] platform/x86: lenovo-wmi-other: Add GPU tunable attributes" This reverts commit 3e7822c08c431ae36ea99a1c2a79468fa8a0f0ad. --- .../wmi/devices/lenovo-wmi-other.rst | 11 -- drivers/platform/x86/lenovo/wmi-capdata.h | 1 - drivers/platform/x86/lenovo/wmi-other.c | 114 ------------------ 3 files changed, 126 deletions(-) diff --git a/Documentation/wmi/devices/lenovo-wmi-other.rst b/Documentation/wmi/devices/lenovo-wmi-other.rst index f7564b23bb7f0..f4763ed66cc6d 100644 --- a/Documentation/wmi/devices/lenovo-wmi-other.rst +++ b/Documentation/wmi/devices/lenovo-wmi-other.rst @@ -70,17 +70,6 @@ Each attribute has the following properties: The following firmware-attributes are implemented: - cpu_oc_stat: CPU Overlocking Status - cpu_temp: CPU Thermal Load Limit - - dgpu_boost_clk: Dedicated GPU Boost Clock - - dgpu_enable: Dedicated GPU Enabled Status - - gpu_didvid: GPU Device Identifier and Vendor Identifier - - gpu_mode: GPU Mode by Power Limit - - gpu_nv_ac_offset: Nvidia GPU AC Total Processing Power Baseline Offset - - gpu_nv_bpl: Nvidia GPU Base Power Limit - - gpu_nv_cpu_boost: Nvidia GPU to CPU Dynamic Boost Limit - - gpu_nv_ctgp: Nvidia GPU Configurable Total Graphics Power - - gpu_nv_ppab: Nvidia GPU Power Performance Aware Boost Limit - - gpu_oc_stat: GPU Overclocking Status - - gpu_temp: GPU Thermal Load Limit - ppt_cpu_cl: CPU Cross Loading Power Limit - ppt_pl1_apu_spl: Platform Profile Tracking APU Sustained Power Limit - ppt_pl1_spl: Platform Profile Tracking Sustained Power Limit diff --git a/drivers/platform/x86/lenovo/wmi-capdata.h b/drivers/platform/x86/lenovo/wmi-capdata.h index b7f9ee7b301a5..aa48f43cbb43b 100644 --- a/drivers/platform/x86/lenovo/wmi-capdata.h +++ b/drivers/platform/x86/lenovo/wmi-capdata.h @@ -25,7 +25,6 @@ enum lwmi_device_id { LWMI_DEVICE_ID_CPU = 0x01, - LWMI_DEVICE_ID_GPU = 0x02, LWMI_DEVICE_ID_FAN = 0x04, }; diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86/lenovo/wmi-other.c index 07a654b6c6742..8d473bc5354ff 100644 --- a/drivers/platform/x86/lenovo/wmi-other.c +++ b/drivers/platform/x86/lenovo/wmi-other.c @@ -66,20 +66,6 @@ enum lwmi_feature_id_cpu { LWMI_FEATURE_ID_CPU_IPL = 0x09, }; -enum lwmi_feature_id_gpu { - LWMI_FEATURE_ID_GPU_NV_PPAB = 0x01, - LWMI_FEATURE_ID_GPU_NV_CTGP = 0x02, - LWMI_FEATURE_ID_GPU_TEMP = 0x03, - LWMI_FEATURE_ID_GPU_AC_OFFSET = 0x04, - LWMI_FEATURE_ID_GPU_OC = 0x05, - LWMI_FEATURE_ID_DGPU_BOOST_CLK = 0x06, - LWMI_FEATURE_ID_DGPU_EN = 0x07, - LWMI_FEATURE_ID_GPU_MODE = 0x08, - LWMI_FEATURE_ID_DGPU_DIDVID = 0x09, - LWMI_FEATURE_ID_GPU_NV_BPL = 0x0a, - LWMI_FEATURE_ID_GPU_NV_CPU_BOOST = 0x0b, -}; - #define LWMI_FEATURE_ID_FAN_RPM 0x03 #define LWMI_TYPE_ID_NONE 0x00 @@ -652,72 +638,6 @@ static struct tunable_attr_01 ppt_pl4_ipl_cl = { .type_id = LWMI_TYPE_ID_CROSSLOAD, }; -static struct tunable_attr_01 gpu_nv_ppab = { - .device_id = LWMI_DEVICE_ID_GPU, - .feature_id = LWMI_FEATURE_ID_GPU_NV_PPAB, - .type_id = LWMI_TYPE_ID_NONE, -}; - -static struct tunable_attr_01 gpu_nv_ctgp = { - .device_id = LWMI_DEVICE_ID_GPU, - .feature_id = LWMI_FEATURE_ID_GPU_NV_CTGP, - .type_id = LWMI_TYPE_ID_NONE, -}; - -static struct tunable_attr_01 gpu_temp = { - .device_id = LWMI_DEVICE_ID_GPU, - .feature_id = LWMI_FEATURE_ID_GPU_TEMP, - .type_id = LWMI_TYPE_ID_NONE, -}; - -static struct tunable_attr_01 gpu_nv_ac_offset = { - .device_id = LWMI_DEVICE_ID_GPU, - .feature_id = LWMI_FEATURE_ID_GPU_AC_OFFSET, - .type_id = LWMI_TYPE_ID_NONE, -}; - -static struct tunable_attr_01 gpu_oc_stat = { - .device_id = LWMI_DEVICE_ID_GPU, - .feature_id = LWMI_FEATURE_ID_GPU_OC, - .type_id = LWMI_TYPE_ID_NONE, -}; - -static struct tunable_attr_01 dgpu_boost_clk = { - .device_id = LWMI_DEVICE_ID_GPU, - .feature_id = LWMI_FEATURE_ID_DGPU_BOOST_CLK, - .type_id = LWMI_TYPE_ID_NONE, -}; - -static struct tunable_attr_01 dgpu_enable = { - .device_id = LWMI_DEVICE_ID_GPU, - .feature_id = LWMI_FEATURE_ID_DGPU_EN, - .type_id = LWMI_TYPE_ID_NONE, -}; - -static struct tunable_attr_01 gpu_mode = { - .device_id = LWMI_DEVICE_ID_GPU, - .feature_id = LWMI_FEATURE_ID_GPU_MODE, - .type_id = LWMI_TYPE_ID_NONE, -}; - -static struct tunable_attr_01 dgpu_didvid = { - .device_id = LWMI_DEVICE_ID_GPU, - .feature_id = LWMI_FEATURE_ID_DGPU_DIDVID, - .type_id = LWMI_TYPE_ID_NONE, -}; - -static struct tunable_attr_01 gpu_nv_bpl = { - .device_id = LWMI_DEVICE_ID_GPU, - .feature_id = LWMI_FEATURE_ID_GPU_NV_BPL, - .type_id = LWMI_TYPE_ID_NONE, -}; - -static struct tunable_attr_01 gpu_nv_cpu_boost = { - .device_id = LWMI_DEVICE_ID_GPU, - .feature_id = LWMI_FEATURE_ID_GPU_NV_CPU_BOOST, - .type_id = LWMI_TYPE_ID_NONE, -}; - struct capdata01_attr_group { const struct attribute_group *attr_group; struct tunable_attr_01 *tunable_attr; @@ -1156,7 +1076,6 @@ static int lwmi_attr_01_is_supported(struct tunable_attr_01 *tunable_attr) .name = _fsname, .attrs = _attrname##_attrs \ } -/* CPU tunable attributes */ LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl1_spl, "ppt_pl1_spl", "Set the CPU sustained power limit"); LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl1_spl_cl, "ppt_pl1_spl_cl", @@ -1184,29 +1103,6 @@ LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl4_ipl, "ppt_pl4_ipl", LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl4_ipl_cl, "ppt_pl4_ipl_cl", "Set the CPU cross loading instantaneous power limit"); -/* GPU tunable attributes */ -LWMI_ATTR_GROUP_TUNABLE_CAP01(gpu_nv_ppab, "gpu_nv_ppab", - "Set the Nvidia GPU power performance aware boost limit"); -LWMI_ATTR_GROUP_TUNABLE_CAP01(gpu_nv_ctgp, "gpu_nv_ctgp", - "Set the GPU configurable total graphics power"); -LWMI_ATTR_GROUP_TUNABLE_CAP01(gpu_temp, "gpu_temp", - "Set the GPU thermal load limit"); -LWMI_ATTR_GROUP_TUNABLE_CAP01(gpu_nv_ac_offset, "gpu_nv_ac_offset", - "Set the Nvidia GPU AC total processing power baseline offset"); -LWMI_ATTR_GROUP_TUNABLE_CAP01(gpu_oc_stat, "gpu_oc_stat", - "Set the GPU overclocking status"); -LWMI_ATTR_GROUP_TUNABLE_CAP01(dgpu_boost_clk, "gpu_boost_clk", - "Set the dedicated GPU boost clock"); -LWMI_ATTR_GROUP_TUNABLE_CAP01(dgpu_enable, "dgpu_enable", - "Set the dedicated Nvidia GPU enabled status"); -LWMI_ATTR_GROUP_TUNABLE_CAP01(gpu_mode, "gpu_mode", - "Set the GPU mode by power limit"); -LWMI_ATTR_GROUP_TUNABLE_CAP01(dgpu_didvid, "gpu_didvid", - "Get the GPU device identifier and vendor identifier"); -LWMI_ATTR_GROUP_TUNABLE_CAP01(gpu_nv_bpl, "gpu_nv_bpl", - "Set the Nvidia GPU base power limit"); -LWMI_ATTR_GROUP_TUNABLE_CAP01(gpu_nv_cpu_boost, "gpu_nv_cpu_boost", - "Set the Nvidia GPU to CPU dynamic boost limit"); static struct capdata01_attr_group cd01_attr_groups[] = { { &ppt_pl1_spl_attr_group, &ppt_pl1_spl }, @@ -1222,16 +1118,6 @@ static struct capdata01_attr_group cd01_attr_groups[] = { { &cpu_oc_stat_attr_group, &cpu_oc_stat }, { &ppt_pl4_ipl_attr_group, &ppt_pl4_ipl }, { &ppt_pl4_ipl_cl_attr_group, &ppt_pl4_ipl_cl }, - { &gpu_nv_ppab_attr_group, &gpu_nv_ppab }, - { &gpu_nv_ctgp_attr_group, &gpu_nv_ctgp }, - { &gpu_temp_attr_group, &gpu_temp }, - { &gpu_nv_ac_offset_attr_group, &gpu_nv_ac_offset }, - { &gpu_oc_stat_attr_group, &gpu_oc_stat }, - { &dgpu_boost_clk_attr_group, &dgpu_boost_clk }, - { &dgpu_enable_attr_group, &dgpu_enable }, - { &dgpu_didvid_attr_group, &dgpu_didvid }, - { &gpu_nv_bpl_attr_group, &gpu_nv_bpl }, - { &gpu_nv_cpu_boost_attr_group, &gpu_nv_cpu_boost }, {}, }; From e9aa9c25aa9c51f901ea18d5fb7554f9149a5edb Mon Sep 17 00:00:00 2001 From: "Derek J. Clark" Date: Tue, 24 Feb 2026 04:57:17 +0000 Subject: [PATCH 03/11] Revert "[FROM-ML] platform/x86: lenovo-wmi-other: Add missing CPU tunable attributes" This reverts commit 1325145b3cb235fbb1d108fd30547d25318d90f0. --- .../wmi/devices/lenovo-wmi-other.rst | 10 -- drivers/platform/x86/lenovo/wmi-capdata.h | 5 +- drivers/platform/x86/lenovo/wmi-other.c | 108 +----------------- 3 files changed, 6 insertions(+), 117 deletions(-) diff --git a/Documentation/wmi/devices/lenovo-wmi-other.rst b/Documentation/wmi/devices/lenovo-wmi-other.rst index f4763ed66cc6d..01d4711567380 100644 --- a/Documentation/wmi/devices/lenovo-wmi-other.rst +++ b/Documentation/wmi/devices/lenovo-wmi-other.rst @@ -68,19 +68,9 @@ Each attribute has the following properties: - type The following firmware-attributes are implemented: - - cpu_oc_stat: CPU Overlocking Status - - cpu_temp: CPU Thermal Load Limit - - ppt_cpu_cl: CPU Cross Loading Power Limit - - ppt_pl1_apu_spl: Platform Profile Tracking APU Sustained Power Limit - ppt_pl1_spl: Platform Profile Tracking Sustained Power Limit - - ppt_pl1_spl_cl: Platform Profile Tracking Cross Loading Sustained Power Limit - - ppt_pl1_tau: Exceed Duration for Platform Profile Tracking Sustained Power Limit - ppt_pl2_sppt: Platform Profile Tracking Slow Package Power Tracking - - ppt_pl2_sppt_cl: Platform Profile Tracking Cross Loading Slow Package Tracking - ppt_pl3_fppt: Platform Profile Tracking Fast Package Power Tracking - - ppt_pl3_fppt_cl: Platform Profile Tracking Cross Loading Fast Package Power Tracking - - ppt_pl4_ipl: Platform Profile Trakcing Instantaneous Power Limit - - ppt_pl4_ipl_cl: Platform Profile Tracking Cross Loading Instantaneous Power Limit LENOVO_FAN_TEST_DATA ------------------------- diff --git a/drivers/platform/x86/lenovo/wmi-capdata.h b/drivers/platform/x86/lenovo/wmi-capdata.h index aa48f43cbb43b..27202e2dc8a59 100644 --- a/drivers/platform/x86/lenovo/wmi-capdata.h +++ b/drivers/platform/x86/lenovo/wmi-capdata.h @@ -23,10 +23,7 @@ FIELD_PREP(LWMI_ATTR_MODE_ID_MASK, mode) | \ FIELD_PREP(LWMI_ATTR_TYPE_ID_MASK, type)) -enum lwmi_device_id { - LWMI_DEVICE_ID_CPU = 0x01, - LWMI_DEVICE_ID_FAN = 0x04, -}; +#define LWMI_DEVICE_ID_FAN 0x04 struct component_match; struct device; diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86/lenovo/wmi-other.c index 8d473bc5354ff..47f9c34611321 100644 --- a/drivers/platform/x86/lenovo/wmi-other.c +++ b/drivers/platform/x86/lenovo/wmi-other.c @@ -54,22 +54,15 @@ #define LENOVO_OTHER_MODE_GUID "DC2A8805-3A8C-41BA-A6F7-092E0089CD3B" -enum lwmi_feature_id_cpu { - LWMI_FEATURE_ID_CPU_SPPT = 0x01, - LWMI_FEATURE_ID_CPU_SPL = 0x02, - LWMI_FEATURE_ID_CPU_FPPT = 0x03, - LWMI_FEATURE_ID_CPU_TEMP = 0x04, - LWMI_FEATURE_ID_CPU_APU = 0x05, - LWMI_FEATURE_ID_CPU_CL = 0x06, - LWMI_FEATURE_ID_CPU_TAU = 0x07, - LWMI_FEATURE_ID_CPU_OC = 0x08, - LWMI_FEATURE_ID_CPU_IPL = 0x09, -}; +#define LWMI_DEVICE_ID_CPU 0x01 + +#define LWMI_FEATURE_ID_CPU_SPPT 0x01 +#define LWMI_FEATURE_ID_CPU_SPL 0x02 +#define LWMI_FEATURE_ID_CPU_FPPT 0x03 #define LWMI_FEATURE_ID_FAN_RPM 0x03 #define LWMI_TYPE_ID_NONE 0x00 -#define LWMI_TYPE_ID_CROSSLOAD 0x01 #define LWMI_FEATURE_VALUE_GET 17 #define LWMI_FEATURE_VALUE_SET 18 @@ -566,78 +559,18 @@ static struct tunable_attr_01 ppt_pl1_spl = { .type_id = LWMI_TYPE_ID_NONE, }; -static struct tunable_attr_01 ppt_pl1_spl_cl = { - .device_id = LWMI_DEVICE_ID_CPU, - .feature_id = LWMI_FEATURE_ID_CPU_SPL, - .type_id = LWMI_TYPE_ID_CROSSLOAD, -}; - static struct tunable_attr_01 ppt_pl2_sppt = { .device_id = LWMI_DEVICE_ID_CPU, .feature_id = LWMI_FEATURE_ID_CPU_SPPT, .type_id = LWMI_TYPE_ID_NONE, }; -static struct tunable_attr_01 ppt_pl2_sppt_cl = { - .device_id = LWMI_DEVICE_ID_CPU, - .feature_id = LWMI_FEATURE_ID_CPU_SPPT, - .type_id = LWMI_TYPE_ID_CROSSLOAD, -}; - static struct tunable_attr_01 ppt_pl3_fppt = { .device_id = LWMI_DEVICE_ID_CPU, .feature_id = LWMI_FEATURE_ID_CPU_FPPT, .type_id = LWMI_TYPE_ID_NONE, }; -static struct tunable_attr_01 ppt_pl3_fppt_cl = { - .device_id = LWMI_DEVICE_ID_CPU, - .feature_id = LWMI_FEATURE_ID_CPU_FPPT, - .type_id = LWMI_TYPE_ID_CROSSLOAD, -}; - -static struct tunable_attr_01 cpu_temp = { - .device_id = LWMI_DEVICE_ID_CPU, - .feature_id = LWMI_FEATURE_ID_CPU_TEMP, - .type_id = LWMI_TYPE_ID_NONE, -}; - -static struct tunable_attr_01 ppt_pl1_apu_spl = { - .device_id = LWMI_DEVICE_ID_CPU, - .feature_id = LWMI_FEATURE_ID_CPU_APU, - .type_id = LWMI_TYPE_ID_NONE, -}; - -static struct tunable_attr_01 ppt_cpu_cl = { - .device_id = LWMI_DEVICE_ID_CPU, - .feature_id = LWMI_FEATURE_ID_CPU_CL, - .type_id = LWMI_TYPE_ID_NONE, -}; - -static struct tunable_attr_01 ppt_pl1_tau = { - .device_id = LWMI_DEVICE_ID_CPU, - .feature_id = LWMI_FEATURE_ID_CPU_TAU, - .type_id = LWMI_TYPE_ID_NONE, -}; - -static struct tunable_attr_01 cpu_oc_stat = { - .device_id = LWMI_DEVICE_ID_CPU, - .feature_id = LWMI_FEATURE_ID_CPU_OC, - .type_id = LWMI_TYPE_ID_NONE, -}; - -static struct tunable_attr_01 ppt_pl4_ipl = { - .device_id = LWMI_DEVICE_ID_CPU, - .feature_id = LWMI_FEATURE_ID_CPU_IPL, - .type_id = LWMI_TYPE_ID_NONE, -}; - -static struct tunable_attr_01 ppt_pl4_ipl_cl = { - .device_id = LWMI_DEVICE_ID_CPU, - .feature_id = LWMI_FEATURE_ID_CPU_IPL, - .type_id = LWMI_TYPE_ID_CROSSLOAD, -}; - struct capdata01_attr_group { const struct attribute_group *attr_group; struct tunable_attr_01 *tunable_attr; @@ -1078,46 +1011,15 @@ static int lwmi_attr_01_is_supported(struct tunable_attr_01 *tunable_attr) LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl1_spl, "ppt_pl1_spl", "Set the CPU sustained power limit"); -LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl1_spl_cl, "ppt_pl1_spl_cl", - "Set the CPU cross loading sustained power limit"); LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl2_sppt, "ppt_pl2_sppt", "Set the CPU slow package power tracking limit"); -LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl2_sppt_cl, "ppt_pl2_sppt_cl", - "Set the CPU cross loading slow package power tracking limit"); LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl3_fppt, "ppt_pl3_fppt", "Set the CPU fast package power tracking limit"); -LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl3_fppt_cl, "ppt_pl3_fppt_cl", - "Set the CPU cross loading fast package power tracking limit"); -LWMI_ATTR_GROUP_TUNABLE_CAP01(cpu_temp, "cpu_temp", - "Set the CPU thermal load limit"); -LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl1_apu_spl, "ppt_pl1_apu_spl", - "Set the APU sustained power limit"); -LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_cpu_cl, "ppt_cpu_cl", - "Set the CPU cross loading power limit"); -LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl1_tau, "ppt_pl1_tau", - "Set the CPU sustained power limit exceed duration"); -LWMI_ATTR_GROUP_TUNABLE_CAP01(cpu_oc_stat, "cpu_oc_stat", - "Set the CPU overclocking status"); -LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl4_ipl, "ppt_pl4_ipl", - "Set the CPU instantaneous power limit"); -LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl4_ipl_cl, "ppt_pl4_ipl_cl", - "Set the CPU cross loading instantaneous power limit"); - static struct capdata01_attr_group cd01_attr_groups[] = { { &ppt_pl1_spl_attr_group, &ppt_pl1_spl }, - { &ppt_pl1_spl_cl_attr_group, &ppt_pl1_spl_cl }, { &ppt_pl2_sppt_attr_group, &ppt_pl2_sppt }, - { &ppt_pl2_sppt_cl_attr_group, &ppt_pl2_sppt_cl }, { &ppt_pl3_fppt_attr_group, &ppt_pl3_fppt }, - { &ppt_pl3_fppt_cl_attr_group, &ppt_pl3_fppt_cl }, - { &cpu_temp_attr_group, &cpu_temp }, - { &ppt_pl1_apu_spl_attr_group, &ppt_pl1_apu_spl }, - { &ppt_cpu_cl_attr_group, &ppt_cpu_cl }, - { &ppt_pl1_tau_attr_group, &ppt_pl1_tau }, - { &cpu_oc_stat_attr_group, &cpu_oc_stat }, - { &ppt_pl4_ipl_attr_group, &ppt_pl4_ipl }, - { &ppt_pl4_ipl_cl_attr_group, &ppt_pl4_ipl_cl }, {}, }; From a19d9b213821079540438e248bf708d7459df31e Mon Sep 17 00:00:00 2001 From: "Derek J. Clark" Date: Tue, 24 Feb 2026 04:57:18 +0000 Subject: [PATCH 04/11] Revert "[FROM-ML] platform/x86: lenovo-wmi-other: Limit adding attributes to supported devices" This reverts commit dcdf945f8ee1fa21c5b3cc8c3bee7e59eb90cfb7. --- drivers/platform/x86/lenovo/wmi-other.c | 123 ++++-------------------- 1 file changed, 19 insertions(+), 104 deletions(-) diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86/lenovo/wmi-other.c index 47f9c34611321..c2112f8dbd58a 100644 --- a/drivers/platform/x86/lenovo/wmi-other.c +++ b/drivers/platform/x86/lenovo/wmi-other.c @@ -545,12 +545,11 @@ static void lwmi_om_fan_info_collect_cd_fan(struct device *dev, struct cd_list * /* ======== fw_attributes (component: lenovo-wmi-capdata 01) ======== */ struct tunable_attr_01 { + struct capdata01 *capdata; struct device *dev; - u8 feature_id; - u8 device_id; - u8 type_id; - u8 cd_mode_id; /* mode arg for searching capdata */ - u8 cv_mode_id; /* mode arg for set/get current_value */ + u32 feature_id; + u32 device_id; + u32 type_id; }; static struct tunable_attr_01 ppt_pl1_spl = { @@ -717,7 +716,7 @@ static ssize_t attr_capdata01_show(struct kobject *kobj, int value, ret; attribute_id = LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature_id, - tunable_attr->cd_mode_id, tunable_attr->type_id); + LWMI_GZ_THERMAL_MODE_CUSTOM, tunable_attr->type_id); ret = lwmi_cd01_get_data(priv->cd01_list, attribute_id, &capdata); if (ret) @@ -772,6 +771,7 @@ static ssize_t attr_current_value_store(struct kobject *kobj, struct wmi_method_args_32 args; struct capdata01 capdata; enum thermal_mode mode; + u32 attribute_id; u32 value; int ret; @@ -782,10 +782,10 @@ static ssize_t attr_current_value_store(struct kobject *kobj, if (mode != LWMI_GZ_THERMAL_MODE_CUSTOM) return -EBUSY; - args.arg0 = LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature_id, - tunable_attr->cd_mode_id, tunable_attr->type_id); + attribute_id = LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature_id, + mode, tunable_attr->type_id); - ret = lwmi_cd01_get_data(priv->cd01_list, args.arg0, &capdata); + ret = lwmi_cd01_get_data(priv->cd01_list, attribute_id, &capdata); if (ret) return ret; @@ -796,8 +796,7 @@ static ssize_t attr_current_value_store(struct kobject *kobj, if (value < capdata.min_value || value > capdata.max_value) return -EINVAL; - args.arg0 = LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature_id, - tunable_attr->cv_mode_id, tunable_attr->type_id); + args.arg0 = attribute_id; args.arg1 = value; ret = lwmi_dev_evaluate_int(priv->wdev, 0x0, LWMI_FEATURE_VALUE_SET, @@ -831,16 +830,13 @@ static ssize_t attr_current_value_show(struct kobject *kobj, struct lwmi_om_priv *priv = dev_get_drvdata(tunable_attr->dev); struct wmi_method_args_32 args; enum thermal_mode mode; - int retval, ret; + int retval; + int ret; ret = lwmi_om_notifier_call(&mode); if (ret) return ret; - /* If "no-mode" is the supported mode, ensure we never send current mode */ - if (tunable_attr->cv_mode_id == LWMI_GZ_THERMAL_MODE_NONE) - mode = tunable_attr->cv_mode_id; - args.arg0 = LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature_id, mode, tunable_attr->type_id); @@ -853,85 +849,6 @@ static ssize_t attr_current_value_show(struct kobject *kobj, return sysfs_emit(buf, "%d\n", retval); } -/** - * lwmi_attr_01_is_supported() - Determine if the given attribute is supported. - * @tunable_attr: The attribute to verify. - * - * First check if the attribute has a corresponding capdata01 table in the cd01 - * module under the "custom" mode (0xff). If that is not present then check if - * there is a corresponding "no-mode" (0x00) entry. If either of those passes, - * check capdata->supported for values > 0. If capdata is available, attempt to - * determine the set/get mode for the current value property using a similar - * pattern. If the value returned by either custom or no-mode is 0, or we get - * an error, we assume that mode is not supported. If any of the above checks - * fail then the attribute is not fully supported. - * - * The probed cd_mode_id/cv_mode_id are stored on the tunable_attr for later - * reference. - * - * Return: Support level, or an error code. - */ -static int lwmi_attr_01_is_supported(struct tunable_attr_01 *tunable_attr) -{ - struct lwmi_om_priv *priv = dev_get_drvdata(tunable_attr->dev); - u8 mode = LWMI_GZ_THERMAL_MODE_CUSTOM; - struct wmi_method_args_32 args; - struct capdata01 capdata; - int retval, ret; - - /* Determine tunable_attr->cd_mode_id */ -no_mode_fallback_1: - args.arg0 = LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature_id, - mode, tunable_attr->type_id); - - ret = lwmi_cd01_get_data(priv->cd01_list, args.arg0, &capdata); - if (ret && mode) { - dev_dbg(tunable_attr->dev, "Attribute id %x not supported\n", args.arg0); - mode = LWMI_GZ_THERMAL_MODE_NONE; - goto no_mode_fallback_1; - } - if (ret) - goto not_supported; - if (!capdata.supported) { - ret = -EOPNOTSUPP; - goto not_supported; - } - - tunable_attr->cd_mode_id = mode; - - /* Determine tunable_attr->cv_mode_id */ - mode = LWMI_GZ_THERMAL_MODE_CUSTOM; -no_mode_fallback_2: - args.arg0 = LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature_id, - mode, tunable_attr->type_id); - - ret = lwmi_dev_evaluate_int(priv->wdev, 0x0, LWMI_FEATURE_VALUE_GET, - (unsigned char *)&args, sizeof(args), - &retval); - if ((ret && mode) || (!retval && mode)) { - dev_dbg(tunable_attr->dev, "Attribute id %x not supported\n", args.arg0); - mode = LWMI_GZ_THERMAL_MODE_NONE; - goto no_mode_fallback_2; - } - if (ret) - goto not_supported; - if (retval == 0) { - ret = -EOPNOTSUPP; - goto not_supported; - } - - tunable_attr->cv_mode_id = mode; - dev_dbg(tunable_attr->dev, "cd_mode_id: %02x%02x%02x%02x, cv_mode_id: %#08x attribute support level: %x\n", - tunable_attr->device_id, tunable_attr->feature_id, tunable_attr->cd_mode_id, - tunable_attr->type_id, args.arg0, capdata.supported); - - return capdata.supported; - -not_supported: - dev_dbg(tunable_attr->dev, "Attribute id %x not supported\n", args.arg0); - return ret; -} - /* Lenovo WMI Other Mode Attribute macros */ #define __LWMI_ATTR_RO(_func, _name) \ { \ @@ -1055,21 +972,19 @@ static int lwmi_om_fw_attr_add(struct lwmi_om_priv *priv) } for (i = 0; i < ARRAY_SIZE(cd01_attr_groups) - 1; i++) { + err = sysfs_create_group(&priv->fw_attr_kset->kobj, + cd01_attr_groups[i].attr_group); + if (err) + goto err_remove_groups; + cd01_attr_groups[i].tunable_attr->dev = &priv->wdev->dev; - if (lwmi_attr_01_is_supported(cd01_attr_groups[i].tunable_attr) > 0) { - err = sysfs_create_group(&priv->fw_attr_kset->kobj, - cd01_attr_groups[i].attr_group); - if (err) - goto err_remove_groups; - } } return 0; err_remove_groups: while (i--) - if (lwmi_attr_01_is_supported(cd01_attr_groups[i].tunable_attr) > 0) - sysfs_remove_group(&priv->fw_attr_kset->kobj, - cd01_attr_groups[i].attr_group); + sysfs_remove_group(&priv->fw_attr_kset->kobj, + cd01_attr_groups[i].attr_group); kset_unregister(priv->fw_attr_kset); From 83bfd1574ff8308f821db09adeca4366f7a9a7f6 Mon Sep 17 00:00:00 2001 From: "Derek J. Clark" Date: Tue, 24 Feb 2026 04:57:19 +0000 Subject: [PATCH 05/11] Revert "[FROM-ML] platform/x86: lenovo-wmi-other: Add LWMI_ATTR_ID Macro" This reverts commit e541a9c0701fce341acfdf78be46de19dfbc2740. --- drivers/platform/x86/lenovo/wmi-capdata.h | 6 ---- drivers/platform/x86/lenovo/wmi-gamezone.h | 1 - drivers/platform/x86/lenovo/wmi-other.c | 32 ++++++++++++++++------ 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/drivers/platform/x86/lenovo/wmi-capdata.h b/drivers/platform/x86/lenovo/wmi-capdata.h index 27202e2dc8a59..8c1df3efcc553 100644 --- a/drivers/platform/x86/lenovo/wmi-capdata.h +++ b/drivers/platform/x86/lenovo/wmi-capdata.h @@ -17,12 +17,6 @@ #define LWMI_ATTR_MODE_ID_MASK GENMASK(15, 8) #define LWMI_ATTR_TYPE_ID_MASK GENMASK(7, 0) -#define LWMI_ATTR_ID(dev, feat, mode, type) \ - (FIELD_PREP(LWMI_ATTR_DEV_ID_MASK, dev) | \ - FIELD_PREP(LWMI_ATTR_FEAT_ID_MASK, feat) | \ - FIELD_PREP(LWMI_ATTR_MODE_ID_MASK, mode) | \ - FIELD_PREP(LWMI_ATTR_TYPE_ID_MASK, type)) - #define LWMI_DEVICE_ID_FAN 0x04 struct component_match; diff --git a/drivers/platform/x86/lenovo/wmi-gamezone.h b/drivers/platform/x86/lenovo/wmi-gamezone.h index ddb919cf6c36d..6b163a5eeb959 100644 --- a/drivers/platform/x86/lenovo/wmi-gamezone.h +++ b/drivers/platform/x86/lenovo/wmi-gamezone.h @@ -10,7 +10,6 @@ enum gamezone_events_type { }; enum thermal_mode { - LWMI_GZ_THERMAL_MODE_NONE = 0x00, LWMI_GZ_THERMAL_MODE_QUIET = 0x01, LWMI_GZ_THERMAL_MODE_BALANCED = 0x02, LWMI_GZ_THERMAL_MODE_PERFORMANCE = 0x03, diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86/lenovo/wmi-other.c index c2112f8dbd58a..2ab505e92b9ee 100644 --- a/drivers/platform/x86/lenovo/wmi-other.c +++ b/drivers/platform/x86/lenovo/wmi-other.c @@ -71,9 +71,10 @@ #define LWMI_FAN_NR 4 #define LWMI_FAN_ID(x) ((x) + LWMI_FAN_ID_BASE) -#define LWMI_ATTR_ID_FAN_RPM(x) \ - LWMI_ATTR_ID(LWMI_DEVICE_ID_FAN, LWMI_FEATURE_ID_FAN_RPM, \ - LWMI_GZ_THERMAL_MODE_NONE, LWMI_FAN_ID(x)) +#define LWMI_ATTR_ID_FAN_RPM(x) \ + (FIELD_PREP(LWMI_ATTR_DEV_ID_MASK, LWMI_DEVICE_ID_FAN) | \ + FIELD_PREP(LWMI_ATTR_FEAT_ID_MASK, LWMI_FEATURE_ID_FAN_RPM) | \ + FIELD_PREP(LWMI_ATTR_TYPE_ID_MASK, LWMI_FAN_ID(x))) #define LWMI_FAN_DIV 100 @@ -715,8 +716,12 @@ static ssize_t attr_capdata01_show(struct kobject *kobj, u32 attribute_id; int value, ret; - attribute_id = LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature_id, - LWMI_GZ_THERMAL_MODE_CUSTOM, tunable_attr->type_id); + attribute_id = + FIELD_PREP(LWMI_ATTR_DEV_ID_MASK, tunable_attr->device_id) | + FIELD_PREP(LWMI_ATTR_FEAT_ID_MASK, tunable_attr->feature_id) | + FIELD_PREP(LWMI_ATTR_MODE_ID_MASK, + LWMI_GZ_THERMAL_MODE_CUSTOM) | + FIELD_PREP(LWMI_ATTR_TYPE_ID_MASK, tunable_attr->type_id); ret = lwmi_cd01_get_data(priv->cd01_list, attribute_id, &capdata); if (ret) @@ -782,8 +787,11 @@ static ssize_t attr_current_value_store(struct kobject *kobj, if (mode != LWMI_GZ_THERMAL_MODE_CUSTOM) return -EBUSY; - attribute_id = LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature_id, - mode, tunable_attr->type_id); + attribute_id = + FIELD_PREP(LWMI_ATTR_DEV_ID_MASK, tunable_attr->device_id) | + FIELD_PREP(LWMI_ATTR_FEAT_ID_MASK, tunable_attr->feature_id) | + FIELD_PREP(LWMI_ATTR_MODE_ID_MASK, mode) | + FIELD_PREP(LWMI_ATTR_TYPE_ID_MASK, tunable_attr->type_id); ret = lwmi_cd01_get_data(priv->cd01_list, attribute_id, &capdata); if (ret) @@ -830,6 +838,7 @@ static ssize_t attr_current_value_show(struct kobject *kobj, struct lwmi_om_priv *priv = dev_get_drvdata(tunable_attr->dev); struct wmi_method_args_32 args; enum thermal_mode mode; + u32 attribute_id; int retval; int ret; @@ -837,8 +846,13 @@ static ssize_t attr_current_value_show(struct kobject *kobj, if (ret) return ret; - args.arg0 = LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature_id, - mode, tunable_attr->type_id); + attribute_id = + FIELD_PREP(LWMI_ATTR_DEV_ID_MASK, tunable_attr->device_id) | + FIELD_PREP(LWMI_ATTR_FEAT_ID_MASK, tunable_attr->feature_id) | + FIELD_PREP(LWMI_ATTR_MODE_ID_MASK, mode) | + FIELD_PREP(LWMI_ATTR_TYPE_ID_MASK, tunable_attr->type_id); + + args.arg0 = attribute_id; ret = lwmi_dev_evaluate_int(priv->wdev, 0x0, LWMI_FEATURE_VALUE_GET, (unsigned char *)&args, sizeof(args), From 76cfc6eed3eb2b533db7ec647a01bfd65a51e261 Mon Sep 17 00:00:00 2001 From: "Derek J. Clark" Date: Tue, 24 Feb 2026 04:31:55 +0000 Subject: [PATCH 06/11] [FROM-ML] platform/x86: lenovo-wmi-other: Add LWMI_ATTR_ID Macro Adds LWMI_ATTR_ID macro. In the same vein as LWMI_ATTR_ID_FAN_RPM, but as a generic, to de-duplicate attribute_id assignment biolerplate. Reviewed-by: Mark Pearson Signed-off-by: Derek J. Clark --- drivers/platform/x86/lenovo/wmi-capdata.h | 6 ++++ drivers/platform/x86/lenovo/wmi-gamezone.h | 1 + drivers/platform/x86/lenovo/wmi-other.c | 36 ++++++---------------- 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/drivers/platform/x86/lenovo/wmi-capdata.h b/drivers/platform/x86/lenovo/wmi-capdata.h index 8c1df3efcc553..27202e2dc8a59 100644 --- a/drivers/platform/x86/lenovo/wmi-capdata.h +++ b/drivers/platform/x86/lenovo/wmi-capdata.h @@ -17,6 +17,12 @@ #define LWMI_ATTR_MODE_ID_MASK GENMASK(15, 8) #define LWMI_ATTR_TYPE_ID_MASK GENMASK(7, 0) +#define LWMI_ATTR_ID(dev, feat, mode, type) \ + (FIELD_PREP(LWMI_ATTR_DEV_ID_MASK, dev) | \ + FIELD_PREP(LWMI_ATTR_FEAT_ID_MASK, feat) | \ + FIELD_PREP(LWMI_ATTR_MODE_ID_MASK, mode) | \ + FIELD_PREP(LWMI_ATTR_TYPE_ID_MASK, type)) + #define LWMI_DEVICE_ID_FAN 0x04 struct component_match; diff --git a/drivers/platform/x86/lenovo/wmi-gamezone.h b/drivers/platform/x86/lenovo/wmi-gamezone.h index 6b163a5eeb959..ddb919cf6c36d 100644 --- a/drivers/platform/x86/lenovo/wmi-gamezone.h +++ b/drivers/platform/x86/lenovo/wmi-gamezone.h @@ -10,6 +10,7 @@ enum gamezone_events_type { }; enum thermal_mode { + LWMI_GZ_THERMAL_MODE_NONE = 0x00, LWMI_GZ_THERMAL_MODE_QUIET = 0x01, LWMI_GZ_THERMAL_MODE_BALANCED = 0x02, LWMI_GZ_THERMAL_MODE_PERFORMANCE = 0x03, diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86/lenovo/wmi-other.c index 2ab505e92b9ee..bf58a38db3fee 100644 --- a/drivers/platform/x86/lenovo/wmi-other.c +++ b/drivers/platform/x86/lenovo/wmi-other.c @@ -71,10 +71,9 @@ #define LWMI_FAN_NR 4 #define LWMI_FAN_ID(x) ((x) + LWMI_FAN_ID_BASE) -#define LWMI_ATTR_ID_FAN_RPM(x) \ - (FIELD_PREP(LWMI_ATTR_DEV_ID_MASK, LWMI_DEVICE_ID_FAN) | \ - FIELD_PREP(LWMI_ATTR_FEAT_ID_MASK, LWMI_FEATURE_ID_FAN_RPM) | \ - FIELD_PREP(LWMI_ATTR_TYPE_ID_MASK, LWMI_FAN_ID(x))) +#define LWMI_ATTR_ID_FAN_RPM(x) \ + LWMI_ATTR_ID(LWMI_DEVICE_ID_FAN, LWMI_FEATURE_ID_FAN_RPM, \ + LWMI_GZ_THERMAL_MODE_NONE, LWMI_FAN_ID(x)) #define LWMI_FAN_DIV 100 @@ -716,12 +715,8 @@ static ssize_t attr_capdata01_show(struct kobject *kobj, u32 attribute_id; int value, ret; - attribute_id = - FIELD_PREP(LWMI_ATTR_DEV_ID_MASK, tunable_attr->device_id) | - FIELD_PREP(LWMI_ATTR_FEAT_ID_MASK, tunable_attr->feature_id) | - FIELD_PREP(LWMI_ATTR_MODE_ID_MASK, - LWMI_GZ_THERMAL_MODE_CUSTOM) | - FIELD_PREP(LWMI_ATTR_TYPE_ID_MASK, tunable_attr->type_id); + attribute_id = LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature_id, + LWMI_GZ_THERMAL_MODE_CUSTOM, tunable_attr->type_id); ret = lwmi_cd01_get_data(priv->cd01_list, attribute_id, &capdata); if (ret) @@ -776,7 +771,6 @@ static ssize_t attr_current_value_store(struct kobject *kobj, struct wmi_method_args_32 args; struct capdata01 capdata; enum thermal_mode mode; - u32 attribute_id; u32 value; int ret; @@ -787,13 +781,10 @@ static ssize_t attr_current_value_store(struct kobject *kobj, if (mode != LWMI_GZ_THERMAL_MODE_CUSTOM) return -EBUSY; - attribute_id = - FIELD_PREP(LWMI_ATTR_DEV_ID_MASK, tunable_attr->device_id) | - FIELD_PREP(LWMI_ATTR_FEAT_ID_MASK, tunable_attr->feature_id) | - FIELD_PREP(LWMI_ATTR_MODE_ID_MASK, mode) | - FIELD_PREP(LWMI_ATTR_TYPE_ID_MASK, tunable_attr->type_id); + args.arg0 = LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature_id, + mode, tunable_attr->type_id); - ret = lwmi_cd01_get_data(priv->cd01_list, attribute_id, &capdata); + ret = lwmi_cd01_get_data(priv->cd01_list, args.arg0, &capdata); if (ret) return ret; @@ -804,7 +795,6 @@ static ssize_t attr_current_value_store(struct kobject *kobj, if (value < capdata.min_value || value > capdata.max_value) return -EINVAL; - args.arg0 = attribute_id; args.arg1 = value; ret = lwmi_dev_evaluate_int(priv->wdev, 0x0, LWMI_FEATURE_VALUE_SET, @@ -838,7 +828,6 @@ static ssize_t attr_current_value_show(struct kobject *kobj, struct lwmi_om_priv *priv = dev_get_drvdata(tunable_attr->dev); struct wmi_method_args_32 args; enum thermal_mode mode; - u32 attribute_id; int retval; int ret; @@ -846,13 +835,8 @@ static ssize_t attr_current_value_show(struct kobject *kobj, if (ret) return ret; - attribute_id = - FIELD_PREP(LWMI_ATTR_DEV_ID_MASK, tunable_attr->device_id) | - FIELD_PREP(LWMI_ATTR_FEAT_ID_MASK, tunable_attr->feature_id) | - FIELD_PREP(LWMI_ATTR_MODE_ID_MASK, mode) | - FIELD_PREP(LWMI_ATTR_TYPE_ID_MASK, tunable_attr->type_id); - - args.arg0 = attribute_id; + args.arg0 = LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature_id, + mode, tunable_attr->type_id); ret = lwmi_dev_evaluate_int(priv->wdev, 0x0, LWMI_FEATURE_VALUE_GET, (unsigned char *)&args, sizeof(args), From 3cbb7491d761e852a4c1599fdc24350a131d191b Mon Sep 17 00:00:00 2001 From: "Derek J. Clark" Date: Tue, 24 Feb 2026 04:31:56 +0000 Subject: [PATCH 07/11] [FROM-ML] platform/x86: lenovo-wmi-other: Limit adding attributes to supported devices Adds lwmi_is_attr_01_supported, and only creates the attribute subfolder if the attribute is supported by the hardware. Due to some poorly implemented BIOS, this is a multi-step sequence of events. This is because: - Some BIOS support getting the capability data from custom mode (0xff), while others only support it in no-mode (0x00). - Similarly, some BIOS support get/set for the current value from custom mode (0xff), while others only support it in no-mode (0x00). - Some BIOS report capability data for a method that is not fully implemented. - Some BIOS have methods fully implemented, but no complimentary capability data. To ensure we only expose fully implemented methods with corresponding capability data, we check each outcome before reporting that an attribute can be supported. Checking for lwmi_is_attr_01_supported during remove is not done to ensure that we don't attempt to call cd01 or send WMI events if one of the interfaces being removed was the cause of the driver unloading. While adding members to tunable_attr_01, remove unused capdata pointer and limit size of all ID's to the appropriate size. Reviewed-by: Mark Pearson Reported-by: Kurt Borja Closes: https://lore.kernel.org/platform-driver-x86/DG60P3SHXR8H.3NSEHMZ6J7XRC@gmail.com/ Signed-off-by: Derek J. Clark --- drivers/platform/x86/lenovo/wmi-other.c | 117 +++++++++++++++++++++--- 1 file changed, 102 insertions(+), 15 deletions(-) diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86/lenovo/wmi-other.c index bf58a38db3fee..47f9c34611321 100644 --- a/drivers/platform/x86/lenovo/wmi-other.c +++ b/drivers/platform/x86/lenovo/wmi-other.c @@ -545,11 +545,12 @@ static void lwmi_om_fan_info_collect_cd_fan(struct device *dev, struct cd_list * /* ======== fw_attributes (component: lenovo-wmi-capdata 01) ======== */ struct tunable_attr_01 { - struct capdata01 *capdata; struct device *dev; - u32 feature_id; - u32 device_id; - u32 type_id; + u8 feature_id; + u8 device_id; + u8 type_id; + u8 cd_mode_id; /* mode arg for searching capdata */ + u8 cv_mode_id; /* mode arg for set/get current_value */ }; static struct tunable_attr_01 ppt_pl1_spl = { @@ -716,7 +717,7 @@ static ssize_t attr_capdata01_show(struct kobject *kobj, int value, ret; attribute_id = LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature_id, - LWMI_GZ_THERMAL_MODE_CUSTOM, tunable_attr->type_id); + tunable_attr->cd_mode_id, tunable_attr->type_id); ret = lwmi_cd01_get_data(priv->cd01_list, attribute_id, &capdata); if (ret) @@ -782,7 +783,7 @@ static ssize_t attr_current_value_store(struct kobject *kobj, return -EBUSY; args.arg0 = LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature_id, - mode, tunable_attr->type_id); + tunable_attr->cd_mode_id, tunable_attr->type_id); ret = lwmi_cd01_get_data(priv->cd01_list, args.arg0, &capdata); if (ret) @@ -795,6 +796,8 @@ static ssize_t attr_current_value_store(struct kobject *kobj, if (value < capdata.min_value || value > capdata.max_value) return -EINVAL; + args.arg0 = LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature_id, + tunable_attr->cv_mode_id, tunable_attr->type_id); args.arg1 = value; ret = lwmi_dev_evaluate_int(priv->wdev, 0x0, LWMI_FEATURE_VALUE_SET, @@ -828,13 +831,16 @@ static ssize_t attr_current_value_show(struct kobject *kobj, struct lwmi_om_priv *priv = dev_get_drvdata(tunable_attr->dev); struct wmi_method_args_32 args; enum thermal_mode mode; - int retval; - int ret; + int retval, ret; ret = lwmi_om_notifier_call(&mode); if (ret) return ret; + /* If "no-mode" is the supported mode, ensure we never send current mode */ + if (tunable_attr->cv_mode_id == LWMI_GZ_THERMAL_MODE_NONE) + mode = tunable_attr->cv_mode_id; + args.arg0 = LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature_id, mode, tunable_attr->type_id); @@ -847,6 +853,85 @@ static ssize_t attr_current_value_show(struct kobject *kobj, return sysfs_emit(buf, "%d\n", retval); } +/** + * lwmi_attr_01_is_supported() - Determine if the given attribute is supported. + * @tunable_attr: The attribute to verify. + * + * First check if the attribute has a corresponding capdata01 table in the cd01 + * module under the "custom" mode (0xff). If that is not present then check if + * there is a corresponding "no-mode" (0x00) entry. If either of those passes, + * check capdata->supported for values > 0. If capdata is available, attempt to + * determine the set/get mode for the current value property using a similar + * pattern. If the value returned by either custom or no-mode is 0, or we get + * an error, we assume that mode is not supported. If any of the above checks + * fail then the attribute is not fully supported. + * + * The probed cd_mode_id/cv_mode_id are stored on the tunable_attr for later + * reference. + * + * Return: Support level, or an error code. + */ +static int lwmi_attr_01_is_supported(struct tunable_attr_01 *tunable_attr) +{ + struct lwmi_om_priv *priv = dev_get_drvdata(tunable_attr->dev); + u8 mode = LWMI_GZ_THERMAL_MODE_CUSTOM; + struct wmi_method_args_32 args; + struct capdata01 capdata; + int retval, ret; + + /* Determine tunable_attr->cd_mode_id */ +no_mode_fallback_1: + args.arg0 = LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature_id, + mode, tunable_attr->type_id); + + ret = lwmi_cd01_get_data(priv->cd01_list, args.arg0, &capdata); + if (ret && mode) { + dev_dbg(tunable_attr->dev, "Attribute id %x not supported\n", args.arg0); + mode = LWMI_GZ_THERMAL_MODE_NONE; + goto no_mode_fallback_1; + } + if (ret) + goto not_supported; + if (!capdata.supported) { + ret = -EOPNOTSUPP; + goto not_supported; + } + + tunable_attr->cd_mode_id = mode; + + /* Determine tunable_attr->cv_mode_id */ + mode = LWMI_GZ_THERMAL_MODE_CUSTOM; +no_mode_fallback_2: + args.arg0 = LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature_id, + mode, tunable_attr->type_id); + + ret = lwmi_dev_evaluate_int(priv->wdev, 0x0, LWMI_FEATURE_VALUE_GET, + (unsigned char *)&args, sizeof(args), + &retval); + if ((ret && mode) || (!retval && mode)) { + dev_dbg(tunable_attr->dev, "Attribute id %x not supported\n", args.arg0); + mode = LWMI_GZ_THERMAL_MODE_NONE; + goto no_mode_fallback_2; + } + if (ret) + goto not_supported; + if (retval == 0) { + ret = -EOPNOTSUPP; + goto not_supported; + } + + tunable_attr->cv_mode_id = mode; + dev_dbg(tunable_attr->dev, "cd_mode_id: %02x%02x%02x%02x, cv_mode_id: %#08x attribute support level: %x\n", + tunable_attr->device_id, tunable_attr->feature_id, tunable_attr->cd_mode_id, + tunable_attr->type_id, args.arg0, capdata.supported); + + return capdata.supported; + +not_supported: + dev_dbg(tunable_attr->dev, "Attribute id %x not supported\n", args.arg0); + return ret; +} + /* Lenovo WMI Other Mode Attribute macros */ #define __LWMI_ATTR_RO(_func, _name) \ { \ @@ -970,19 +1055,21 @@ static int lwmi_om_fw_attr_add(struct lwmi_om_priv *priv) } for (i = 0; i < ARRAY_SIZE(cd01_attr_groups) - 1; i++) { - err = sysfs_create_group(&priv->fw_attr_kset->kobj, - cd01_attr_groups[i].attr_group); - if (err) - goto err_remove_groups; - cd01_attr_groups[i].tunable_attr->dev = &priv->wdev->dev; + if (lwmi_attr_01_is_supported(cd01_attr_groups[i].tunable_attr) > 0) { + err = sysfs_create_group(&priv->fw_attr_kset->kobj, + cd01_attr_groups[i].attr_group); + if (err) + goto err_remove_groups; + } } return 0; err_remove_groups: while (i--) - sysfs_remove_group(&priv->fw_attr_kset->kobj, - cd01_attr_groups[i].attr_group); + if (lwmi_attr_01_is_supported(cd01_attr_groups[i].tunable_attr) > 0) + sysfs_remove_group(&priv->fw_attr_kset->kobj, + cd01_attr_groups[i].attr_group); kset_unregister(priv->fw_attr_kset); From 2ff6b9611a369ac2e9262ea6b344d62495ded4d0 Mon Sep 17 00:00:00 2001 From: "Derek J. Clark" Date: Tue, 24 Feb 2026 04:31:57 +0000 Subject: [PATCH 08/11] [FROM-ML] platform/x86: lenovo-wmi-other: Add missing CPU tunable attributes Use an enum for device ID's and CPU attribute feature ID's, add missing CPU attributes. Reviewed-by: Mark Pearson Signed-off-by: Derek J. Clark --- .../wmi/devices/lenovo-wmi-other.rst | 10 ++ drivers/platform/x86/lenovo/wmi-capdata.h | 5 +- drivers/platform/x86/lenovo/wmi-other.c | 98 ++++++++++++++++++- 3 files changed, 107 insertions(+), 6 deletions(-) diff --git a/Documentation/wmi/devices/lenovo-wmi-other.rst b/Documentation/wmi/devices/lenovo-wmi-other.rst index 01d4711567380..f4763ed66cc6d 100644 --- a/Documentation/wmi/devices/lenovo-wmi-other.rst +++ b/Documentation/wmi/devices/lenovo-wmi-other.rst @@ -68,9 +68,19 @@ Each attribute has the following properties: - type The following firmware-attributes are implemented: + - cpu_oc_stat: CPU Overlocking Status + - cpu_temp: CPU Thermal Load Limit + - ppt_cpu_cl: CPU Cross Loading Power Limit + - ppt_pl1_apu_spl: Platform Profile Tracking APU Sustained Power Limit - ppt_pl1_spl: Platform Profile Tracking Sustained Power Limit + - ppt_pl1_spl_cl: Platform Profile Tracking Cross Loading Sustained Power Limit + - ppt_pl1_tau: Exceed Duration for Platform Profile Tracking Sustained Power Limit - ppt_pl2_sppt: Platform Profile Tracking Slow Package Power Tracking + - ppt_pl2_sppt_cl: Platform Profile Tracking Cross Loading Slow Package Tracking - ppt_pl3_fppt: Platform Profile Tracking Fast Package Power Tracking + - ppt_pl3_fppt_cl: Platform Profile Tracking Cross Loading Fast Package Power Tracking + - ppt_pl4_ipl: Platform Profile Trakcing Instantaneous Power Limit + - ppt_pl4_ipl_cl: Platform Profile Tracking Cross Loading Instantaneous Power Limit LENOVO_FAN_TEST_DATA ------------------------- diff --git a/drivers/platform/x86/lenovo/wmi-capdata.h b/drivers/platform/x86/lenovo/wmi-capdata.h index 27202e2dc8a59..aa48f43cbb43b 100644 --- a/drivers/platform/x86/lenovo/wmi-capdata.h +++ b/drivers/platform/x86/lenovo/wmi-capdata.h @@ -23,7 +23,10 @@ FIELD_PREP(LWMI_ATTR_MODE_ID_MASK, mode) | \ FIELD_PREP(LWMI_ATTR_TYPE_ID_MASK, type)) -#define LWMI_DEVICE_ID_FAN 0x04 +enum lwmi_device_id { + LWMI_DEVICE_ID_CPU = 0x01, + LWMI_DEVICE_ID_FAN = 0x04, +}; struct component_match; struct device; diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86/lenovo/wmi-other.c index 47f9c34611321..aba1b3d5d2d7f 100644 --- a/drivers/platform/x86/lenovo/wmi-other.c +++ b/drivers/platform/x86/lenovo/wmi-other.c @@ -54,15 +54,21 @@ #define LENOVO_OTHER_MODE_GUID "DC2A8805-3A8C-41BA-A6F7-092E0089CD3B" -#define LWMI_DEVICE_ID_CPU 0x01 - -#define LWMI_FEATURE_ID_CPU_SPPT 0x01 -#define LWMI_FEATURE_ID_CPU_SPL 0x02 -#define LWMI_FEATURE_ID_CPU_FPPT 0x03 +enum lwmi_feature_id_cpu { + LWMI_FEATURE_ID_CPU_SPPT = 0x01, + LWMI_FEATURE_ID_CPU_SPL = 0x02, + LWMI_FEATURE_ID_CPU_FPPT = 0x03, + LWMI_FEATURE_ID_CPU_TEMP = 0x04, + LWMI_FEATURE_ID_CPU_APU = 0x05, + LWMI_FEATURE_ID_CPU_CL = 0x06, + LWMI_FEATURE_ID_CPU_TAU = 0x07, + LWMI_FEATURE_ID_CPU_IPL = 0x09, +}; #define LWMI_FEATURE_ID_FAN_RPM 0x03 #define LWMI_TYPE_ID_NONE 0x00 +#define LWMI_TYPE_ID_CROSSLOAD 0x01 #define LWMI_FEATURE_VALUE_GET 17 #define LWMI_FEATURE_VALUE_SET 18 @@ -559,18 +565,72 @@ static struct tunable_attr_01 ppt_pl1_spl = { .type_id = LWMI_TYPE_ID_NONE, }; +static struct tunable_attr_01 ppt_pl1_spl_cl = { + .device_id = LWMI_DEVICE_ID_CPU, + .feature_id = LWMI_FEATURE_ID_CPU_SPL, + .type_id = LWMI_TYPE_ID_CROSSLOAD, +}; + static struct tunable_attr_01 ppt_pl2_sppt = { .device_id = LWMI_DEVICE_ID_CPU, .feature_id = LWMI_FEATURE_ID_CPU_SPPT, .type_id = LWMI_TYPE_ID_NONE, }; +static struct tunable_attr_01 ppt_pl2_sppt_cl = { + .device_id = LWMI_DEVICE_ID_CPU, + .feature_id = LWMI_FEATURE_ID_CPU_SPPT, + .type_id = LWMI_TYPE_ID_CROSSLOAD, +}; + static struct tunable_attr_01 ppt_pl3_fppt = { .device_id = LWMI_DEVICE_ID_CPU, .feature_id = LWMI_FEATURE_ID_CPU_FPPT, .type_id = LWMI_TYPE_ID_NONE, }; +static struct tunable_attr_01 ppt_pl3_fppt_cl = { + .device_id = LWMI_DEVICE_ID_CPU, + .feature_id = LWMI_FEATURE_ID_CPU_FPPT, + .type_id = LWMI_TYPE_ID_CROSSLOAD, +}; + +static struct tunable_attr_01 cpu_temp = { + .device_id = LWMI_DEVICE_ID_CPU, + .feature_id = LWMI_FEATURE_ID_CPU_TEMP, + .type_id = LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 ppt_pl1_apu_spl = { + .device_id = LWMI_DEVICE_ID_CPU, + .feature_id = LWMI_FEATURE_ID_CPU_APU, + .type_id = LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 ppt_cpu_cl = { + .device_id = LWMI_DEVICE_ID_CPU, + .feature_id = LWMI_FEATURE_ID_CPU_CL, + .type_id = LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 ppt_pl1_tau = { + .device_id = LWMI_DEVICE_ID_CPU, + .feature_id = LWMI_FEATURE_ID_CPU_TAU, + .type_id = LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 ppt_pl4_ipl = { + .device_id = LWMI_DEVICE_ID_CPU, + .feature_id = LWMI_FEATURE_ID_CPU_IPL, + .type_id = LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 ppt_pl4_ipl_cl = { + .device_id = LWMI_DEVICE_ID_CPU, + .feature_id = LWMI_FEATURE_ID_CPU_IPL, + .type_id = LWMI_TYPE_ID_CROSSLOAD, +}; + struct capdata01_attr_group { const struct attribute_group *attr_group; struct tunable_attr_01 *tunable_attr; @@ -1009,17 +1069,45 @@ static int lwmi_attr_01_is_supported(struct tunable_attr_01 *tunable_attr) .name = _fsname, .attrs = _attrname##_attrs \ } +LWMI_ATTR_GROUP_TUNABLE_CAP01(cpu_temp, "cpu_temp", + "Set the CPU thermal load limit"); +LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_cpu_cl, "ppt_cpu_cl", + "Set the CPU cross loading power limit"); +LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl1_apu_spl, "ppt_pl1_apu_spl", + "Set the APU sustained power limit"); LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl1_spl, "ppt_pl1_spl", "Set the CPU sustained power limit"); +LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl1_spl_cl, "ppt_pl1_spl_cl", + "Set the CPU cross loading sustained power limit"); LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl2_sppt, "ppt_pl2_sppt", "Set the CPU slow package power tracking limit"); +LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl2_sppt_cl, "ppt_pl2_sppt_cl", + "Set the CPU cross loading slow package power tracking limit"); LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl3_fppt, "ppt_pl3_fppt", "Set the CPU fast package power tracking limit"); +LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl3_fppt_cl, "ppt_pl3_fppt_cl", + "Set the CPU cross loading fast package power tracking limit"); +LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl1_tau, "ppt_pl1_tau", + "Set the CPU sustained power limit exceed duration"); +LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl4_ipl, "ppt_pl4_ipl", + "Set the CPU instantaneous power limit"); +LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl4_ipl_cl, "ppt_pl4_ipl_cl", + "Set the CPU cross loading instantaneous power limit"); + static struct capdata01_attr_group cd01_attr_groups[] = { + { &cpu_temp_attr_group, &cpu_temp }, + { &ppt_cpu_cl_attr_group, &ppt_cpu_cl }, + { &ppt_pl1_apu_spl_attr_group, &ppt_pl1_apu_spl }, { &ppt_pl1_spl_attr_group, &ppt_pl1_spl }, + { &ppt_pl1_spl_cl_attr_group, &ppt_pl1_spl_cl }, + { &ppt_pl1_tau_attr_group, &ppt_pl1_tau }, { &ppt_pl2_sppt_attr_group, &ppt_pl2_sppt }, + { &ppt_pl2_sppt_cl_attr_group, &ppt_pl2_sppt_cl }, { &ppt_pl3_fppt_attr_group, &ppt_pl3_fppt }, + { &ppt_pl3_fppt_cl_attr_group, &ppt_pl3_fppt_cl }, + { &ppt_pl4_ipl_attr_group, &ppt_pl4_ipl }, + { &ppt_pl4_ipl_cl_attr_group, &ppt_pl4_ipl_cl }, {}, }; From 5220c02236305033e42cf0a9967d4cdfa02ed736 Mon Sep 17 00:00:00 2001 From: "Derek J. Clark" Date: Tue, 24 Feb 2026 04:31:58 +0000 Subject: [PATCH 09/11] [FROM-ML] platform/x86: lenovo-wmi-other: Add GPU tunable attributes Use an enum for all GPU attribute feature ID's and add GPU attributes. Reviewed-by: Mark Pearson Signed-off-by: Derek J. Clark --- .../wmi/devices/lenovo-wmi-other.rst | 11 ++ drivers/platform/x86/lenovo/wmi-capdata.h | 1 + drivers/platform/x86/lenovo/wmi-other.c | 105 ++++++++++++++++++ 3 files changed, 117 insertions(+) diff --git a/Documentation/wmi/devices/lenovo-wmi-other.rst b/Documentation/wmi/devices/lenovo-wmi-other.rst index f4763ed66cc6d..f7564b23bb7f0 100644 --- a/Documentation/wmi/devices/lenovo-wmi-other.rst +++ b/Documentation/wmi/devices/lenovo-wmi-other.rst @@ -70,6 +70,17 @@ Each attribute has the following properties: The following firmware-attributes are implemented: - cpu_oc_stat: CPU Overlocking Status - cpu_temp: CPU Thermal Load Limit + - dgpu_boost_clk: Dedicated GPU Boost Clock + - dgpu_enable: Dedicated GPU Enabled Status + - gpu_didvid: GPU Device Identifier and Vendor Identifier + - gpu_mode: GPU Mode by Power Limit + - gpu_nv_ac_offset: Nvidia GPU AC Total Processing Power Baseline Offset + - gpu_nv_bpl: Nvidia GPU Base Power Limit + - gpu_nv_cpu_boost: Nvidia GPU to CPU Dynamic Boost Limit + - gpu_nv_ctgp: Nvidia GPU Configurable Total Graphics Power + - gpu_nv_ppab: Nvidia GPU Power Performance Aware Boost Limit + - gpu_oc_stat: GPU Overclocking Status + - gpu_temp: GPU Thermal Load Limit - ppt_cpu_cl: CPU Cross Loading Power Limit - ppt_pl1_apu_spl: Platform Profile Tracking APU Sustained Power Limit - ppt_pl1_spl: Platform Profile Tracking Sustained Power Limit diff --git a/drivers/platform/x86/lenovo/wmi-capdata.h b/drivers/platform/x86/lenovo/wmi-capdata.h index aa48f43cbb43b..b7f9ee7b301a5 100644 --- a/drivers/platform/x86/lenovo/wmi-capdata.h +++ b/drivers/platform/x86/lenovo/wmi-capdata.h @@ -25,6 +25,7 @@ enum lwmi_device_id { LWMI_DEVICE_ID_CPU = 0x01, + LWMI_DEVICE_ID_GPU = 0x02, LWMI_DEVICE_ID_FAN = 0x04, }; diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86/lenovo/wmi-other.c index aba1b3d5d2d7f..018d55cb5adfc 100644 --- a/drivers/platform/x86/lenovo/wmi-other.c +++ b/drivers/platform/x86/lenovo/wmi-other.c @@ -65,6 +65,19 @@ enum lwmi_feature_id_cpu { LWMI_FEATURE_ID_CPU_IPL = 0x09, }; +enum lwmi_feature_id_gpu { + LWMI_FEATURE_ID_GPU_NV_PPAB = 0x01, + LWMI_FEATURE_ID_GPU_NV_CTGP = 0x02, + LWMI_FEATURE_ID_GPU_TEMP = 0x03, + LWMI_FEATURE_ID_GPU_AC_OFFSET = 0x04, + LWMI_FEATURE_ID_DGPU_BOOST_CLK = 0x06, + LWMI_FEATURE_ID_DGPU_EN = 0x07, + LWMI_FEATURE_ID_GPU_MODE = 0x08, + LWMI_FEATURE_ID_DGPU_DIDVID = 0x09, + LWMI_FEATURE_ID_GPU_NV_BPL = 0x0a, + LWMI_FEATURE_ID_GPU_NV_CPU_BOOST = 0x0b, +}; + #define LWMI_FEATURE_ID_FAN_RPM 0x03 #define LWMI_TYPE_ID_NONE 0x00 @@ -631,6 +644,66 @@ static struct tunable_attr_01 ppt_pl4_ipl_cl = { .type_id = LWMI_TYPE_ID_CROSSLOAD, }; +static struct tunable_attr_01 gpu_nv_ppab = { + .device_id = LWMI_DEVICE_ID_GPU, + .feature_id = LWMI_FEATURE_ID_GPU_NV_PPAB, + .type_id = LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 gpu_nv_ctgp = { + .device_id = LWMI_DEVICE_ID_GPU, + .feature_id = LWMI_FEATURE_ID_GPU_NV_CTGP, + .type_id = LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 gpu_temp = { + .device_id = LWMI_DEVICE_ID_GPU, + .feature_id = LWMI_FEATURE_ID_GPU_TEMP, + .type_id = LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 gpu_nv_ac_offset = { + .device_id = LWMI_DEVICE_ID_GPU, + .feature_id = LWMI_FEATURE_ID_GPU_AC_OFFSET, + .type_id = LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 dgpu_boost_clk = { + .device_id = LWMI_DEVICE_ID_GPU, + .feature_id = LWMI_FEATURE_ID_DGPU_BOOST_CLK, + .type_id = LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 dgpu_enable = { + .device_id = LWMI_DEVICE_ID_GPU, + .feature_id = LWMI_FEATURE_ID_DGPU_EN, + .type_id = LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 gpu_mode = { + .device_id = LWMI_DEVICE_ID_GPU, + .feature_id = LWMI_FEATURE_ID_GPU_MODE, + .type_id = LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 dgpu_didvid = { + .device_id = LWMI_DEVICE_ID_GPU, + .feature_id = LWMI_FEATURE_ID_DGPU_DIDVID, + .type_id = LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 gpu_nv_bpl = { + .device_id = LWMI_DEVICE_ID_GPU, + .feature_id = LWMI_FEATURE_ID_GPU_NV_BPL, + .type_id = LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 gpu_nv_cpu_boost = { + .device_id = LWMI_DEVICE_ID_GPU, + .feature_id = LWMI_FEATURE_ID_GPU_NV_CPU_BOOST, + .type_id = LWMI_TYPE_ID_NONE, +}; + struct capdata01_attr_group { const struct attribute_group *attr_group; struct tunable_attr_01 *tunable_attr; @@ -1069,6 +1142,7 @@ static int lwmi_attr_01_is_supported(struct tunable_attr_01 *tunable_attr) .name = _fsname, .attrs = _attrname##_attrs \ } +/* CPU tunable attributes */ LWMI_ATTR_GROUP_TUNABLE_CAP01(cpu_temp, "cpu_temp", "Set the CPU thermal load limit"); LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_cpu_cl, "ppt_cpu_cl", @@ -1094,9 +1168,40 @@ LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl4_ipl, "ppt_pl4_ipl", LWMI_ATTR_GROUP_TUNABLE_CAP01(ppt_pl4_ipl_cl, "ppt_pl4_ipl_cl", "Set the CPU cross loading instantaneous power limit"); +/* GPU tunable attributes */ +LWMI_ATTR_GROUP_TUNABLE_CAP01(dgpu_boost_clk, "gpu_boost_clk", + "Set the dedicated GPU boost clock"); +LWMI_ATTR_GROUP_TUNABLE_CAP01(dgpu_didvid, "gpu_didvid", + "Get the GPU device identifier and vendor identifier"); +LWMI_ATTR_GROUP_TUNABLE_CAP01(dgpu_enable, "dgpu_enable", + "Set the dedicated Nvidia GPU enabled status"); +LWMI_ATTR_GROUP_TUNABLE_CAP01(gpu_mode, "gpu_mode", + "Set the GPU mode by power limit"); +LWMI_ATTR_GROUP_TUNABLE_CAP01(gpu_nv_ac_offset, "gpu_nv_ac_offset", + "Set the Nvidia GPU AC total processing power baseline offset"); +LWMI_ATTR_GROUP_TUNABLE_CAP01(gpu_nv_bpl, "gpu_nv_bpl", + "Set the Nvidia GPU base power limit"); +LWMI_ATTR_GROUP_TUNABLE_CAP01(gpu_nv_cpu_boost, "gpu_nv_cpu_boost", + "Set the Nvidia GPU to CPU dynamic boost limit"); +LWMI_ATTR_GROUP_TUNABLE_CAP01(gpu_nv_ctgp, "gpu_nv_ctgp", + "Set the GPU configurable total graphics power"); +LWMI_ATTR_GROUP_TUNABLE_CAP01(gpu_nv_ppab, "gpu_nv_ppab", + "Set the Nvidia GPU power performance aware boost limit"); +LWMI_ATTR_GROUP_TUNABLE_CAP01(gpu_temp, "gpu_temp", + "Set the GPU thermal load limit"); static struct capdata01_attr_group cd01_attr_groups[] = { { &cpu_temp_attr_group, &cpu_temp }, + { &dgpu_boost_clk_attr_group, &dgpu_boost_clk }, + { &dgpu_didvid_attr_group, &dgpu_didvid }, + { &dgpu_enable_attr_group, &dgpu_enable }, + { &gpu_mode_attr_group, &gpu_mode }, + { &gpu_nv_ac_offset_attr_group, &gpu_nv_ac_offset }, + { &gpu_nv_bpl_attr_group, &gpu_nv_bpl }, + { &gpu_nv_cpu_boost_attr_group, &gpu_nv_cpu_boost }, + { &gpu_nv_ctgp_attr_group, &gpu_nv_ctgp }, + { &gpu_nv_ppab_attr_group, &gpu_nv_ppab }, + { &gpu_temp_attr_group, &gpu_temp }, { &ppt_cpu_cl_attr_group, &ppt_cpu_cl }, { &ppt_pl1_apu_spl_attr_group, &ppt_pl1_apu_spl }, { &ppt_pl1_spl_attr_group, &ppt_pl1_spl }, From 2b07d17a7c9397c1201d352031ae3c69c5025f31 Mon Sep 17 00:00:00 2001 From: "Derek J. Clark" Date: Tue, 24 Feb 2026 04:31:59 +0000 Subject: [PATCH 10/11] [FROM-ML] platform-x86: lenovo-wmi-other: Rename LWMI_OM_FW_ATTR_BASE_PATH In the next patch a power supply extension is added which requires a name attribute. Instead of creating another const macro with the same information, replace LWMI_OM_FW_ATTR_BASE_PATH with LWMI_OM_NAME and use that for firmware attributes and power supply extension. Reviewed-by: Mark Pearson Signed-off-by: Derek J. Clark --- drivers/platform/x86/lenovo/wmi-other.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86/lenovo/wmi-other.c index 018d55cb5adfc..bc18415270aca 100644 --- a/drivers/platform/x86/lenovo/wmi-other.c +++ b/drivers/platform/x86/lenovo/wmi-other.c @@ -90,13 +90,13 @@ enum lwmi_feature_id_gpu { #define LWMI_FAN_NR 4 #define LWMI_FAN_ID(x) ((x) + LWMI_FAN_ID_BASE) +#define LWMI_FAN_DIV 100 + #define LWMI_ATTR_ID_FAN_RPM(x) \ LWMI_ATTR_ID(LWMI_DEVICE_ID_FAN, LWMI_FEATURE_ID_FAN_RPM, \ LWMI_GZ_THERMAL_MODE_NONE, LWMI_FAN_ID(x)) -#define LWMI_FAN_DIV 100 - -#define LWMI_OM_FW_ATTR_BASE_PATH "lenovo-wmi-other" +#define LWMI_OM_SYSFS_NAME "lenovo-wmi-other" #define LWMI_OM_HWMON_NAME "lenovo_wmi_other" static BLOCKING_NOTIFIER_HEAD(om_chain_head); @@ -1233,8 +1233,7 @@ static int lwmi_om_fw_attr_add(struct lwmi_om_priv *priv) priv->fw_attr_dev = device_create(&firmware_attributes_class, NULL, MKDEV(0, 0), NULL, "%s-%u", - LWMI_OM_FW_ATTR_BASE_PATH, - priv->ida_id); + LWMI_OM_SYSFS_NAME, priv->ida_id); if (IS_ERR(priv->fw_attr_dev)) { err = PTR_ERR(priv->fw_attr_dev); goto err_free_ida; From 2b5211dd907a735859f99c9e19d30c85ef80faff Mon Sep 17 00:00:00 2001 From: "Derek J. Clark" Date: Tue, 24 Feb 2026 04:32:00 +0000 Subject: [PATCH 11/11] [FROM-ML] platform/x86: lenovo-wmi-other: Add WMI battery charge limiting. Add charge-type power supply extension for devices that support WMI based charge enable/disable. Lenovo Legion devices that implement function ID and capdata 00 ID 0x03010001 are able to enable or disable charging through the lenovo-wmi-other interface. The ideapad_laptop driver conflicts with this if it can also provide the attribute, so we have to get the acpi_handle and check for the same ACPI methods that enable the feature in that driver. The ACPI method is more reliable from my testing when both are present, so there is no need to modify the ideapad_laptop driver instead. Reviewed-by: Mark Pearson Signed-off-by: Derek J. Clark --- drivers/platform/x86/lenovo/wmi-capdata.h | 1 + drivers/platform/x86/lenovo/wmi-other.c | 230 ++++++++++++++++++++++ 2 files changed, 231 insertions(+) diff --git a/drivers/platform/x86/lenovo/wmi-capdata.h b/drivers/platform/x86/lenovo/wmi-capdata.h index b7f9ee7b301a5..00471551e7d60 100644 --- a/drivers/platform/x86/lenovo/wmi-capdata.h +++ b/drivers/platform/x86/lenovo/wmi-capdata.h @@ -26,6 +26,7 @@ enum lwmi_device_id { LWMI_DEVICE_ID_CPU = 0x01, LWMI_DEVICE_ID_GPU = 0x02, + LWMI_DEVICE_ID_PSU = 0x03, LWMI_DEVICE_ID_FAN = 0x04, }; diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86/lenovo/wmi-other.c index bc18415270aca..bf585f976b30f 100644 --- a/drivers/platform/x86/lenovo/wmi-other.c +++ b/drivers/platform/x86/lenovo/wmi-other.c @@ -42,9 +42,12 @@ #include #include #include +#include #include #include +#include + #include "wmi-capdata.h" #include "wmi-events.h" #include "wmi-gamezone.h" @@ -78,10 +81,17 @@ enum lwmi_feature_id_gpu { LWMI_FEATURE_ID_GPU_NV_CPU_BOOST = 0x0b, }; +enum lwmi_feature_id_psu { + LWMI_FEATURE_ID_PSU_INSTANT_MODE = 0x01, + LWMI_FEATURE_ID_PSU_CHARGE_MODE = 0x02, +}; + #define LWMI_FEATURE_ID_FAN_RPM 0x03 #define LWMI_TYPE_ID_NONE 0x00 #define LWMI_TYPE_ID_CROSSLOAD 0x01 +#define LWMI_TYPE_ID_PSU_AC 0x01 +#define LWMI_TYPE_ID_PSU_PD 0x02 #define LWMI_FEATURE_VALUE_GET 17 #define LWMI_FEATURE_VALUE_SET 18 @@ -92,10 +102,17 @@ enum lwmi_feature_id_gpu { #define LWMI_FAN_DIV 100 +#define LWMI_CHARGE_MODE_ENABLED 0x00 +#define LWMI_CHARGE_MODE_DISABLED 0x01 + #define LWMI_ATTR_ID_FAN_RPM(x) \ LWMI_ATTR_ID(LWMI_DEVICE_ID_FAN, LWMI_FEATURE_ID_FAN_RPM, \ LWMI_GZ_THERMAL_MODE_NONE, LWMI_FAN_ID(x)) +#define LWMI_ATTR_ID_PSU(feat, type) \ + LWMI_ATTR_ID(LWMI_DEVICE_ID_PSU, feat, \ + LWMI_GZ_THERMAL_MODE_NONE, type) + #define LWMI_OM_SYSFS_NAME "lenovo-wmi-other" #define LWMI_OM_HWMON_NAME "lenovo_wmi_other" @@ -137,6 +154,8 @@ struct lwmi_om_priv { bool capdata00_collected : 1; bool capdata_fan_collected : 1; } fan_flags; + + struct acpi_battery_hook battery_hook; }; /* @@ -561,6 +580,216 @@ static void lwmi_om_fan_info_collect_cd_fan(struct device *dev, struct cd_list * lwmi_om_hwmon_add(priv); } +/* ======== Power Supply Extension (component: lenovo-wmi-capdata 00) ======== */ + +/** + * lwmi_psy_ext_get_prop() - Get a power_supply_ext property + * @ps: The battery that was extended + * @ext: The extension + * @ext_data: Pointer the lwmi_om_priv drvdata + * @prop: The property to read + * @val: The value to return + * + * Writes the given value to the power_supply_ext property + * + * Return: 0 on success, or an error + */ +static int lwmi_psy_ext_get_prop(struct power_supply *ps, + const struct power_supply_ext *ext, + void *ext_data, + enum power_supply_property prop, + union power_supply_propval *val) +{ + struct lwmi_om_priv *priv = ext_data; + struct wmi_method_args_32 args; + u32 retval; + int ret; + + args.arg0 = LWMI_ATTR_ID_PSU(LWMI_FEATURE_ID_PSU_INSTANT_MODE, LWMI_TYPE_ID_PSU_AC); + + ret = lwmi_dev_evaluate_int(priv->wdev, 0x0, LWMI_FEATURE_VALUE_GET, + (unsigned char *)&args, sizeof(args), + &retval); + if (ret) + return ret; + + dev_dbg(&priv->wdev->dev, "Got return value %x for property %x\n", retval, prop); + + if (retval == LWMI_CHARGE_MODE_DISABLED) + val->intval = POWER_SUPPLY_CHARGE_TYPE_LONGLIFE; + else + val->intval = POWER_SUPPLY_CHARGE_TYPE_STANDARD; + + return 0; +} + +/** + * lwmi_psy_ext_set_prop() - Set a power_supply_ext property + * @ps: The battery that was extended + * @ext: The extension + * @ext_data: Pointer the lwmi_om_priv drvdata + * @prop: The property to write + * @val: The value to write + * + * Writes the given value to the power_supply_ext property + * + * Return: 0 on success, or an error + */ +static int lwmi_psy_ext_set_prop(struct power_supply *ps, + const struct power_supply_ext *ext, + void *ext_data, + enum power_supply_property prop, + const union power_supply_propval *val) +{ + struct lwmi_om_priv *priv = ext_data; + struct wmi_method_args_32 args; + + args.arg0 = LWMI_ATTR_ID_PSU(LWMI_FEATURE_ID_PSU_INSTANT_MODE, LWMI_TYPE_ID_PSU_AC); + if (val->intval == POWER_SUPPLY_CHARGE_TYPE_LONGLIFE) + args.arg1 = LWMI_CHARGE_MODE_DISABLED; + else + args.arg1 = LWMI_CHARGE_MODE_ENABLED; + + dev_dbg(&priv->wdev->dev, "Attempting to set %#08x for property %x to %x\n", + args.arg0, prop, args.arg1); + + return lwmi_dev_evaluate_int(priv->wdev, 0x0, LWMI_FEATURE_VALUE_SET, + (unsigned char *)&args, sizeof(args), NULL); +} + +/** + * lwmi_psy_prop_is_writeable() - Determine if the property is supported + * @ps: The battery that was extended + * @ext: The extension + * @ext_data: Pointer the lwmi_om_priv drvdata + * @prop: The property to check + * + * Checks capdata 00 to determine if the property is supported. + * + * Return: Support level, or false + */ +static int lwmi_psy_prop_is_writeable(struct power_supply *ps, + const struct power_supply_ext *ext, + void *ext_data, + enum power_supply_property prop) +{ + struct lwmi_om_priv *priv = ext_data; + struct capdata00 capdata; + u32 attribute_id = LWMI_ATTR_ID_PSU(LWMI_FEATURE_ID_PSU_INSTANT_MODE, LWMI_TYPE_ID_PSU_AC); + int ret; + + ret = lwmi_cd00_get_data(priv->cd00_list, attribute_id, &capdata); + if (ret) + return false; + + dev_dbg(&priv->wdev->dev, "Battery charge mode (%#08x) support level: %x\n", + attribute_id, capdata.supported); + + return capdata.supported; +} + +static const enum power_supply_property lwmi_psy_ext_props[] = { + POWER_SUPPLY_PROP_CHARGE_TYPES, +}; + +static const struct power_supply_ext lwmi_psy_ext = { + .name = LWMI_OM_SYSFS_NAME, + .properties = lwmi_psy_ext_props, + .num_properties = ARRAY_SIZE(lwmi_psy_ext_props), + .charge_types = (BIT(POWER_SUPPLY_CHARGE_TYPE_STANDARD) | + BIT(POWER_SUPPLY_CHARGE_TYPE_LONGLIFE)), + .get_property = lwmi_psy_ext_get_prop, + .set_property = lwmi_psy_ext_set_prop, + .property_is_writeable = lwmi_psy_prop_is_writeable, +}; + +/** + * lwmi_add_battery() - Connect the power_supply_ext + * @battery: The battery to extend + * @hook: The driver hook used to extend the battery + * + * Return: 0 on success, or an error. + */ +static int lwmi_add_battery(struct power_supply *battery, struct acpi_battery_hook *hook) +{ + struct lwmi_om_priv *priv = container_of(hook, struct lwmi_om_priv, battery_hook); + + return power_supply_register_extension(battery, &lwmi_psy_ext, &priv->wdev->dev, priv); +} + +/** + * lwmi_remove_battery() - Disconnect the power_supply_ext + * @battery: The battery that was extended + * @hook: The driver hook used to extend the battery + * + * Return: 0 on success, or an error. + */ +static int lwmi_remove_battery(struct power_supply *battery, struct acpi_battery_hook *hook) +{ + power_supply_unregister_extension(battery, &lwmi_psy_ext); + return 0; +} + +/** + * lwmi_acpi_match() - Attempts to return the ideapad acpi handle + * @handle: The ACPI handle that manages battery charging + * @lvl: Unused + * @context: Void pointer to the acpi_handle object to return + * @retval: Unused + * + * Checks if the ideapad_laptop driver is going to manage charge_type first, + * then if not, hooks the battery to our WMI methods. + * + * Return: AE_CTRL_TERMINATE if found, AE_OK if not found. + */ +static acpi_status lwmi_acpi_match(acpi_handle handle, u32 lvl, + void *context, void **retval) +{ + if (!handle) + return AE_OK; + + acpi_handle *ahand = context; + *ahand = handle; + + return AE_CTRL_TERMINATE; +} + +/** + * lwmi_om_ps_ext_init() - Hooks power supply extension to device battery + * @priv: Driver private data + * + * Checks if the ideapad_laptop driver is going to manage charge_type first, + * then if not, hooks the battery to our WMI methods. + */ +static void lwmi_om_ps_ext_init(struct lwmi_om_priv *priv) +{ + static const char * const ideapad_hid = "VPC2004"; + acpi_handle handle = NULL; + int ret; + + /* Deconflict ideapad_laptop driver */ + ret = acpi_get_devices(ideapad_hid, lwmi_acpi_match, &handle, NULL); + if (ret) + return; + + if (!handle) + return; + + if (acpi_has_method(handle, "GBMD") && acpi_has_method(handle, "SBMC")) { + dev_dbg(&priv->wdev->dev, "ideapad_laptop driver manages battery for device.\n"); + return; + } + + /* Add battery hooks */ + priv->battery_hook.add_battery = lwmi_add_battery, + priv->battery_hook.remove_battery = lwmi_remove_battery, + priv->battery_hook.name = "Lenovo WMI Other Battery Extension", + + ret = devm_battery_hook_register(&priv->wdev->dev, &priv->battery_hook); + if (ret) + dev_err(&priv->wdev->dev, "Error during battery hook: %i\n", ret); +} + /* ======== fw_attributes (component: lenovo-wmi-capdata 01) ======== */ struct tunable_attr_01 { @@ -1325,6 +1554,7 @@ static int lwmi_om_master_bind(struct device *dev) return -ENODEV; lwmi_om_fan_info_collect_cd00(priv); + lwmi_om_ps_ext_init(priv); return lwmi_om_fw_attr_add(priv); }