From nobody Wed Apr 1 09:59:05 2026 Received: from mail-dl1-f41.google.com (mail-dl1-f41.google.com [74.125.82.41]) (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 9C21944D001 for ; Tue, 31 Mar 2026 18:12:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774980742; cv=none; b=l6aeXbUMML3G/A9Fn1fUzEMcZN6h3w/+a+c0JkYYDh3b2P7Hm0qkednP6gNdndV1O0bgaDn5tHcoGqdpMQaWFUtJorIQ3+4u96fOjKnHeBR92qM1gUzqRn1q3egyixdIhLsW7aTD+FUL7Qdz/IUS+lMhgkQb96xIjFRxN5PUZAM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774980742; c=relaxed/simple; bh=Fu/ek430KADbRn8h0UGr5ypTmsSr0+phA+E5WxjUeEM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Xlq/ZyECxEOJfmq/9BfLBMaDlkPMXScc+F8qK9nYwJV1drahT7X+PuKNhCZjI9isZy9YSSfkuxj9Ksk+fNMqEwF2oW2Zuxf+DOq5scmj1Zusp3SLSIKXnR5Ah614IOzNXN2sqAD2ULHm8de3vFUqn9IYTniNrCifxABJ3/pfml4= 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=iGsar7lW; arc=none smtp.client-ip=74.125.82.41 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="iGsar7lW" Received: by mail-dl1-f41.google.com with SMTP id a92af1059eb24-12a695044a4so1010505c88.0 for ; Tue, 31 Mar 2026 11:12:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774980737; x=1775585537; 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=hGJIgsgDX1kdBRC+1ZlZdZ0WISHAWEUEuDLIUw0+Dy8=; b=iGsar7lWKJ8W75mk/y8qVGFBPz9lujJZjGbwggJdtgGw9n1rFByGQzYPWJbSn0GYdR UnnaYABbiN0NabQ4LJ+ZxrcN3upBiIcCp1GBQYK2/ApQ0PO+OoIAQc0YP4ccD0kYifzO EFstqoO0LH8SbS1RFmRjeVBCdAp0BAC4E4qaKVgdIHOt3Dcy05Dcmu0TFoO/RodI9iWX nC4xa/PeDeIX52Bd8LrhEY24O+hDj6TDMVdESsQweHexOs7Dd6Czkeez6oAOHQq6NDY+ qeI+ugcReB4toLMATysoJzFMUea8MskHMEw6s+fP/J4KR2wSYs0jOoC5PqPAZMiJ3LV2 Ic/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774980737; x=1775585537; 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=hGJIgsgDX1kdBRC+1ZlZdZ0WISHAWEUEuDLIUw0+Dy8=; b=sxC2VIgBksW9xuaMRlJlNlBjoD31/3NrUVfeNgo6cGDzSo/pcKba9oGRhDqC3GYQXE JLbFE6vk/k/kZgQi+TYAzdMkmyehx37/kunfTur4Hmu+jcAh/U26kcilhVQk8ajLraSY S3164jzp8kE1//ECEcIerAR3siruqO/fXWN7NWGAj8xozEYn/mXbnr9nBfiUE2074h0l Df5YVxprfLKO/2dSKeFkykew+gOIsMZkHzPQOh6QjVreCQpLKYT3M7q+FxXRrK727H37 OClEsDMFVB65TS5mbvwz80mJbBO0bFRFB29Gt6GnkfGtNpF3mgCJLGB+niDONQcPM0K/ qjNg== X-Forwarded-Encrypted: i=1; AJvYcCV5Z8rWhcutMZ/tDLGDJzdZy5QkeJpH7csj18bth5VFELT/aGhaKzRfRUXXpLc9FSDQnTYFujdrdQHCBek=@vger.kernel.org X-Gm-Message-State: AOJu0Yx1PGk7MBEMXKIImD5V2eVNlOKaZDSMNVecqX9kCJhYAYWpwI++ 8FSd79U/pAChO/V8JRvbvSjFzI9psbDwoWgX1qBozWlhMROAltCBJHJ8 X-Gm-Gg: ATEYQzyFNc+GEQcm9Q1cLGxlfbU1AYQ05WnHCO1GZXDeM4vxtf361f6oxevI1ewI5Bh PwGNWVXh8jFCu7UbWbM6kAMZRAU9L4n6/Q2h7ZuQAzfiwx3vqHIrQ0sVl98u+SnHg+5HldhKcok qif1O/oNTz9TDB/TktJkSCVgUE4DvYPUsfya+l4lcE9/KG2KVDi+6bhxFUdvoS+xctxXCQbjKWw f6wvKn52pBebMaOwmeqWQdw+6AMoI1CN3lxL7JRm66X4IiKvPlPXUYl6dZ7rmDs1cJ0xfKfHV9F fZe/v19+/UrqnoWcHuXl6bEU53IirigvRt9f0HP1yEk/9bVcjz7937jLwLP5AxXHy5kOnpVMcQ3 p9xKYFYMdAtagCIDZS2FDq7CZ8nrr7ihBJtcsv6vA30NkJTF0DZXiyW/KDcsn8E8Bd7BGzAtpyG PpI38Wd/9n5zkqVj7bwAJDd+Fey7pa4DKTFnN7mO/hUMVlXzdZeOEmxkXXsk/zW1dexZ063H8kP 5q5 X-Received: by 2002:a05:7022:ea22:b0:12a:713b:8961 with SMTP id a92af1059eb24-12be6470479mr303818c88.14.1774980736554; Tue, 31 Mar 2026 11:12:16 -0700 (PDT) Received: from lappy (108-228-232-20.lightspeed.sndgca.sbcglobal.net. [108.228.232.20]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12abbe21787sm10769272c88.11.2026.03.31.11.12.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 11:12:16 -0700 (PDT) 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 v6 05/13] platform/x86: lenovo-wmi-other: Add lwmi_attr_id() function Date: Tue, 31 Mar 2026 18:12:00 +0000 Message-ID: <20260331181208.421552-6-derekjohn.clark@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331181208.421552-1-derekjohn.clark@gmail.com> References: <20260331181208.421552-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() function. In the same vein as LWMI_ATTR_ID_FAN_RPM(), but as a generic, to de-duplicate attribute_id assignment biolerplate. Reviewed-by: Rong Zhang Tested-by: Rong Zhang Reviewed-by: Mark Pearson Signed-off-by: Derek J. Clark --- v6: - Move lwmi_attr_id to wmi-capdata.h as static inline. v5: - Move references to cv/cd_mode_id to patch 4/8. - Move lwmi_attr_id to wmi-capdata.c and export with namespace. v4: - Switch from macro to static inline to preserve types. --- drivers/platform/x86/lenovo/wmi-capdata.c | 8 ++--- drivers/platform/x86/lenovo/wmi-capdata.h | 20 ++++++++++++ drivers/platform/x86/lenovo/wmi-other.c | 39 ++++++----------------- 3 files changed, 34 insertions(+), 33 deletions(-) diff --git a/drivers/platform/x86/lenovo/wmi-capdata.c b/drivers/platform/x= 86/lenovo/wmi-capdata.c index ee1fb02d8e31..169665be4dcf 100644 --- a/drivers/platform/x86/lenovo/wmi-capdata.c +++ b/drivers/platform/x86/lenovo/wmi-capdata.c @@ -27,7 +27,6 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt =20 #include -#include #include #include #include @@ -48,6 +47,7 @@ #include =20 #include "wmi-capdata.h" +#include "wmi-helpers.h" =20 #define LENOVO_CAPABILITY_DATA_00_GUID "362A3AFE-3D96-4665-8530-96DAD5BB30= 0E" #define LENOVO_CAPABILITY_DATA_01_GUID "7A8F5407-CB67-4D6E-B547-39B3BE0181= 54" @@ -58,9 +58,9 @@ =20 #define LWMI_FEATURE_ID_FAN_TEST 0x05 =20 -#define LWMI_ATTR_ID_FAN_TEST \ - (FIELD_PREP(LWMI_ATTR_DEV_ID_MASK, LWMI_DEVICE_ID_FAN) | \ - FIELD_PREP(LWMI_ATTR_FEAT_ID_MASK, LWMI_FEATURE_ID_FAN_TEST)) +#define LWMI_ATTR_ID_FAN_TEST \ + lwmi_attr_id(LWMI_DEVICE_ID_FAN, LWMI_FEATURE_ID_FAN_TEST, \ + LWMI_GZ_THERMAL_MODE_NONE, LWMI_TYPE_ID_NONE) =20 enum lwmi_cd_type { LENOVO_CAPABILITY_DATA_00, diff --git a/drivers/platform/x86/lenovo/wmi-capdata.h b/drivers/platform/x= 86/lenovo/wmi-capdata.h index 8c1df3efcc55..1388eaf4ab4a 100644 --- a/drivers/platform/x86/lenovo/wmi-capdata.h +++ b/drivers/platform/x86/lenovo/wmi-capdata.h @@ -6,6 +6,7 @@ #define _LENOVO_WMI_CAPDATA_H_ =20 #include +#include #include =20 #define LWMI_SUPP_VALID BIT(0) @@ -19,6 +20,8 @@ =20 #define LWMI_DEVICE_ID_FAN 0x04 =20 +#define LWMI_TYPE_ID_NONE 0x00 + struct component_match; struct device; struct cd_list; @@ -57,6 +60,23 @@ struct lwmi_cd_binder { cd_list_cb_t cd_fan_list_cb; }; =20 +/** + * lwmi_attr_id() - Formats a capability data attribute ID + * @dev_id: The u8 corresponding to the device ID. + * @feat_id: The u8 corresponding to the feature ID on the device. + * @mode_id: The u8 corresponding to the wmi-gamezone mode for set/get. + * @type_id: The u8 corresponding to the sub-device. + * + * Return: u32. + */ +static inline u32 lwmi_attr_id(u8 dev_id, u8 feat_id, u8 mode_id, u8 type_= id) +{ + return (FIELD_PREP(LWMI_ATTR_DEV_ID_MASK, dev_id) | + FIELD_PREP(LWMI_ATTR_FEAT_ID_MASK, feat_id) | + FIELD_PREP(LWMI_ATTR_MODE_ID_MASK, mode_id) | + FIELD_PREP(LWMI_ATTR_TYPE_ID_MASK, type_id)); +} + void lwmi_cd_match_add_all(struct device *master, struct component_match *= *matchptr); int lwmi_cd00_get_data(struct cd_list *list, u32 attribute_id, struct capd= ata00 *output); int lwmi_cd01_get_data(struct cd_list *list, u32 attribute_id, struct capd= ata01 *output); diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86= /lenovo/wmi-other.c index b24bf98c19ad..d2838ae5934f 100644 --- a/drivers/platform/x86/lenovo/wmi-other.c +++ b/drivers/platform/x86/lenovo/wmi-other.c @@ -27,7 +27,6 @@ */ =20 #include -#include #include #include #include @@ -61,8 +60,6 @@ =20 #define LWMI_FEATURE_ID_FAN_RPM 0x03 =20 -#define LWMI_TYPE_ID_NONE 0x00 - #define LWMI_FEATURE_VALUE_GET 17 #define LWMI_FEATURE_VALUE_SET 18 =20 @@ -72,10 +69,9 @@ =20 #define LWMI_FAN_DIV 100 =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_OM_FW_ATTR_BASE_PATH "lenovo-wmi-other" #define LWMI_OM_HWMON_NAME "lenovo_wmi_other" @@ -714,12 +710,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) @@ -774,7 +766,6 @@ static ssize_t attr_current_value_store(struct kobject = *kobj, struct wmi_method_args_32 args =3D { 0x0, 0x0 }; struct capdata01 capdata; enum thermal_mode mode; - u32 attribute_id; u32 value; int ret; =20 @@ -785,13 +776,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 - 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 lwmi_attr_id(tunable_attr->device_id, tunable_attr->feature= _id, + mode, 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 @@ -802,7 +790,6 @@ 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.arg1 =3D value; =20 ret =3D lwmi_dev_evaluate_int(priv->wdev, 0x0, LWMI_FEATURE_VALUE_SET, @@ -836,7 +823,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 =3D { 0x0, 0x0 }; enum thermal_mode mode; - u32 attribute_id; int retval; int ret; =20 @@ -844,13 +830,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.53.0