From nobody Thu Apr 2 20:28:00 2026 Received: from mail-dy1-f179.google.com (mail-dy1-f179.google.com [74.125.82.179]) (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 153E431A7ED for ; Fri, 13 Feb 2026 08:12:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770970374; cv=none; b=sRCnJNiNdIxtKx0N8IvRM75+W6lCbEHOgsrCL1qHFpmNweGv7Bgt/sIHp6akhGCgJ0DmNuJyXVa25QwdMDUmKmCZGWtfzqOdKfgalnJmxmt1849W1XfCFgSlT1Jnkxjl0CBfErlYLpeuS235pQfUkQ2XDQHTFU2T4CT9ltnlGtA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770970374; c=relaxed/simple; bh=x9fabaDsNlK05ajQm4gX5bnfuMO1JF2Jd0Zx8F2QD9I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UejvPhI79RvvqM0ir/Tl3M+8tg8nHECvZc0C1KA65AXG/eDHCDek6Z+vRawymeINrTeduHMCvTP4MF/TiK6kE+AU2edrcDoSuQMUTGZ/3yBLAsuvOMdlK+eNFpbfQc8tbnIh3LnujGK0hj+JLzsxYUTNaVPOrpsSK9yCV3Q5kWk= 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=L1CmVOiK; arc=none smtp.client-ip=74.125.82.179 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="L1CmVOiK" Received: by mail-dy1-f179.google.com with SMTP id 5a478bee46e88-2b86671f87eso1327032eec.0 for ; Fri, 13 Feb 2026 00:12:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770970372; x=1771575172; 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=EFPrQ6Ot9eJDg9aeQxRAL9muhs7folZgYoHqrrQqjiI=; b=L1CmVOiKf6EM196vNpTcM+wltA4lXAxTBg6Hlo+AO+UCO2JnCdDhC1fN2EuENyADT2 CXk5bvtfD0S1VDWjLFAssgq53YX5cCgqUtIaw73eyOzULaLI2CT0Z+Vkp1jQLjFCPOZu 43pyW0kxV+jhl3H5z2Zl6tMjeAHBc8JpggfkbW+2VN4qJZGIerWE9KJQe+j/xHnB36OF HnBPkoxSc4Xac+Jq70GEntlpMs2dpnKvGhUbMU0UPD8efPezScYgAPg8Cm7YE25lMmmV RnCkI8FwukI5TD3py3Mdi/pvFq5kHiyOv1YLkE/QFlSIR/Kn9Czd7MEhxYWGQCNLBAlr 3qxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770970372; x=1771575172; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=EFPrQ6Ot9eJDg9aeQxRAL9muhs7folZgYoHqrrQqjiI=; b=CqmJo28gFo3ALW8TF66fyffV/jAmGtj3tP/n+x5lNNPqpHe4g1YbU/UmDxV4YN5gR3 OTq4UjvVudI/rRW2/HQa9KFLa3rEXtRtigo9Y0JLsZeBTeUzM3WuQPbnkCeSStGEqNUg Ui8bI4qWF4yhLAalx2TB33zZhPVDlTlK4WwUM/X2VyY5wTEbYrdWlomeASzJVtchTpQ/ RuQ0saGRw9cf5E0bO96UVNVmX5msp7a9OSOgICHeIZUweUV1Queuw2IsMwA8zK9TjZAo bHLT81F9mOrBxgNr9GJqPeT7TcuniWSHrl7gHQPnV+AocYMxtWdqLKZNijTvhelMq8cG jXGw== X-Forwarded-Encrypted: i=1; AJvYcCUyse4+Pc9pgzorVx7Qe7cer69Jc/ZlcGU8ZMEVhD6q8TSp1rIXzIemdsrWUcwAfQ+N5UQp0QdVD678fOE=@vger.kernel.org X-Gm-Message-State: AOJu0Yz78XrtHMCVmVzG850pP0T2GHsv+r7j/8mPwMkiTnJ8WqMPeTKG eckYYlCUVmxUQ0OmP1ZKtW8vVdDxIgun2Yci7VqlUtBK3SseH2nG0wq2 X-Gm-Gg: AZuq6aKJBrCaa9/W4NW1xF4NoxTs+UH5WRYhj0OBj1U5O7LSDiEQvg3Vrr60Ez8cnMz HJU1zX4LrbnLoOVOT5QyUbUlv369mp1xFZv68gYOBTDAeGnHx5CgL+ITx9YO/S3heQo/w4btilU W64dFWt4WtEUnb2p30eoCrcc127lhIe6LeMZAsfzSRhLjklM89t2DDdkeDjRdZiT2iP7QLtpb20 eEinWkj44LpmQxxYkykTw968bRFBKeLtwFKGJoMQHtOg2Rn5xPQYtoItr5Ctr9t5G+LFrIBSJiT JjTAPH9CGqe0TI5hx8AyLmVaOSCuLsrmSzIVky8SHMbpZ5BSfBAwjE6eLnZLgpKxyZJbcSK+UML NB0FDMxbFijxS6onjRifY0x7zC8ZwHYA0I35z5OEEXyd0LeiB+em8UyX1Q/8QyQWqPa2ZuVF+8w 2EcaNP3Fm+joNhT2gg/KlTjKEa50xT9yUGvJAtEnyr78pFpDhIe81bVNSEquOjMHpBnIdp+8V25 sg= X-Received: by 2002:a05:7301:6507:b0:2b7:12f8:5eea with SMTP id 5a478bee46e88-2babc3aa7e5mr445529eec.9.1770970372114; Fri, 13 Feb 2026 00:12:52 -0800 (PST) Received: from lappy (108-228-232-20.lightspeed.sndgca.sbcglobal.net. [108.228.232.20]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2ba9dd0a04csm4975052eec.33.2026.02.13.00.12.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Feb 2026 00:12:51 -0800 (PST) From: "Derek J. Clark" To: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Hans de Goede Cc: Mark Pearson , Armin Wolf , Jonathan Corbet , Rong Zhang , Kurt Borja , "Derek J . Clark" , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] platform/x86: lenovo-wmi-other: Add LWMI_ATTR_ID Macro Date: Fri, 13 Feb 2026 08:02:53 +0000 Message-ID: <20260213081243.794288-2-derekjohn.clark@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260213081243.794288-1-derekjohn.clark@gmail.com> References: <20260213081243.794288-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 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. 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 | 32 ++++++---------------- 3 files changed, 16 insertions(+), 23 deletions(-) diff --git a/drivers/platform/x86/lenovo/wmi-capdata.h b/drivers/platform/x= 86/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) =20 +#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 =20 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 { }; =20 enum thermal_mode { + LWMI_GZ_THERMAL_MODE_NONE =3D 0x00, LWMI_GZ_THERMAL_MODE_QUIET =3D 0x01, LWMI_GZ_THERMAL_MODE_BALANCED =3D 0x02, LWMI_GZ_THERMAL_MODE_PERFORMANCE =3D 0x03, diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86= /lenovo/wmi-other.c index 6040f45aa2b0d..559feb49c9f11 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) =20 -#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)) =20 #define LWMI_FAN_DIV 100 =20 @@ -716,12 +715,8 @@ static ssize_t attr_capdata01_show(struct kobject *kob= j, u32 attribute_id; int value, ret; =20 - attribute_id =3D - 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 =3D LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feat= ure_id, + LWMI_GZ_THERMAL_MODE_CUSTOM, tunable_attr->type_id); =20 ret =3D lwmi_cd01_get_data(priv->cd01_list, attribute_id, &capdata); if (ret) @@ -787,11 +782,8 @@ static ssize_t attr_current_value_store(struct kobject= *kobj, if (mode !=3D LWMI_GZ_THERMAL_MODE_CUSTOM) return -EBUSY; =20 - attribute_id =3D - 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); + attribute_id =3D LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feat= ure_id, + mode, tunable_attr->type_id); =20 ret =3D lwmi_cd01_get_data(priv->cd01_list, attribute_id, &capdata); if (ret) @@ -838,7 +830,6 @@ static ssize_t attr_current_value_show(struct kobject *= kobj, struct lwmi_om_priv *priv =3D dev_get_drvdata(tunable_attr->dev); struct wmi_method_args_32 args; enum thermal_mode mode; - u32 attribute_id; int retval; int ret; =20 @@ -846,13 +837,8 @@ static ssize_t attr_current_value_show(struct kobject = *kobj, if (ret) return ret; =20 - attribute_id =3D - 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 =3D attribute_id; + args.arg0 =3D LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature= _id, + mode, tunable_attr->type_id); =20 ret =3D lwmi_dev_evaluate_int(priv->wdev, 0x0, LWMI_FEATURE_VALUE_GET, (unsigned char *)&args, sizeof(args), --=20 2.52.0 From nobody Thu Apr 2 20:28:00 2026 Received: from mail-dy1-f181.google.com (mail-dy1-f181.google.com [74.125.82.181]) (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 0D5C131AA83 for ; Fri, 13 Feb 2026 08:12:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770970375; cv=none; b=iFI/NZcgWMnb6YydJuYuW6BXeyuDxIFPLa8zZNspMXmRsKMZZzrK0GfVHmX0nXhkr/0W0OkJ/A04J6MYLc7ZGFPwaMs/1NX197FHIuhCB5vJEMbLz1QYk2lLrcq1WmhRj8Yzjt2kgTMCBDDtn1RIzqkQrBEz4L/xWca4ZEodIms= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770970375; c=relaxed/simple; bh=KdPkHUHHIgp5cMPFy718m0SBxTLs26+2jU02FqTmmpE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z/y0ieF255EBVWqfzt9QE6QjS8+1WV2v39X+ulHXnlg7HhS51emsmhC87K7lR6sWzcqG3eOu6Te7U/RcTk7g4M52c5REbwlN/HPcQAKk4JWTwcGZSFJBEb896Q85uPgYDQvXokTvvNbpiA5qBGbVLX5InRrsD7ngRZMBWLV1zkc= 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=d7GfOVNT; arc=none smtp.client-ip=74.125.82.181 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="d7GfOVNT" Received: by mail-dy1-f181.google.com with SMTP id 5a478bee46e88-2ba9c484e5eso700945eec.1 for ; Fri, 13 Feb 2026 00:12:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770970373; x=1771575173; 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=WNnTNGaQauNGyuAdgf6YmwFPKlR5RGFWSx3LoZcGKDU=; b=d7GfOVNTY8N6hBdcEMRxLBWReh8Qf/9YmFjd1zbmqo0YmDIDkRnOniHtK1TUA4LW27 Bb+5BuAuZspj01zO82fllQDN0fODktnzct6Sy+y0EC5eGkMc9DgUSGUgERvDi8xa7nDN gMoNpOMGmHjn+XTuId8KShkdhH1pb9qgrZ/2v7fgIlxFylfn9UxYy09mnA2fzhKeiFVt F5YHEeiWAg4Lm1l4j+ju+921FneLaXnn4akpSz5llfRR/Ze3dCFxX1Ejc6ilxJnH+oNn MNF/iQbBAfYxQ6ohFoWl2JC6Qfsdd7qT3d90JD8HjecPtxOo3bUeE0ZtKEocUgLAKCMQ 8yLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770970373; x=1771575173; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=WNnTNGaQauNGyuAdgf6YmwFPKlR5RGFWSx3LoZcGKDU=; b=QI/uuxs8fVoGyhRoJ1htW9ffv0e477aEYnmuo+WmmyT/67q/1kHo1JjdmBO7Z4q8It foswE6G/NNimlfQdaOzlDH/DOqJSRNAxUvhDAhFGE9Xd5Y50RRZsJxMewkHHeqgEQAyG ez7LaUbav+cMNGeLa4fyjgEincaYbVRlN3M6ZF6UlEkVUFjMjIGJBY9fRkNXVWjTfyCB RxBXssdpYgDuPYPNpdHwFYxIMqB0o9+UItucJHV20loT70JfmZCSWokBTJv+GCvRfy4q clMviN9AocvPkZ0rKZ648yL41ju+dWVPRoemMlylBFjvCVSnhile6VkTpdt5ZenwxJ33 e1SA== X-Forwarded-Encrypted: i=1; AJvYcCWSrXXOS7eFPXEh7HEPh+B1NPidMcXGGOFK4NR8h3L/7CeYeZ/Ldf7CikrM1y1xzBqGUnDKDZn7k/DY0Kc=@vger.kernel.org X-Gm-Message-State: AOJu0YyciH90uzoswTIL8wLUYypzWpSn80psAb68LtK3oLUbn4fWjwJg iggo8dtBjNRKIkTIP0nNHdlVsWkukytVMFOPP7XC7KjVVcNAJqifch7e X-Gm-Gg: AZuq6aLf4uripfTY/8YIxJKjS7q4e6w6ItN3caK9OzXdv74j8Uk+ikiFL81bTOlqvWG JAWuvgqVgQ8v++yScuLx5NvsA8WShWellNKE0YJhp2uhoeN1cszERlnjt1Q/ajP8ChOj3iSXAt6 HqzYHN90kpDgAg1YaBdwDyp7CvQxQvioJm0XM2OAx57z6nGExY6mZIhBEIOfDFuZ1mg/H43yUvM kFq3O4iul/PzjOGiA5oLZEW1qcNAyctIIruqgh6/Cu5dzQOBSXupZiaAf2BRDxjHTl9sUy9YqB8 V963XMbE82A6hKBdcYCmeGgCT3mrt0uG+Ty3Xx7jmh2JgIqdQrETzQrmizG9X7weHoDatAuOoR2 2IzFlkyiEbH40Tt2WC52XDuCvY7u6R270The+iTCZOAY9aRJPKpv6Q4eNxU9eQc1UHqx9txz+4i sothtBaFi4DtOhFP1asoYjPmrPDk6TK0UuKmw7rqTrAsD9qyTRQp1jy1ELjGrWyvZsjNbnYgIsd 2A= X-Received: by 2002:a05:7300:1495:b0:2ba:64c6:2cd7 with SMTP id 5a478bee46e88-2babc4a9bc1mr298161eec.32.1770970373133; Fri, 13 Feb 2026 00:12:53 -0800 (PST) Received: from lappy (108-228-232-20.lightspeed.sndgca.sbcglobal.net. [108.228.232.20]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2ba9dd0a04csm4975052eec.33.2026.02.13.00.12.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Feb 2026 00:12:52 -0800 (PST) From: "Derek J. Clark" To: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Hans de Goede Cc: Mark Pearson , Armin Wolf , Jonathan Corbet , Rong Zhang , Kurt Borja , "Derek J . Clark" , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] platform/x86: lenovo-wmi-other: Limit adding attributes to supported devices Date: Fri, 13 Feb 2026 08:02:54 +0000 Message-ID: <20260213081243.794288-3-derekjohn.clark@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260213081243.794288-1-derekjohn.clark@gmail.com> References: <20260213081243.794288-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 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. Reported-by: Kurt Borja Closes: https://lore.kernel.org/platform-driver-x86/DG60P3SHXR8H.3NSEHMZ6J7= XRC@gmail.com/ Signed-off-by: Derek J. Clark --- drivers/platform/x86/lenovo/wmi-other.c | 123 ++++++++++++++++++++---- 1 file changed, 104 insertions(+), 19 deletions(-) diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86= /lenovo/wmi-other.c index 559feb49c9f11..f3f12303e3798 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 de= vice *dev, struct cd_list * /* =3D=3D=3D=3D=3D=3D=3D=3D fw_attributes (component: lenovo-wmi-capdata 0= 1) =3D=3D=3D=3D=3D=3D=3D=3D */ =20 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 */ }; =20 static struct tunable_attr_01 ppt_pl1_spl =3D { @@ -716,7 +717,7 @@ static ssize_t attr_capdata01_show(struct kobject *kobj, int value, ret; =20 attribute_id =3D LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feat= ure_id, - LWMI_GZ_THERMAL_MODE_CUSTOM, tunable_attr->type_id); + tunable_attr->cd_mode_id, tunable_attr->type_id); =20 ret =3D lwmi_cd01_get_data(priv->cd01_list, attribute_id, &capdata); if (ret) @@ -771,7 +772,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; =20 @@ -782,10 +782,10 @@ static ssize_t attr_current_value_store(struct kobjec= t *kobj, if (mode !=3D LWMI_GZ_THERMAL_MODE_CUSTOM) return -EBUSY; =20 - attribute_id =3D LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feat= ure_id, - mode, tunable_attr->type_id); + args.arg0 =3D LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature= _id, + tunable_attr->cd_mode_id, tunable_attr->type_id); =20 - ret =3D lwmi_cd01_get_data(priv->cd01_list, attribute_id, &capdata); + ret =3D lwmi_cd01_get_data(priv->cd01_list, args.arg0, &capdata); if (ret) return ret; =20 @@ -796,7 +796,8 @@ static ssize_t attr_current_value_store(struct kobject = *kobj, if (value < capdata.min_value || value > capdata.max_value) return -EINVAL; =20 - args.arg0 =3D attribute_id; + args.arg0 =3D LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature= _id, + tunable_attr->cv_mode_id, tunable_attr->type_id); args.arg1 =3D value; =20 ret =3D lwmi_dev_evaluate_int(priv->wdev, 0x0, LWMI_FEATURE_VALUE_SET, @@ -830,13 +831,16 @@ static ssize_t attr_current_value_show(struct kobject= *kobj, struct lwmi_om_priv *priv =3D dev_get_drvdata(tunable_attr->dev); struct wmi_method_args_32 args; enum thermal_mode mode; - int retval; - int ret; + int retval, ret; =20 ret =3D lwmi_om_notifier_call(&mode); if (ret) return ret; =20 + /* If "no-mode" is the supported mode, ensure we never send current mode = */ + if (tunable_attr->cv_mode_id =3D=3D LWMI_GZ_THERMAL_MODE_NONE) + mode =3D tunable_attr->cv_mode_id; + args.arg0 =3D LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature= _id, mode, tunable_attr->type_id); =20 @@ -849,6 +853,85 @@ static ssize_t attr_current_value_show(struct kobject = *kobj, return sysfs_emit(buf, "%d\n", retval); } =20 +/** + * lwmi_attr_01_is_supported() - Determine if the given attribute is suppo= rted. + * @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 chec= k if + * there is a corresponding "no-mode" (0x00) entry. If either of those pas= ses, + * check capdata->supported for values > 0. If capdata is available, attem= pt to + * determine the set/get mode for the current value property using a simil= ar + * 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 che= cks + * fail then the attribute is not fully supported. + * + * The probed cd_mode_id/cv_mode_id are stored on the tunable_attr for lat= er + * 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 =3D dev_get_drvdata(tunable_attr->dev); + u8 mode =3D 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 =3D LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature= _id, + mode, tunable_attr->type_id); + + ret =3D 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 =3D LWMI_GZ_THERMAL_MODE_NONE; + goto no_mode_fallback_1; + } + if (ret) + goto not_supported; + if (!capdata.supported) { + ret =3D -EOPNOTSUPP; + goto not_supported; + } + + tunable_attr->cd_mode_id =3D mode; + + /* Determine tunable_attr->cv_mode_id */ + mode =3D LWMI_GZ_THERMAL_MODE_CUSTOM; +no_mode_fallback_2: + args.arg0 =3D LWMI_ATTR_ID(tunable_attr->device_id, tunable_attr->feature= _id, + mode, tunable_attr->type_id); + + ret =3D 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 =3D LWMI_GZ_THERMAL_MODE_NONE; + goto no_mode_fallback_2; + } + if (ret) + goto not_supported; + if (retval =3D=3D 0) { + ret =3D -EOPNOTSUPP; + goto not_supported; + } + + tunable_attr->cv_mode_id =3D mode; + dev_dbg(tunable_attr->dev, "cd_mode_id: %02x%02x%02x%02x, cv_mode_id: %#0= 8x 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) \ { \ @@ -972,19 +1055,21 @@ static int lwmi_om_fw_attr_add(struct lwmi_om_priv *= priv) } =20 for (i =3D 0; i < ARRAY_SIZE(cd01_attr_groups) - 1; i++) { - err =3D 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 =3D &priv->wdev->dev; + if (lwmi_attr_01_is_supported(cd01_attr_groups[i].tunable_attr) > 0) { + err =3D sysfs_create_group(&priv->fw_attr_kset->kobj, + cd01_attr_groups[i].attr_group); + if (err) + goto err_remove_groups; + } } return 0; =20 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); =20 kset_unregister(priv->fw_attr_kset); =20 --=20 2.52.0 From nobody Thu Apr 2 20:28:01 2026 Received: from mail-dy1-f170.google.com (mail-dy1-f170.google.com [74.125.82.170]) (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 76EFF31B104 for ; Fri, 13 Feb 2026 08:12:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770970377; cv=none; b=JpmRKZ+NLahAbnfAP6HcOgAhzL3gMFP9wzJr59dmqXkNiUxLuFHfL3zRJH8O9tLMMGIYnU0KxVQ+BF2hah50NTqwHEs01+0Udj613KBlGXgU4qbD9cAoeu04bAIlWASKiH/IPIn9nWN9uNk/fsO/rxxjP+Wx+g4zMESa5L/wC5M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770970377; c=relaxed/simple; bh=fmD+A79YPX4gn56k6FpDZdnO97Zv8opvZM42tWZtGP0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o+vuxKLpbcTBxNqrSaBH1YY7xWVxbj1IGOrjM7DSPaqcm2grbkhxyV9A2w3DbPzcPP6HOBbMfoE60gl3aUOMMdWz3QaLOaYPyEceyJWBeh+VbepFH8KV6zBF/ASGuXa7UVIhVQbpJ4aRVRvlG89L1BKEBxmFbAWVjNTYwsZHIBc= 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=PWjPS0gy; arc=none smtp.client-ip=74.125.82.170 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="PWjPS0gy" Received: by mail-dy1-f170.google.com with SMTP id 5a478bee46e88-2ba9d13f10eso1201469eec.0 for ; Fri, 13 Feb 2026 00:12:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770970375; x=1771575175; 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=m0fJO7xstvRTrH/FfceNJ+hqYRj6fO5VmJRTZHauNnI=; b=PWjPS0gySpGUUW1+gAIw/IdWjse3mA7jhPuldrLFZ+ahjBjrTRIVi5PmHeq929JRAp 2wPEvWWaamU7Ey+UPLWftSlbNSi/rfWqxzGYIHBfTo/JV5VDw1tquof1GRsLwCKoklqA jULCQoNKSqBSvukDhn6GniA2KRb3assYFWhOzWmO/3/tRuhccgqBJZFwMni52nOOFSw4 +3CiHe2AZMLilw56+YF23P7pMWBcas7/5nQ3taHzWMEn8UDVZJ8mO/mDRwcaVKTu0BIX C7Spa/Bf3/lX+97zE3j7mB1LybkGwBSZNuW7pPLIP2RX98fVY/O6dwOJdYqEPeD73fOd pTDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770970375; x=1771575175; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=m0fJO7xstvRTrH/FfceNJ+hqYRj6fO5VmJRTZHauNnI=; b=jXXnRF/PSHOIWd+5QNNsVHmzim90JYPSiyRQC4PNgfgxEyYY0KReq95V57/eaqJMo4 l0ru8096v1ABiVUlVkVUAfvGLVKclmcYKr0eastbN8wrKDtoPFZI4SB3vq8BRzWyWVGV tVGBEW1IC795ssLuWrsQO5jGAy4b28RNLncVZwVesevGyUsA+pV8D8ZB/FM9z6tp/yno PZvn+bLJXUFeQLqWF4FKZhVR6zXxZSjhDWLMnfnNFejgMazoXlMC5NO0ovao02DsVvzQ B3JtcyjbX0Lq3fytLohK6rBpRNbtjY4xhDU1opHd5A0JaK0gNemnKoOCxy1zGmlDah4W 5Dlg== X-Forwarded-Encrypted: i=1; AJvYcCUcSi6n7evNrOR384ErQ09OYxMSObpK5qOVF5GFq7rj0Pcfr7wxBl65gJi1v7Kz3onkSQU4uP/jKUiYV3U=@vger.kernel.org X-Gm-Message-State: AOJu0Yxx7HV6Z5CkwwedVi+m3Cs6AbNPYNQc0/8uMRX2bFJ2+qYcGJEx dVL3xYtb1i5JsdDFT9LNwCumCdUWvpCBnn56/bRjv8C9ePPIXEa0Qh+H X-Gm-Gg: AZuq6aJsauUOeXQxtane6CZvaF7jgoXewg6M+NPaIhZwfl3J97sZy4Jin/bK9sDo74Q B9xwgZcGikoCUClLRrJf8w85wd0ZQnI7Jsn7uDX38abG/HCnykri+JOL8C4dtbbHl7HNI8DH0fP 773f51h2UaXWT93YPSdf4jcZHI+vOgQJYGaoLftF+xIGl9Yka6m0NEM8nNYQN6Blyju2VUTRIVu ULuiHd4GYUOEopJylH1QG1mnWSF5rFnxYUq5WsAmEU01tewokITzqoBmL0eUK7KX7obmZWXmQaA LNi0KF7wP6KKwPcvJ5NjNYPlvLf7m0C1BX8q11z2IkWqcnDyWNGHKZj+ZEDmo2MbPgq1MoYkcPX scJ2gvhdgtWGAZWGX/SXUXrRr2c92toK7G+tsmOdpWi6I80GwrcftfLcNZjMX+tAK3ZtHL8WmyH 8gHlpsmgux5AqN/hbMjabcPeXjTcPVdtki7yG56juZi2jon0Vw8GaKRYhuxkGSf3BXHy1wzM2DG QY= X-Received: by 2002:a05:693c:2c0b:b0:2ba:931e:7021 with SMTP id 5a478bee46e88-2babc554c70mr346771eec.34.1770970374589; Fri, 13 Feb 2026 00:12:54 -0800 (PST) Received: from lappy (108-228-232-20.lightspeed.sndgca.sbcglobal.net. [108.228.232.20]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2ba9dd0a04csm4975052eec.33.2026.02.13.00.12.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Feb 2026 00:12:53 -0800 (PST) From: "Derek J. Clark" To: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Hans de Goede Cc: Mark Pearson , Armin Wolf , Jonathan Corbet , Rong Zhang , Kurt Borja , "Derek J . Clark" , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] platform/x86: lenovo-wmi-other: Add missing CPU tunable attributes Date: Fri, 13 Feb 2026 08:02:55 +0000 Message-ID: <20260213081243.794288-4-derekjohn.clark@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260213081243.794288-1-derekjohn.clark@gmail.com> References: <20260213081243.794288-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" Use an enum for all device Id's and CPU attribute feature ID's, add missing CPU attributes. 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 | 108 +++++++++++++++++- 3 files changed, 117 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 =20 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 Po= wer Limit - ppt_pl2_sppt: Platform Profile Tracking Slow Package Power Tracking + - ppt_pl2_sppt_cl: Platform Profile Tracking Cross Loading Slow Package T= racking - ppt_pl3_fppt: Platform Profile Tracking Fast Package Power Tracking + - ppt_pl3_fppt_cl: Platform Profile Tracking Cross Loading Fast Package P= ower Tracking + - ppt_pl4_ipl: Platform Profile Trakcing Instantaneous Power Limit + - ppt_pl4_ipl_cl: Platform Profile Tracking Cross Loading Instantaneous P= ower Limit =20 LENOVO_FAN_TEST_DATA ------------------------- diff --git a/drivers/platform/x86/lenovo/wmi-capdata.h b/drivers/platform/x= 86/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)) =20 -#define LWMI_DEVICE_ID_FAN 0x04 +enum lwmi_device_id { + LWMI_DEVICE_ID_CPU =3D 0x01, + LWMI_DEVICE_ID_FAN =3D 0x04, +}; =20 struct component_match; struct device; diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86= /lenovo/wmi-other.c index f3f12303e3798..7713a096077dd 100644 --- a/drivers/platform/x86/lenovo/wmi-other.c +++ b/drivers/platform/x86/lenovo/wmi-other.c @@ -54,15 +54,22 @@ =20 #define LENOVO_OTHER_MODE_GUID "DC2A8805-3A8C-41BA-A6F7-092E0089CD3B" =20 -#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 =3D 0x01, + LWMI_FEATURE_ID_CPU_SPL =3D 0x02, + LWMI_FEATURE_ID_CPU_FPPT =3D 0x03, + LWMI_FEATURE_ID_CPU_TEMP =3D 0x04, + LWMI_FEATURE_ID_CPU_APU =3D 0x05, + LWMI_FEATURE_ID_CPU_CL =3D 0x06, + LWMI_FEATURE_ID_CPU_TAU =3D 0x07, + LWMI_FEATURE_ID_CPU_OC =3D 0x08, + LWMI_FEATURE_ID_CPU_IPL =3D 0x09, +}; =20 #define LWMI_FEATURE_ID_FAN_RPM 0x03 =20 #define LWMI_TYPE_ID_NONE 0x00 +#define LWMI_TYPE_ID_CROSSLOAD 0x01 =20 #define LWMI_FEATURE_VALUE_GET 17 #define LWMI_FEATURE_VALUE_SET 18 @@ -559,18 +566,78 @@ static struct tunable_attr_01 ppt_pl1_spl =3D { .type_id =3D LWMI_TYPE_ID_NONE, }; =20 +static struct tunable_attr_01 ppt_pl1_spl_cl =3D { + .device_id =3D LWMI_DEVICE_ID_CPU, + .feature_id =3D LWMI_FEATURE_ID_CPU_SPL, + .type_id =3D LWMI_TYPE_ID_CROSSLOAD, +}; + static struct tunable_attr_01 ppt_pl2_sppt =3D { .device_id =3D LWMI_DEVICE_ID_CPU, .feature_id =3D LWMI_FEATURE_ID_CPU_SPPT, .type_id =3D LWMI_TYPE_ID_NONE, }; =20 +static struct tunable_attr_01 ppt_pl2_sppt_cl =3D { + .device_id =3D LWMI_DEVICE_ID_CPU, + .feature_id =3D LWMI_FEATURE_ID_CPU_SPPT, + .type_id =3D LWMI_TYPE_ID_CROSSLOAD, +}; + static struct tunable_attr_01 ppt_pl3_fppt =3D { .device_id =3D LWMI_DEVICE_ID_CPU, .feature_id =3D LWMI_FEATURE_ID_CPU_FPPT, .type_id =3D LWMI_TYPE_ID_NONE, }; =20 +static struct tunable_attr_01 ppt_pl3_fppt_cl =3D { + .device_id =3D LWMI_DEVICE_ID_CPU, + .feature_id =3D LWMI_FEATURE_ID_CPU_FPPT, + .type_id =3D LWMI_TYPE_ID_CROSSLOAD, +}; + +static struct tunable_attr_01 cpu_temp =3D { + .device_id =3D LWMI_DEVICE_ID_CPU, + .feature_id =3D LWMI_FEATURE_ID_CPU_TEMP, + .type_id =3D LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 ppt_pl1_apu_spl =3D { + .device_id =3D LWMI_DEVICE_ID_CPU, + .feature_id =3D LWMI_FEATURE_ID_CPU_APU, + .type_id =3D LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 ppt_cpu_cl =3D { + .device_id =3D LWMI_DEVICE_ID_CPU, + .feature_id =3D LWMI_FEATURE_ID_CPU_CL, + .type_id =3D LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 ppt_pl1_tau =3D { + .device_id =3D LWMI_DEVICE_ID_CPU, + .feature_id =3D LWMI_FEATURE_ID_CPU_TAU, + .type_id =3D LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 cpu_oc_stat =3D { + .device_id =3D LWMI_DEVICE_ID_CPU, + .feature_id =3D LWMI_FEATURE_ID_CPU_OC, + .type_id =3D LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 ppt_pl4_ipl =3D { + .device_id =3D LWMI_DEVICE_ID_CPU, + .feature_id =3D LWMI_FEATURE_ID_CPU_IPL, + .type_id =3D LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 ppt_pl4_ipl_cl =3D { + .device_id =3D LWMI_DEVICE_ID_CPU, + .feature_id =3D LWMI_FEATURE_ID_CPU_IPL, + .type_id =3D LWMI_TYPE_ID_CROSSLOAD, +}; + struct capdata01_attr_group { const struct attribute_group *attr_group; struct tunable_attr_01 *tunable_attr; @@ -1011,15 +1078,46 @@ static int lwmi_attr_01_is_supported(struct tunable= _attr_01 *tunable_attr) =20 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"); + =20 static struct capdata01_attr_group cd01_attr_groups[] =3D { { &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 }, {}, }; =20 --=20 2.52.0 From nobody Thu Apr 2 20:28:01 2026 Received: from mail-dy1-f178.google.com (mail-dy1-f178.google.com [74.125.82.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 F1C9331A571 for ; Fri, 13 Feb 2026 08:12:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770970378; cv=none; b=OvTRyoR1/Cxh5k7Jqa3i8fKu20p7AOVF3UkMbA7X3XxabOLyUeym6ALmHsuPR0bZX8yeu47HYlTP8lmJaFqVQx5lrRAd3HTKa9sBZdzZttyTF3pVxNQX95xpC6FN7yyBx6Dyl/molkJoEk8SNnkn/QTSAtSwcuCzrzh5UDLfFOA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770970378; c=relaxed/simple; bh=Za5KHzr/f7M+d+4lyWXl8r0VwhlmX+RGGsnTR6snx/w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uwXWpPIIlg4sLkAELzdXeiHDsbsQnvzgT3Zf+JK76dFL8tjn8O+Z8B4k+e89KV60cWsrTOAzKID3ihcTt5TGddyIdlTv2iq0eXiXtAsEck2LXsEJKCAl58OlygsFyOVK2WAJYz43j8p78TErKaNL9LWKkpRiP9LXZMi9S9owbNQ= 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=H8d2osWV; arc=none smtp.client-ip=74.125.82.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="H8d2osWV" Received: by mail-dy1-f178.google.com with SMTP id 5a478bee46e88-2b86671f87eso1327137eec.0 for ; Fri, 13 Feb 2026 00:12:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770970376; x=1771575176; 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=c6hQTtVYAHyAjOTYDv8Fn9b8616DfgJGuDqU03DkD2M=; b=H8d2osWVHDBu7TLLjdDx2ArMnua3sGNqT1diGP/Y2ZsgDQEjLdSYJsOyLIejIoOeck tr8f4mCoaiyizvM+8GEWMkck8qY1kiQA/IcxubvBv4s/3WFQN4ywTKFP2k3UZO2m86uo AeuqJtRMGTQdI73jVU8SOBIm+2WrZ1lORnrlph+H3Nrc9JRuNja8msHZs5tM1DYHoIRq oSBMbf2D3YjtpH8vU727jzmIjt/u4B8N1bwz1g61SXealCzDB7TwihPM69zsFQpK5i2m 4gTAx1/75jV36GJMwzi/yN/dzq63gJNX+GRflJQnxE1wSE0ad96Anu7wnixZM0yrSrn+ ypEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770970376; x=1771575176; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=c6hQTtVYAHyAjOTYDv8Fn9b8616DfgJGuDqU03DkD2M=; b=cD+mwZ/yIb6rN1aeH8lXp+ffQfaXZpeHc4uSamroWkr7SA5YX3RTZXBuFXVL+/JPRL CcpQNeNTmQX1fcc2yCrTa5ne7m8Lj2PQuBC9+CKPC+aV2IOzaLu3KDDzAeXHtcqxqwAi NVmkVcy2pUUEdPVYPeuyEKpIg7fRb2muMRh8Oma7eM78iB7g7dfanZLPUzGzBy4/r5B8 CbCFgcpO9qUydR45RYJajnv/bMw1fI8ETFIBibmBPIddptyN1aOyy8hnG63Lp+TFVRlr rg3VJPVMx9xWiF1nw5FmD3zyZRZP5YQi+zsf2PzlgTmz7x58JrEsXqWBlR/L5tpNQSfd 9mew== X-Forwarded-Encrypted: i=1; AJvYcCU73WrgxD6EB9QsVFY7xVJ1IA87woNE0KaEY0M+ZUXrYlK8cDa40F6ybTlOLJ7uqeOXSjwR8s2d7TpZoaM=@vger.kernel.org X-Gm-Message-State: AOJu0YzZNeS0wPfb+SBgNFgwwUuQ914IXQDmdeUXuL9Klrj7ZK/XSZst sORKf/ITt8NHuLkSzweWYUrMkRCHwQK0u6tqEHCKHgTXH6bCb0xPP1gA X-Gm-Gg: AZuq6aJQyjSl+/WRHqZsulNTwpzGuZSscDXMHCOOQ6LmW/59jq54STyDwb5xWu4bzFS TIxbQ3zMSmmUQqN1rHgsYYQLBkPbnRf4Fr+gq9pJFFU76f1JISi6PW8uTyyrzENVzxVRYrdQthi qHevPk0o2PnYbb+LFcyKbR3FRPMopX58geie1bbOPRQIX7MPdrtIVo9lpDdg621BStdnwPMcUC3 8vY4WK1yoEtW8Bw75SWZ2rmdTQE355d8QniKGN6eCRBKvVqM5yfSIYE6tvNZb9mBu4KWG6HjHXz qFbZJ7T8SB38azJoK+TqcaXVkVDsxtDySLetW+7zNkceYkhWZEYTnD2mjB/lqbBXxv+mgnxZ/HU MVwChm0FuwGa6XHnGquYXK4C9OWIRygkXeycmESaLJb8AZF64LjsUunUkJcEjygQlnY2h4RjgDp LGbo2TPoML0ikqDyc6tBWzKIuyvjZNOEcptViwHhdkISZn2WaqSr4xmDqELdN+w8PsBOb6EA5rh sg= X-Received: by 2002:a05:7301:1695:b0:2ba:a6e5:4ba7 with SMTP id 5a478bee46e88-2babc4b751emr335906eec.40.1770970376030; Fri, 13 Feb 2026 00:12:56 -0800 (PST) Received: from lappy (108-228-232-20.lightspeed.sndgca.sbcglobal.net. [108.228.232.20]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2ba9dd0a04csm4975052eec.33.2026.02.13.00.12.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Feb 2026 00:12:55 -0800 (PST) From: "Derek J. Clark" To: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Hans de Goede Cc: Mark Pearson , Armin Wolf , Jonathan Corbet , Rong Zhang , Kurt Borja , "Derek J . Clark" , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] platform/x86: lenovo-wmi-other: Add GPU tunable attributes Date: Fri, 13 Feb 2026 08:02:56 +0000 Message-ID: <20260213081243.794288-5-derekjohn.clark@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260213081243.794288-1-derekjohn.clark@gmail.com> References: <20260213081243.794288-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" Use an enum for all GPU attribute feature ID's and add GPU attributes. 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 | 114 ++++++++++++++++++ 3 files changed, 126 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/x= 86/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 @@ =20 enum lwmi_device_id { LWMI_DEVICE_ID_CPU =3D 0x01, + LWMI_DEVICE_ID_GPU =3D 0x02, LWMI_DEVICE_ID_FAN =3D 0x04, }; =20 diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86= /lenovo/wmi-other.c index 7713a096077dd..cc024cb369b0f 100644 --- a/drivers/platform/x86/lenovo/wmi-other.c +++ b/drivers/platform/x86/lenovo/wmi-other.c @@ -66,6 +66,20 @@ enum lwmi_feature_id_cpu { LWMI_FEATURE_ID_CPU_IPL =3D 0x09, }; =20 +enum lwmi_feature_id_gpu { + LWMI_FEATURE_ID_GPU_NV_PPAB =3D 0x01, + LWMI_FEATURE_ID_GPU_NV_CTGP =3D 0x02, + LWMI_FEATURE_ID_GPU_TEMP =3D 0x03, + LWMI_FEATURE_ID_GPU_AC_OFFSET =3D 0x04, + LWMI_FEATURE_ID_GPU_OC =3D 0x05, + LWMI_FEATURE_ID_DGPU_BOOST_CLK =3D 0x06, + LWMI_FEATURE_ID_DGPU_EN =3D 0x07, + LWMI_FEATURE_ID_GPU_MODE =3D 0x08, + LWMI_FEATURE_ID_DGPU_DIDVID =3D 0x09, + LWMI_FEATURE_ID_GPU_NV_BPL =3D 0x0a, + LWMI_FEATURE_ID_GPU_NV_CPU_BOOST =3D 0x0b, +}; + #define LWMI_FEATURE_ID_FAN_RPM 0x03 =20 #define LWMI_TYPE_ID_NONE 0x00 @@ -638,6 +652,72 @@ static struct tunable_attr_01 ppt_pl4_ipl_cl =3D { .type_id =3D LWMI_TYPE_ID_CROSSLOAD, }; =20 +static struct tunable_attr_01 gpu_nv_ppab =3D { + .device_id =3D LWMI_DEVICE_ID_GPU, + .feature_id =3D LWMI_FEATURE_ID_GPU_NV_PPAB, + .type_id =3D LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 gpu_nv_ctgp =3D { + .device_id =3D LWMI_DEVICE_ID_GPU, + .feature_id =3D LWMI_FEATURE_ID_GPU_NV_CTGP, + .type_id =3D LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 gpu_temp =3D { + .device_id =3D LWMI_DEVICE_ID_GPU, + .feature_id =3D LWMI_FEATURE_ID_GPU_TEMP, + .type_id =3D LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 gpu_nv_ac_offset =3D { + .device_id =3D LWMI_DEVICE_ID_GPU, + .feature_id =3D LWMI_FEATURE_ID_GPU_AC_OFFSET, + .type_id =3D LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 gpu_oc_stat =3D { + .device_id =3D LWMI_DEVICE_ID_GPU, + .feature_id =3D LWMI_FEATURE_ID_GPU_OC, + .type_id =3D LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 dgpu_boost_clk =3D { + .device_id =3D LWMI_DEVICE_ID_GPU, + .feature_id =3D LWMI_FEATURE_ID_DGPU_BOOST_CLK, + .type_id =3D LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 dgpu_enable =3D { + .device_id =3D LWMI_DEVICE_ID_GPU, + .feature_id =3D LWMI_FEATURE_ID_DGPU_EN, + .type_id =3D LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 gpu_mode =3D { + .device_id =3D LWMI_DEVICE_ID_GPU, + .feature_id =3D LWMI_FEATURE_ID_GPU_MODE, + .type_id =3D LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 dgpu_didvid =3D { + .device_id =3D LWMI_DEVICE_ID_GPU, + .feature_id =3D LWMI_FEATURE_ID_DGPU_DIDVID, + .type_id =3D LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 gpu_nv_bpl =3D { + .device_id =3D LWMI_DEVICE_ID_GPU, + .feature_id =3D LWMI_FEATURE_ID_GPU_NV_BPL, + .type_id =3D LWMI_TYPE_ID_NONE, +}; + +static struct tunable_attr_01 gpu_nv_cpu_boost =3D { + .device_id =3D LWMI_DEVICE_ID_GPU, + .feature_id =3D LWMI_FEATURE_ID_GPU_NV_CPU_BOOST, + .type_id =3D LWMI_TYPE_ID_NONE, +}; + struct capdata01_attr_group { const struct attribute_group *attr_group; struct tunable_attr_01 *tunable_attr; @@ -1076,6 +1156,7 @@ static int lwmi_attr_01_is_supported(struct tunable_a= ttr_01 *tunable_attr) .name =3D _fsname, .attrs =3D _attrname##_attrs \ } =20 +/* 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", @@ -1103,6 +1184,29 @@ 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"); =20 +/* 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"); =20 static struct capdata01_attr_group cd01_attr_groups[] =3D { { &ppt_pl1_spl_attr_group, &ppt_pl1_spl }, @@ -1118,6 +1222,16 @@ static struct capdata01_attr_group cd01_attr_groups[= ] =3D { { &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 }, {}, }; =20 --=20 2.52.0 From nobody Thu Apr 2 20:28:01 2026 Received: from mail-dy1-f177.google.com (mail-dy1-f177.google.com [74.125.82.177]) (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 5F3AF31BC9E for ; Fri, 13 Feb 2026 08:12:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770970379; cv=none; b=Sr65m2/b4wS03F3TIuYZW3nYw+r8rOTjgtQNGNlLE58RRJBlEaXaghTUj7cAGTs7EPyZwt+1uc0NYfr+lcocA+hiD4ZcwkTRRvWf65r7RCxVu5xbLSr4aNBV7f9eDkiMNqOUNbO6/1gYkiZReWKcSFt2QZwiQovp2LqsVUZfq0s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770970379; c=relaxed/simple; bh=5s9AVwmWrPWvryxVGEWCx5WjMxqO3LeVDb/V+4PkOp4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WtmJG2o+TdtZNQb/JMEQc1LLlqdflshhKohhSvFHqwV3EhwEhrexzKgdWycsYXMWIgJW8KCSDBPC4TThe9ciQVA9YPC2BSIf7cVzz99TY1IxIGyPh09Q8XwnEUlEsDzSMieD6c7aVzYR3zPD8xJ/B4hiN45SfTKuN/xDvEx4eYU= 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=kjumX2Vt; arc=none smtp.client-ip=74.125.82.177 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="kjumX2Vt" Received: by mail-dy1-f177.google.com with SMTP id 5a478bee46e88-2b6b0500e06so737089eec.1 for ; Fri, 13 Feb 2026 00:12:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770970377; x=1771575177; 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=4uyMXxL/35bZXh+M5rpS1MKPDp4yRVwiZedei3Hpg6o=; b=kjumX2VtLVyZJOW8zMClIIRiRgDt657USelkWPbJic8/irSS25EsLFmwp93FTjOeN6 hGr9umDwnyy+ozUG9P4fTG7Gxf5up8fmR3MqsG+YRTRNVUIhqC4ldS8Ja5sMFc35k7ZM s8IG2NQRCsHuGUgdmouTLeVX7ti985w2+8vrZEi6Sj/Nwk+NVWvpnBZZe6x+YyLdeMR9 w9O9P35KiGT7RBnkbLorh7KIU6uTm++0441/yge2TvQgjmqEumn9hQl5f8ACvP+1cv3k ObT25HqlUi15HCuonQwhK/3pFKfkYfAV6RrmoPVqnfUMVTmRTYyQ+qeSzyJOFiX98F+V XF1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770970377; x=1771575177; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=4uyMXxL/35bZXh+M5rpS1MKPDp4yRVwiZedei3Hpg6o=; b=V7X22nMupX8D/dIXC3yGa8Y2ECgB7U4rFwfxJzT/whVC8YLjr7ei7ltkrnwuLED/oP zdQJ6G2IncueG1+8I6Ooe9Ak1t1Aj/ikX/mZ5QvGLLzks9q2YUrGSIS2AIQQdSDg4VJY 8MxPsUvL9tqGnyfRBe76Thv5IpqxX/+m3SngrqgtTl0hJ8lppptfgw0O846shFnDpqkU evjXUxVbPVX3kXzedOSvT9/Ix6fwXUSaZmXRmKIlCOCxd0XoY2X/QJxclYEaEPrxRoP+ ukUu3KMFZrkMQOUGxoWch/hBEGS8I8XlfRIlqW42I+a3+qbwL2jrtlW/UdjnwqikIWLx j5Kg== X-Forwarded-Encrypted: i=1; AJvYcCUKB+nz5N5DjxDEiIHLCc/Am/3A/gpt1hwFECMOgPkh1e+L26eh+UpF/03D17GBYKaqZmdhV6YHk3Jszho=@vger.kernel.org X-Gm-Message-State: AOJu0Yygaytil6jF85a24bIKWe7IGax9Hc/TnqTSrAl1UkcTDkWDzRkY gbDCRL0sfR+W1kXf8vIkH70vpi4QzvqgyncKjzvZqKG9n/gzCFTi6isC X-Gm-Gg: AZuq6aJVbHbkl5f0L4f5YtW3ryAP1heQZ/AjJ0RJE2gM+8CGVIyTe34w6wAii6cx8xg pWYf5AJH6rTo3yp0MHEPmSLUCQsRLIzjOYO3HPR3zPgVEiJbjpc5TuNAss8FOhhQN+V/ssmAj7k MUwZ1W7kAh9o8VnFvGUGwN0r1I0vuh5F21fbNR6Oa0XYudfq0PpSyTyI7J89Sa7sD5Ok7Pm+y5J n13jeHwcwgSyCzbvoKS9B3hwSJ3p4iIWtiG5JuSp0y/NS8hScGc5eCcHHjijgMSRfrM2QL3SqMM BrPrfhfoX0WkjQpFyJzlZxhADA67NGwH6N9qyPwpYMsMkcYc5T2ljBdYwGiQGlhe5aZZGrz5bsQ yxDiY3MXxAvwtp+Md25dG5RHwnIwc8LqRDGluvYhhWR1v0cI0z3R79WzjSUQdIZyqO1OQcBsjYg DQKSvx/9RUwT9cFQrg2JjQJbCw1hSqcHa4OxbRzjVKahm0ETHOeqT6sYiC2MvDsv5cwcYH36s8X gQ= X-Received: by 2002:a05:7301:1688:b0:2ba:7ed9:1565 with SMTP id 5a478bee46e88-2baba125906mr577903eec.36.1770970377456; Fri, 13 Feb 2026 00:12:57 -0800 (PST) Received: from lappy (108-228-232-20.lightspeed.sndgca.sbcglobal.net. [108.228.232.20]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2ba9dd0a04csm4975052eec.33.2026.02.13.00.12.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Feb 2026 00:12:56 -0800 (PST) From: "Derek J. Clark" To: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Hans de Goede Cc: Mark Pearson , Armin Wolf , Jonathan Corbet , Rong Zhang , Kurt Borja , "Derek J . Clark" , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] platform/x86: lenovo-wmi-other: Add WMI battery charge limiting. Date: Fri, 13 Feb 2026 08:02:57 +0000 Message-ID: <20260213081243.794288-6-derekjohn.clark@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260213081243.794288-1-derekjohn.clark@gmail.com> References: <20260213081243.794288-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" 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. The power supply extension requires a name. Instead of adding a third const macro with the same information, replace LWMI_OM_FW_ATTR_BASE_PATH and LWMI_OM_HWMON_NAME with LWMI_OM_NAME and use that everywhere. Signed-off-by: Derek J. Clark --- drivers/platform/x86/lenovo/wmi-capdata.h | 1 + drivers/platform/x86/lenovo/wmi-other.c | 238 +++++++++++++++++++++- 2 files changed, 233 insertions(+), 6 deletions(-) diff --git a/drivers/platform/x86/lenovo/wmi-capdata.h b/drivers/platform/x= 86/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 =3D 0x01, LWMI_DEVICE_ID_GPU =3D 0x02, + LWMI_DEVICE_ID_PSU =3D 0x03, LWMI_DEVICE_ID_FAN =3D 0x04, }; =20 diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86= /lenovo/wmi-other.c index cc024cb369b0f..a1a0638d5ce77 100644 --- a/drivers/platform/x86/lenovo/wmi-other.c +++ b/drivers/platform/x86/lenovo/wmi-other.c @@ -26,6 +26,7 @@ * - binding to Capability Data 00 and Fan */ =20 +#include #include #include #include @@ -42,6 +43,7 @@ #include #include #include +#include #include #include =20 @@ -80,10 +82,17 @@ enum lwmi_feature_id_gpu { LWMI_FEATURE_ID_GPU_NV_CPU_BOOST =3D 0x0b, }; =20 +enum lwmi_feature_id_psu { + LWMI_FEATURE_ID_PSU_INSTANT_MODE =3D 0x01, + LWMI_FEATURE_ID_PSU_CHARGE_MODE =3D 0x02, +}; + #define LWMI_FEATURE_ID_FAN_RPM 0x03 =20 #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 =20 #define LWMI_FEATURE_VALUE_GET 17 #define LWMI_FEATURE_VALUE_SET 18 @@ -91,15 +100,20 @@ enum lwmi_feature_id_gpu { #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 =20 #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)) =20 -#define LWMI_FAN_DIV 100 +#define LWMI_ATTR_ID_PSU(feat, type) \ + LWMI_ATTR_ID(LWMI_DEVICE_ID_PSU, feat, \ + LWMI_GZ_THERMAL_MODE_NONE, type) =20 -#define LWMI_OM_FW_ATTR_BASE_PATH "lenovo-wmi-other" -#define LWMI_OM_HWMON_NAME "lenovo_wmi_other" +#define LWMI_OM_NAME "lenovo-wmi-other" =20 static BLOCKING_NOTIFIER_HEAD(om_chain_head); static DEFINE_IDA(lwmi_om_ida); @@ -139,6 +153,8 @@ struct lwmi_om_priv { bool capdata00_collected : 1; bool capdata_fan_collected : 1; } fan_flags; + + struct acpi_battery_hook battery_hook; }; =20 /* @@ -454,7 +470,7 @@ static void lwmi_om_hwmon_add(struct lwmi_om_priv *priv) } =20 priv->hwmon_dev =3D hwmon_device_register_with_info(&priv->wdev->dev, - LWMI_OM_HWMON_NAME, priv, + LWMI_OM_NAME, priv, &lwmi_om_hwmon_chip_info, NULL); if (IS_ERR(priv->hwmon_dev)) { @@ -563,6 +579,216 @@ static void lwmi_om_fan_info_collect_cd_fan(struct de= vice *dev, struct cd_list * lwmi_om_hwmon_add(priv); } =20 +/* =3D=3D=3D=3D=3D=3D=3D=3D Power Supply Extension (component: lenovo-wmi-= capdata 00) =3D=3D=3D=3D=3D=3D=3D=3D */ + +/** + * 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 =3D data; + struct wmi_method_args_32 args; + u32 retval; + int ret; + + args.arg0 =3D LWMI_ATTR_ID_PSU(LWMI_FEATURE_ID_PSU_INSTANT_MODE, LWMI_TYP= E_ID_PSU_AC); + + ret =3D 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 =3D=3D LWMI_CHARGE_MODE_DISABLED) + val->intval =3D POWER_SUPPLY_CHARGE_TYPE_LONGLIFE; + else + val->intval =3D 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 =3D ext_data; + struct wmi_method_args_32 args; + + args.arg0 =3D LWMI_ATTR_ID_PSU(LWMI_FEATURE_ID_PSU_INSTANT_MODE, LWMI_TYP= E_ID_PSU_AC); + if (val->intval =3D=3D POWER_SUPPLY_CHARGE_TYPE_LONGLIFE) + args.arg1 =3D LWMI_CHARGE_MODE_DISABLED; + else + args.arg1 =3D 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 =3D ext_data; + struct capdata00 capdata; + u32 attribute_id =3D LWMI_ATTR_ID_PSU(LWMI_FEATURE_ID_PSU_INSTANT_MODE, L= WMI_TYPE_ID_PSU_AC); + int ret; + + ret =3D 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[] =3D { + POWER_SUPPLY_PROP_CHARGE_TYPES, +}; + +static const struct power_supply_ext lwmi_psy_ext =3D { + .name =3D LWMI_OM_NAME, + .properties =3D lwmi_psy_ext_props, + .num_properties =3D ARRAY_SIZE(lwmi_psy_ext_props), + .charge_types =3D (BIT(POWER_SUPPLY_CHARGE_TYPE_STANDARD) | + BIT(POWER_SUPPLY_CHARGE_TYPE_LONGLIFE)), + .get_property =3D lwmi_psy_ext_get_prop, + .set_property =3D lwmi_psy_ext_set_prop, + .property_is_writeable =3D 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_batt= ery_hook *hook) +{ + struct lwmi_om_priv *priv =3D container_of(hook, struct lwmi_om_priv, bat= tery_hook); + + return power_supply_register_extension(battery, &lwmi_psy_ext, &priv->wde= v->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_b= attery_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 firs= t, + * 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 =3D context; + *ahand =3D 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 firs= t, + * 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 =3D "VPC2004"; + acpi_handle handle =3D NULL; + int ret; + + /* Deconflict ideapad_laptop driver */ + ret =3D 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 dev= ice.\n"); + return; + } + + /* Add battery hooks */ + priv->battery_hook.add_battery =3D lwmi_add_battery, + priv->battery_hook.remove_battery =3D lwmi_remove_battery, + priv->battery_hook.name =3D "Lenovo WMI Other Battery Extension", + + ret =3D devm_battery_hook_register(&priv->wdev->dev, &priv->battery_hook); + if (ret) + dev_err(&priv->wdev->dev, "Error during battery hook: %i\n", ret); +} + /* =3D=3D=3D=3D=3D=3D=3D=3D fw_attributes (component: lenovo-wmi-capdata 0= 1) =3D=3D=3D=3D=3D=3D=3D=3D */ =20 struct tunable_attr_01 { @@ -1252,8 +1478,7 @@ static int lwmi_om_fw_attr_add(struct lwmi_om_priv *p= riv) =20 priv->fw_attr_dev =3D device_create(&firmware_attributes_class, NULL, MKDEV(0, 0), NULL, "%s-%u", - LWMI_OM_FW_ATTR_BASE_PATH, - priv->ida_id); + LWMI_OM_NAME, priv->ida_id); if (IS_ERR(priv->fw_attr_dev)) { err =3D PTR_ERR(priv->fw_attr_dev); goto err_free_ida; @@ -1345,6 +1570,7 @@ static int lwmi_om_master_bind(struct device *dev) return -ENODEV; =20 lwmi_om_fan_info_collect_cd00(priv); + lwmi_om_ps_ext_init(priv); =20 return lwmi_om_fw_attr_add(priv); } --=20 2.52.0