From nobody Tue Apr 7 20:06:12 2026 Received: from mail-dl1-f49.google.com (mail-dl1-f49.google.com [74.125.82.49]) (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 7E715383C8D for ; Thu, 12 Mar 2026 03:10:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773285039; cv=none; b=gRplw0s1V3ydP+IG9Xfgu6+/RLJWbqkSYVXSGpIVnRWqP92durfUOyRXmBwCR9N9R7Bxans0PqSN6FhetfbvRQmtbkBLysx5fnm4TCvBI+HNUZdrpEcoaW8iSXwBGKjMBQCvJNZRrGu+MYEmwfT+xiM0OaoFaR1KfeBR7XsEEFM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773285039; c=relaxed/simple; bh=EHszIbgPf3Pj1SlsxCaIWbxPiGpyfzBK/0p9Mu5UyrM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=I0NB6oFcFzb8PNZxwWXjlQOgGlwFkBra4GqWq2vheVC1pUy6WruUJpqxTzSY6ktXlmf2mzPPsnl98kV4WoLkec7oj9tRXwsVB4JEBYukFhMLjGOzQO/lTm6J5Q8gUE6fdHLyhGY23pkXs3kYGxZVD6x/InxXWCevBihWOkDwz6E= 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=Po1+T5zk; arc=none smtp.client-ip=74.125.82.49 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="Po1+T5zk" Received: by mail-dl1-f49.google.com with SMTP id a92af1059eb24-12776bebe9fso1086083c88.1 for ; Wed, 11 Mar 2026 20:10:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773285038; x=1773889838; 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=MPSmt+yaVGqHLHpRv6ym/e/BrIWJwmP5C5mFkiIOv04=; b=Po1+T5zkVfuRvGBP6H7sZpzeNWHHXxIf58IgQbqDO2//WCvB5wMY3OCJujOvC98mbU PyNGwLL9f79Fp0g/9v52WRyVwkLQBgWcx1W68qCVmH9kotnFZp4lWhyVNdlKb2M40Ohh 1637u+yHOgkuXNAuTmlsIL+PqTVW2jKvUjkpukfvX5T2MvqvdZxiYpTi4I8ekoSZGeiU PHXtzEG0udIl9EH6ORZ1pPQ5aW7Jqggmm2sfdekcpsf9yxPDLrdoOnNIkpCGQM2VFkX1 PdwV+0qY13CctTNhZRLDdkvIB4HveZLqoeMPcJNZ85L85K8+21MDLWODEyWvC4rT4ooR Qy4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773285038; x=1773889838; 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=MPSmt+yaVGqHLHpRv6ym/e/BrIWJwmP5C5mFkiIOv04=; b=RjZ6GqOIMgbzWDIjvqSfdF8SPG0jXJ7HHkP1uCBFURjGUIIL2VgnD6hF/w6lcp+ild xbSS+l+DK6/Yz74/AlQdNDbZyRMDDjOMSDt4zr5yKN6cYalhWGYwaaxE66wK0r87vI1p AprHFP6MEaxUGFYIuSSO3ged7PQnJIGWhGlyZUu80xMhu8A6dVLbO43P/7Ymfi4j+duT NpDCzdxn3DMuwV8FVM4SFRpibaztDNmcyLLvTuMsl1QjU9kR4SnSwfufOzHksoBE1IpG A/ssMyl0ZmHeftg1K7AsQ+dUyZYLoX+WsCWLrEqkHh2nIkyelyyZfg3AH5fhvAqfThZH vxgQ== X-Forwarded-Encrypted: i=1; AJvYcCXDXva6SecD1sNwCfFb/JNvoYc4CqVjae0Ak8+sxRov/rrGwc0PatDJ9V73sGylqYwSTGB8RaYM8ctBl0g=@vger.kernel.org X-Gm-Message-State: AOJu0YyPBpxsd7XDewIYA2yLdn02jgALB4cEmz7tWzmq8M+pHe+iNhMs as3XFGLIkBNyIVySWQUhaP7Cxx6Flr9H2+Jc1Xymf/m93ixyp5ICSmRD X-Gm-Gg: ATEYQzz0AOAnYNG9EPgxyiOnhNBktN8zTgzsAP/nbZLACsnMjyX4zUrFE09y+wzT+a7 sLbciu+oXvAFI1eDJPp7lq/XeQtM7jtDglCjgrvbZ4ngtA7LhBXKyaJYtdslE1SufnIML3TXkCY 5lxInH0IiAuwt3otuZD2NBPlad5wF7s4p4Xm/buM0PIixoQYXQlp0yp4A7P+cTx3uxphPD0LEOU D/rD0Z/yyYFwaW1DXadT4YzOnzvOEIbdZLCt64iSG1q81Rnkrl3jUaEVoZlXBI2AHQH8Qx86TrT jToo7EKUfwH4HVR9BZ/dIiyBXlHkdzkwS9p/n/oFVSHIMigSkG+BgNZq9Ugm0AcTYR0wxYQiUHs ZgMyBnTYplHIWAwVMa/hj1DOwQrV9FGMG0avNC2znBtWDNQdbqHbU6FoSFfrBOVEAKshZX5G3Yj dJVTa4HaSWqqNf1fqIAXnlRnaE33kbtEO3FYEWB+rpQXodKVYtecsjHbCjer3/92Cz7AP1PErH+ r2A X-Received: by 2002:a05:7022:4597:b0:11d:c91e:3b58 with SMTP id a92af1059eb24-128e784b84emr2187064c88.39.1773285037502; Wed, 11 Mar 2026 20: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-2be8aa97dcfsm4802495eec.33.2026.03.11.20.10.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 20: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 v4 3/8] platform/x86: lenovo-wmi-other: Add lwmi_attr_id() function Date: Thu, 12 Mar 2026 03:10:27 +0000 Message-ID: <20260312031032.3467565-4-derekjohn.clark@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260312031032.3467565-1-derekjohn.clark@gmail.com> References: <20260312031032.3467565-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 --- v4: - Switch from macro to static inline to preserve types. --- drivers/platform/x86/lenovo/wmi-gamezone.h | 1 + drivers/platform/x86/lenovo/wmi-other.c | 59 +++++++++++++--------- 2 files changed, 35 insertions(+), 25 deletions(-) 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..9fff9c1f768c 100644 --- a/drivers/platform/x86/lenovo/wmi-other.c +++ b/drivers/platform/x86/lenovo/wmi-other.c @@ -73,10 +73,26 @@ =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))) +/** + * 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 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)); +} + +#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" @@ -550,6 +566,8 @@ struct tunable_attr_01 { 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 { @@ -715,12 +733,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 +789,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 +799,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 +813,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, @@ -837,7 +848,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 +855,12 @@ 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); + /* 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; =20 - 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