From nobody Fri Apr 3 04:38:36 2026 Received: from mail-dy1-f175.google.com (mail-dy1-f175.google.com [74.125.82.175]) (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 91AEF3C65FF for ; Tue, 24 Mar 2026 22:10:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774390240; cv=none; b=qKVm0YLbDYU9KVzYA0c9haPIglm97PswImk5jDXCbBcFls51MFCQ7XIHQsn68lI9v3UchkaLzwoYO8Pd96CTSi+EkOEgzvBNNxfEWi7Vz8WOfohMB+VhHf4IhF4Z7VIE6eOw7adj9Wmk/4EaAOK5GwIZjHsOf6u1AF3EOBuj4Jw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774390240; c=relaxed/simple; bh=Pc3sAaXzwQS4fT6oy/dAnfR9bvz0ywfoOoPIB9D9HNs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N4QFg+QPvjLTMsfhyRewvD9nVcCBMm0rzKhSFHqftYXtKsG1K9zi8hdo/P0OH+B0A+heiHNPu67FbIL0FZ5vMdVZd48jXjk6JeSBwgzESDUdMWgbndkUwGffzag06RfE6KUNecO/vGWGwacX32Ufa1DxSSWi4n78GB8IXgTB5P4= 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=IBdPwVW6; arc=none smtp.client-ip=74.125.82.175 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="IBdPwVW6" Received: by mail-dy1-f175.google.com with SMTP id 5a478bee46e88-2bdcf5970cdso300475eec.0 for ; Tue, 24 Mar 2026 15:10:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774390238; x=1774995038; 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=djDoCNG99snwNhYF4bOVVKdkPIFPpULHg36c9f29rYs=; b=IBdPwVW6llh5cD2KHCXQivbvwbCTB7+LdqV1eNEme+hEQeTER455xLi/PS00tdkwhe 7WEusALWzR+3anRVVOC4Bn3k8qJRKjEpmnFlUp/REH8ASQLURwqMFqlGpb4P6yvZpmyX ptAsSxlcOb/mBqiMqcSA/sQFh1pN40WpcbM6riWbbk0SwN/zAqslmvunI10vsBejyNGd y+BQqKpeztVlNt1xRgCPoX5ox4lPw3s229T/Ns46f7Sa43Y5PpVSvsZW33jzZJgMoSGY tvGZrpwEPDhHPQd1IeKyIDzyw6O7S4YFjobt/iRrjyuUszsfvGApiv4dKAlBzQBfgfI/ XzSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774390238; x=1774995038; 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=djDoCNG99snwNhYF4bOVVKdkPIFPpULHg36c9f29rYs=; b=kip7m8q6mvKsG649K4GIojNFxFfbhITuBzjPOR08/fEz0IPZgEpeJSns2UC8VxqNgh pgNlpVPXkUtxdYpEGwk+4EqrUFvRMCRW8j4Ux9Lrt6irG8lQIT6fVYekU+RdXB9AftpS /wtfd1ge1Sf0M0XRGIKGS5MckD6qLVuPDbl1oM2vq4KBZzDvuA22RJTWLmbGpcRcXm/c p8S54cBb5OE36L5coAJjkk84OT2rSs5PmgpqIspRuIy/vq291eBAeuj/wYvBGfi8SoQu g+B2BKU0donWAix1rbHxJrbfztP20vOK/FpECk8IbBxNbG8bCdQZf6luwM+0ZAlKZWfX Azrw== X-Forwarded-Encrypted: i=1; AJvYcCVdPB2bzou6IVFWyX9tSm7RkJVOrhaLorpAAzhCJy7lR5C048k7IiD1F/P5UzZ+rmAegTexwHUPg2QrXKM=@vger.kernel.org X-Gm-Message-State: AOJu0YxCIROG0baQ+yQwYjFfRkTpEWUOeGv+6TGlnoGq52p9LsSMfFs9 exYxFUACdWteroSZli9h/zj9+0HfgHwIXy9nMNG/NW+PkdxKXNyq1S7M X-Gm-Gg: ATEYQzyTTZd/XHlYrqK2nCkXeZk8gOV6wY/ewgjOKSi4uTEK5VGmPuIzPyI0NRGespm 2jJFFZKrkRHkfIgoZDghQrgCHDFPbRYHuLD0Ln7hOgkKM0e1KYXEQZ+kJfYBaf2LzPVOHewz2g4 YaqoFZhHwnnsd1WEaWQG2JNYmxB5mq3wXH00LoZ7ABynwbo2gzNHpYGUWYuaU1yLkUtDprlVn7u AVcePjRacPJRSMxcQCBI1+AL2OKFxGEcYvVYb2/cHDdV4dLiITUEPsgXkyzWcqUYf3qYvxmNojg mKnO8s3ItPZo9cH2AZnzn5KpJUsN/7sevJlfO82IpBz72/I1QMnEA6RoUFpCE38qvaoOccBJmRt Ldi3PYpy256MRVYOxr9vyylFV/nw7f7CXK31W5DA6BJIyh7c6jWnQrzytkH0Dmu/t8G4lrEHa1x fjZ0WifLfTR/o2QUuNirCntsdnfupSXKc2vi4vPkJWLg5lB/phBGgKCiNECEiaHCKECmGisEb5l nXH X-Received: by 2002:a05:7301:4195:b0:2c1:1a55:e4b7 with SMTP id 5a478bee46e88-2c14b679191mr2371073eec.21.1774390237539; Tue, 24 Mar 2026 15:10:37 -0700 (PDT) Received: from lappy (108-228-232-20.lightspeed.sndgca.sbcglobal.net. [108.228.232.20]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2c10b14c299sm16282832eec.6.2026.03.24.15.10.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2026 15:10:37 -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 v5 3/8] platform/x86: lenovo-wmi-other: Add lwmi_attr_id() function Date: Tue, 24 Mar 2026 22:10:27 +0000 Message-ID: <20260324221032.1333636-4-derekjohn.clark@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260324221032.1333636-1-derekjohn.clark@gmail.com> References: <20260324221032.1333636-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: Mark Pearson Signed-off-by: Derek J. Clark --- 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 | 25 ++++++++++++-- drivers/platform/x86/lenovo/wmi-capdata.h | 3 ++ drivers/platform/x86/lenovo/wmi-gamezone.h | 1 + drivers/platform/x86/lenovo/wmi-other.c | 39 ++++++---------------- 4 files changed, 36 insertions(+), 32 deletions(-) diff --git a/drivers/platform/x86/lenovo/wmi-capdata.c b/drivers/platform/x= 86/lenovo/wmi-capdata.c index ee1fb02d8e31..6cb3665e9399 100644 --- a/drivers/platform/x86/lenovo/wmi-capdata.c +++ b/drivers/platform/x86/lenovo/wmi-capdata.c @@ -48,6 +48,7 @@ #include =20 #include "wmi-capdata.h" +#include "wmi-gamezone.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 +59,27 @@ =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)) +/** + * 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. + */ +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)); +} +EXPORT_SYMBOL_NS_GPL(lwmi_attr_id, "LENOVO_WMI_CAPDATA"); + +#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..b5b6d0305b6a 100644 --- a/drivers/platform/x86/lenovo/wmi-capdata.h +++ b/drivers/platform/x86/lenovo/wmi-capdata.h @@ -19,6 +19,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 +59,7 @@ struct lwmi_cd_binder { cd_list_cb_t cd_fan_list_cb; }; =20 +u32 lwmi_attr_id(u8 dev_id, u8 feat_id, u8 mode_id, u8 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-gamezone.h b/drivers/platform/= x86/lenovo/wmi-gamezone.h index 6b163a5eeb95..ddb919cf6c36 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 c1728c7c2957..7aa512ff1446 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 @@ -62,8 +61,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 @@ -73,10 +70,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" @@ -715,12 +711,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) @@ -775,7 +767,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 @@ -786,13 +777,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 @@ -803,7 +791,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, @@ -837,7 +824,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 @@ -845,13 +831,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