From nobody Sun Feb 8 05:45:56 2026 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CAEE0130A73; Thu, 22 May 2025 01:54:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747878842; cv=none; b=uhO3QojHywNw7jtCnHyMDZgHlQxe2nFjpFNfWAiKW01tRDqpdyBI1EUUXJHO/MEpxooBKZKFRyN1koy0+593wUujZi1sqd5zTLVvM3ObReB0OYeAB0tfEP4xtnBPpSev+czgVM2uoZYA1vGUT8A+KGgRmdPxzsO/g7m84alN68g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747878842; c=relaxed/simple; bh=u3VdVxRP/92rXXbLFVRNs8dfExel9OQAeql0H9blGFs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OdC7kKPV4aOz7n0n7P+qC3S0DO0DVhx9FgjfqcvjyS7J0QC3WAjjbXt74HZUXJHHtmo3kyN+aLoi2AX49PFJfXNJ3/1kGeycGXlafvYPwIhIK/g+B3AccxXOlx8onGkoDhaDZO9djgKPBt4i+8g3sTzqf97fxCYHm+eSMlhwZLE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GENRiDZW; arc=none smtp.client-ip=209.85.215.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GENRiDZW" Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-7fd581c2bf4so5936708a12.3; Wed, 21 May 2025 18:54:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747878840; x=1748483640; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qELloqDDzitc1Dc14WlN+8FUj6N4qdQnmsILEaip50g=; b=GENRiDZWVDOCpR+VRUap90DzSVQXWb41hg5181gq9YE+Nwd/lhwYLjhPOe+x19R4Kv w2OppEupkDsUy+OV+wa9IrpmDIMEYLz2Q1CmU5hGdgsFmnhRyMOtTyN8SQvcTOiquWqC QBDHUZoyu3b21lU88Flhrf9iTjUZ1qFIXcGc7/6uOAuuG4+SACO091g5W6qmIXVrdQqC zGihJOvY8f0IWLyAOnn/6npTSzdJ01cYki6ZedNrdkViow2horV/4t9pzkzTcChfouSA qR/RuDMgjlnKZXsGJxgrTH/zV2oP3gc76yMmAcluR5Hnqmld5oe65DkhcxNxl4Zko07D whcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747878840; x=1748483640; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qELloqDDzitc1Dc14WlN+8FUj6N4qdQnmsILEaip50g=; b=eaSCczddV4yyWUYVtZlUZduNwfb7Njhi5oLLVhk0jPe+FOsGXO+4S7lWkRcEZ2LHDZ XQpVZOL+YtuZuP43WSez0tKJF3ZbXj0rDJHO1k79VOF5AQVqa/Er4SgNyJAQMMeOA+Zr 7ACwZSQzTt/u0HVw7gCMb0AOtlUu6r5OTkPmFM44gyeulUvjXJ4ymTu2k2ZatLYaVAdX GZy779r7gAls7uME8MNujH1Hw1+EOaouFSfrXNo8F2nJQlJe9+6tntsXuIri+E6lX00U /4mAaZfNcEoIlkwXk1pOhtlhCO2pmAIgFegHwz8Y9FWWRBDLjG4w5F7OvFdAWVShsCSJ c8nQ== X-Forwarded-Encrypted: i=1; AJvYcCUi5/t3GmqIUC8QHa+E7hcyFyFgfvjXpWLEUXALj0U2zRK/881G4H2Gwk5FK072TXlE6hmdabemYwG0/aPIAl6ME7ISeQ==@vger.kernel.org, AJvYcCWDl2KzdjZsWnKBpVNGT7ZO9f0cLFv44Ip7IyDfKX7LP/reAYpcBFUYl/w5P7MCnuvpoJJcunXoycc=@vger.kernel.org, AJvYcCXfDb4r1gpH0msK/LUWyaCBmL6Q1YKvEQax83Ol1xT8u2lQrxEeAv8qKu/Y6zVbtCsu09SWgM6slFYLUkj6@vger.kernel.org X-Gm-Message-State: AOJu0YzGoJOZMED6r7yNkXGkoF0OtuuhtEMtZ8Jlk4exHnpQ6bsL96DR 8iiqAw+rVmvlQxraK3qEybl1rEgHojEffZADPDBEkxAZyuvuHW/qIYh+ X-Gm-Gg: ASbGncu0zPRbHSAf9kY6IjH7/qHA4QP2g1HktLDuimitc4vZTaCdLHTbBXMS0K2CwLs YBd7oUh8QPmg6nHsSlbT8WG8WAIvnE45PaVMadrSlQ8ib+Kv44BZ6oW9sZQYtBrFsu77CB43Q+N X4/N3gWpaXP1UzRBRhpFH7DqFiYVcd+4IXLax6bvHvMbzfsvLPSSaC2xsC1Sp6CbQI369fp8Mfs Z80mXRn/SyZkIgHTJfX1HI6tT1Og3XZIC1ZfQFzVd1McSltQuuW4RG3vFoNXS4BqfltyYoGsZmL qIFBdu0nSvrwUYN0oWG73UZz3opJUnQuP5QYUlpLJjrcG/CXsNTtwOYG/w3Tkez4Gp7V/9Xq3g/ Lm7n+HbrOBdH4ZlT+Zlp05XeLTNRPLOtVe3qLuIhhLg9nN3uRRA== X-Google-Smtp-Source: AGHT+IFYMbTtA/vIDZqsnnb0DW/KBtHBz0IYZh+bm/6AHL27lOW1CDGAnAL6+XpAKWHIOyPKkyU+/g== X-Received: by 2002:a17:903:3b8f:b0:224:122d:d2de with SMTP id d9443c01a7336-231d44e6d18mr320887205ad.16.1747878839872; Wed, 21 May 2025 18:53:59 -0700 (PDT) Received: from localhost.localdomain (108-228-232-20.lightspeed.sndgca.sbcglobal.net. [108.228.232.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4e97347sm98878225ad.116.2025.05.21.18.53.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 May 2025 18:53:59 -0700 (PDT) From: "Derek J. Clark" To: Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Cc: Armin Wolf , Jonathan Corbet , Mario Limonciello , Luke Jones , Xino Ni , Zhixin Zhang , Mia Shao , Mark Pearson , "Pierre-Loup A . Griffais" , "Cody T . -H . Chiu" , John Martens , Kurt Borja , "Derek J . Clark" , platform-driver-x86@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Alok Tiwari Subject: [PATCH v11 4/6] platform/x86: Add Lenovo Capability Data 01 WMI Driver Date: Wed, 21 May 2025 18:53:48 -0700 Message-ID: <20250522015350.471070-5-derekjohn.clark@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250522015350.471070-1-derekjohn.clark@gmail.com> References: <20250522015350.471070-1-derekjohn.clark@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Adds lenovo-wmi-capdata01 driver which provides the LENOVO_CAPABILITY_DATA_01 WMI data block that comes on "Other Mode" enabled hardware. Provides an interface for querying if a given attribute is supported by the hardware, as well as its default_value, max_value, min_value, and step increment. Reviewed-by: Alok Tiwari Reviewed-by: Armin Wolf Signed-off-by: Derek J. Clark --- v11: - Formatting cd v10: No change v9: - Check result of devm_mutex_init. v8: - Use devm_mutex_init() instead of mutex_init(). - Check return of devm_add_action_or_reset during probe. - Don't check if cd01 list exists in bind as the driver will bail if there is a malloc/populating issue prior to bind. - Fix typos. v7: - Do memcpy instead of returning pointer in lwmi_cd01_get_data. - Put list mutex inside lwmi_cd01_priv struct. - Unregister from acpi events on dev remove. - Fix typos. v6: - Recache capabiltiy data on ACPI AC events to ensure accutare max_value. - Fix typos and rewordings from v5 review. v5: - Return to cache at device initialization. On component bind, pass a pointer to lenovo-wmi-other. - Fixes from v4 review. v4: - Make driver data a private struct, remove references from Other Mode driver. - Don't cache data at device initialization. Instead, on component bind, cache the data on a member variable of the Other Mode driver data passed as a void pointer. - Add header file for capdata01 structs. - Add new struct to pass capdata01 array data and array length to Other Mode. v3: - Add as component to lenovo-wmi-other driver. v2: - Use devm_kmalloc to ensure driver can be instanced, remove global reference. - Ensure reverse Christmas tree for all variable declarations. - Remove extra whitespace. - Use guard(mutex) in all mutex instances, global mutex. - Use pr_fmt instead of adding the driver name to each pr_err. - Remove noisy pr_info usage. - Rename capdata_wmi to lenovo_wmi_cd01_priv and cd01_wmi to priv. - Use list to get the lenovo_wmi_cd01_priv instance in lenovo_wmi_capdata01_get as none of the data provided by the macros that will use it can pass a member of the struct for use in container_of. --- MAINTAINERS | 1 + drivers/platform/x86/Kconfig | 4 + drivers/platform/x86/Makefile | 1 + drivers/platform/x86/lenovo-wmi-capdata01.c | 302 ++++++++++++++++++++ drivers/platform/x86/lenovo-wmi-capdata01.h | 25 ++ 5 files changed, 333 insertions(+) create mode 100644 drivers/platform/x86/lenovo-wmi-capdata01.c create mode 100644 drivers/platform/x86/lenovo-wmi-capdata01.h diff --git a/MAINTAINERS b/MAINTAINERS index 2b4b06e81192..1b22e41cc730 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13164,6 +13164,7 @@ L: platform-driver-x86@vger.kernel.org S: Maintained F: Documentation/wmi/devices/lenovo-wmi-gamezone.rst F: Documentation/wmi/devices/lenovo-wmi-other.rst +F: drivers/platform/x86/lenovo-wmi-capdata01.* F: drivers/platform/x86/lenovo-wmi-events.* F: drivers/platform/x86/lenovo-wmi-helpers.* =20 diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 13b8f4ac5dc5..64663667f0cb 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -467,6 +467,10 @@ config LENOVO_WMI_HELPERS tristate depends on ACPI_WMI =20 +config LENOVO_WMI_DATA01 + tristate + depends on ACPI_WMI + config IDEAPAD_LAPTOP tristate "Lenovo IdeaPad Laptop Extras" depends on ACPI diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index fc039839286a..7a35c77221b7 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -69,6 +69,7 @@ obj-$(CONFIG_THINKPAD_LMI) +=3D think-lmi.o obj-$(CONFIG_YOGABOOK) +=3D lenovo-yogabook.o obj-$(CONFIG_YT2_1380) +=3D lenovo-yoga-tab2-pro-1380-fastcharger.o obj-$(CONFIG_LENOVO_WMI_CAMERA) +=3D lenovo-wmi-camera.o +obj-$(CONFIG_LENOVO_WMI_DATA01) +=3D lenovo-wmi-capdata01.o obj-$(CONFIG_LENOVO_WMI_EVENTS) +=3D lenovo-wmi-events.o obj-$(CONFIG_LENOVO_WMI_HELPERS) +=3D lenovo-wmi-helpers.o =20 diff --git a/drivers/platform/x86/lenovo-wmi-capdata01.c b/drivers/platform= /x86/lenovo-wmi-capdata01.c new file mode 100644 index 000000000000..39d58f444f72 --- /dev/null +++ b/drivers/platform/x86/lenovo-wmi-capdata01.c @@ -0,0 +1,302 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Lenovo Capability Data 01 WMI Data Block driver. + * + * Lenovo Capability Data 01 provides information on tunable attributes us= ed by + * the "Other Mode" WMI interface. The data includes if the attribute is + * supported by the hardware, the default_value, max_value, min_value, and= step + * increment. Each attribute has multiple pages, one for each of the therm= al + * modes managed by the Gamezone interface. + * + * Copyright (C) 2025 Derek J. Clark + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "lenovo-wmi-capdata01.h" + +#define LENOVO_CAPABILITY_DATA_01_GUID "7A8F5407-CB67-4D6E-B547-39B3BE0181= 54" + +#define ACPI_AC_CLASS "ac_adapter" +#define ACPI_AC_NOTIFY_STATUS 0x80 + +struct lwmi_cd01_priv { + struct notifier_block acpi_nb; /* ACPI events */ + struct wmi_device *wdev; + struct cd01_list *list; +}; + +struct cd01_list { + struct mutex list_mutex; /* list R/W mutex */ + u8 count; + struct capdata01 data[]; +}; + +/** + * lwmi_cd01_component_bind() - Bind component to master device. + * @cd01_dev: Pointer to the lenovo-wmi-capdata01 driver parent device. + * @om_dev: Pointer to the lenovo-wmi-other driver parent device. + * @data: capdata01_list object pointer used to return the capability data. + * + * On lenovo-wmi-other's master bind, provide a pointer to the local capda= ta01 + * list. This is used to call lwmi_cd01_get_data to look up attribute data + * from the lenovo-wmi-other driver. + * + * Return: 0 + */ +static int lwmi_cd01_component_bind(struct device *cd01_dev, + struct device *om_dev, void *data) +{ + struct lwmi_cd01_priv *priv =3D dev_get_drvdata(cd01_dev); + struct cd01_list **cd01_list =3D data; + + *cd01_list =3D priv->list; + + return 0; +} + +static const struct component_ops lwmi_cd01_component_ops =3D { + .bind =3D lwmi_cd01_component_bind, +}; + +/** + * lwmi_cd01_get_data - Get the data of the specified attribute + * @dev: The lenovo-wmi-capdata01 parent device. + * @tunable_attr: The attribute to be found. + * @output: Pointer to a capdata01 struct to return the data. + * + * Retrieves the capability data 01 struct pointer for the given + * attribute for its specified thermal mode. + * + * Return: 0 on success, or -EINVAL. + */ +int lwmi_cd01_get_data(struct cd01_list *list, u32 attribute_id, struct ca= pdata01 *output) +{ + u8 idx; + + guard(mutex)(&list->list_mutex); + for (idx =3D 0; idx < list->count; idx++) { + if (list->data[idx].id !=3D attribute_id) + continue; + memcpy(output, &list->data[idx], sizeof(list->data[idx])); + return 0; + }; + + return -EINVAL; +} +EXPORT_SYMBOL_NS_GPL(lwmi_cd01_get_data, "LENOVO_WMI_CD01"); + +/** + * lwmi_cd01_setup() - Cache all WMI data block information + * @priv: lenovo-wmi-capdata01 driver data. + * + * Loop through each WMI data block and cache the data. + * + * Return: 0 on success, or an error. + */ +static int lwmi_cd01_cache(struct lwmi_cd01_priv *priv) +{ + int idx; + + guard(mutex)(&priv->list->list_mutex); + for (idx =3D 0; idx < priv->list->count; idx++) { + union acpi_object *ret_obj __free(kfree) =3D NULL; + + ret_obj =3D wmidev_block_query(priv->wdev, idx); + if (!ret_obj) + return -ENODEV; + + if (ret_obj->type !=3D ACPI_TYPE_BUFFER || + ret_obj->buffer.length < sizeof(priv->list->data[idx])) + continue; + + memcpy(&priv->list->data[idx], ret_obj->buffer.pointer, + ret_obj->buffer.length); + } + + return 0; +} + +/** + * lwmi_cd01_alloc() - Allocate a cd01_list struct in drvdata + * @priv: lenovo-wmi-capdata01 driver data. + * + * Allocate a cd01_list struct large enough to contain data from all WMI d= ata + * blocks provided by the interface. + * + * Return: 0 on success, or an error. + */ +static int lwmi_cd01_alloc(struct lwmi_cd01_priv *priv) +{ + struct cd01_list *list; + size_t list_size; + int count, ret; + + count =3D wmidev_instance_count(priv->wdev); + list_size =3D struct_size(list, data, count); + + list =3D devm_kzalloc(&priv->wdev->dev, list_size, GFP_KERNEL); + if (!list) + return -ENOMEM; + + ret =3D devm_mutex_init(&priv->wdev->dev, &list->list_mutex); + if (ret) + return ret; + + list->count =3D count; + priv->list =3D list; + + return 0; +} + +/** + * lwmi_cd01_setup() - Cache all WMI data block information + * @priv: lenovo-wmi-capdata01 driver data. + * + * Allocate a cd01_list struct large enough to contain data from all WMI d= ata + * blocks provided by the interface. Then loop through each data block and + * cache the data. + * + * Return: 0 on success, or an error code. + */ +static int lwmi_cd01_setup(struct lwmi_cd01_priv *priv) +{ + int ret; + + ret =3D lwmi_cd01_alloc(priv); + if (ret) + return ret; + + return lwmi_cd01_cache(priv); +} + +/** + * lwmi_cd01_notifier_call() - Call method for lenovo-wmi-capdata01 driver= notifier. + * block call chain. + * @nb: The notifier_block registered to lenovo-wmi-events driver. + * @action: Unused. + * @data: The ACPI event. + * + * For LWMI_EVENT_THERMAL_MODE, set current_mode and notify platform_profi= le + * of a change. + * + * Return: notifier_block status. + */ +static int lwmi_cd01_notifier_call(struct notifier_block *nb, unsigned lon= g action, + void *data) +{ + struct acpi_bus_event *event =3D data; + struct lwmi_cd01_priv *priv; + int ret; + + if (strcmp(event->device_class, ACPI_AC_CLASS) !=3D 0) + return NOTIFY_DONE; + + priv =3D container_of(nb, struct lwmi_cd01_priv, acpi_nb); + + switch (event->type) { + case ACPI_AC_NOTIFY_STATUS: + ret =3D lwmi_cd01_cache(priv); + if (ret) + return NOTIFY_BAD; + + return NOTIFY_OK; + default: + return NOTIFY_DONE; + } +} + +/** + * lwmi_cd01_unregister() - Unregister the cd01 ACPI notifier_block. + * @data: The ACPI event notifier_block to unregister. + */ +static void lwmi_cd01_unregister(void *data) +{ + struct notifier_block *acpi_nb =3D data; + + unregister_acpi_notifier(acpi_nb); +} + +static int lwmi_cd01_probe(struct wmi_device *wdev, const void *context) + +{ + struct lwmi_cd01_priv *priv; + int ret; + + priv =3D devm_kzalloc(&wdev->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->wdev =3D wdev; + dev_set_drvdata(&wdev->dev, priv); + + ret =3D lwmi_cd01_setup(priv); + if (ret) + return ret; + + priv->acpi_nb.notifier_call =3D lwmi_cd01_notifier_call; + + ret =3D register_acpi_notifier(&priv->acpi_nb); + if (ret) + return ret; + + ret =3D devm_add_action_or_reset(&wdev->dev, lwmi_cd01_unregister, &priv-= >acpi_nb); + if (ret) + return ret; + + return component_add(&wdev->dev, &lwmi_cd01_component_ops); +} + +static void lwmi_cd01_remove(struct wmi_device *wdev) +{ + component_del(&wdev->dev, &lwmi_cd01_component_ops); +} + +static const struct wmi_device_id lwmi_cd01_id_table[] =3D { + { LENOVO_CAPABILITY_DATA_01_GUID, NULL }, + {} +}; + +static struct wmi_driver lwmi_cd01_driver =3D { + .driver =3D { + .name =3D "lenovo_wmi_cd01", + .probe_type =3D PROBE_PREFER_ASYNCHRONOUS, + }, + .id_table =3D lwmi_cd01_id_table, + .probe =3D lwmi_cd01_probe, + .remove =3D lwmi_cd01_remove, + .no_singleton =3D true, +}; + +/** + * lwmi_cd01_match() - Match rule for the master driver. + * @dev: Pointer to the capability data 01 parent device. + * @data: Unused void pointer for passing match criteria. + * + * Return: int. + */ +int lwmi_cd01_match(struct device *dev, void *data) +{ + return dev->driver =3D=3D &lwmi_cd01_driver.driver; +} +EXPORT_SYMBOL_NS_GPL(lwmi_cd01_match, "LENOVO_WMI_CD01"); + +module_wmi_driver(lwmi_cd01_driver); + +MODULE_DEVICE_TABLE(wmi, lwmi_cd01_id_table); +MODULE_AUTHOR("Derek J. Clark "); +MODULE_DESCRIPTION("Lenovo Capability Data 01 WMI Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/platform/x86/lenovo-wmi-capdata01.h b/drivers/platform= /x86/lenovo-wmi-capdata01.h new file mode 100644 index 000000000000..bd06c5751f68 --- /dev/null +++ b/drivers/platform/x86/lenovo-wmi-capdata01.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +/* Copyright (C) 2025 Derek J. Clark */ + +#ifndef _LENOVO_WMI_CAPDATA01_H_ +#define _LENOVO_WMI_CAPDATA01_H_ + +#include + +struct device; +struct cd01_list; + +struct capdata01 { + u32 id; + u32 supported; + u32 default_value; + u32 step; + u32 min_value; + u32 max_value; +}; + +int lwmi_cd01_get_data(struct cd01_list *list, u32 attribute_id, struct ca= pdata01 *output); +int lwmi_cd01_match(struct device *dev, void *data); + +#endif /* !_LENOVO_WMI_CAPDATA01_H_ */ --=20 2.49.0