From nobody Sun Apr 5 21:12:56 2026 Received: from mail-dl1-f45.google.com (mail-dl1-f45.google.com [74.125.82.45]) (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 BB9761519AC for ; Tue, 24 Feb 2026 04:32:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771907530; cv=none; b=q4sV67/roLoFFbg0pQUf/0eRAoU2kJuex1Lmk0dFunTxH6Fpv177Yd2DGlih/UljDh7otRDFkA8KXUSegnrAa0ljnkIgCKOcmyUigoy5tqNJgDgt0iIuqPw9pYQ07yV6hN54ZjrHFGyCJJoq/3c+a9/ZQ+hD9zcVgqSpL/h5eaU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771907530; c=relaxed/simple; bh=LqAU7VJS3qzJAT41dFUmYBdeix9X3weX9TYWggTt6dA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MomOUdRbh2/CpCEN3cIvVpnhB4PoSKtu2lmH4DX5W0nWBZvmHd60yldaI41BM3z40K7Vn8+Wtz0fqI2iWnkWnMVJq5833E48lvuvxfJn3uksRAJB+ub7E61A9poVOdWjMPyqhBUfek0BBlRTwS079iOLo04lEQxcoXwxuWBjOyc= 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=Up+/Jmsc; arc=none smtp.client-ip=74.125.82.45 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="Up+/Jmsc" Received: by mail-dl1-f45.google.com with SMTP id a92af1059eb24-127380532eeso8068790c88.1 for ; Mon, 23 Feb 2026 20:32:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771907528; x=1772512328; 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=eMalNm3TsX32uk+X6/tnYsZe/zOmNCWUKfIF8l7UvOE=; b=Up+/JmscpqsLE2JXSBxNoFbMtiY9zE0kBm4uVGtr+wbPbf1BHU0x6NbKmCMM1Rw/qB bNYeSX24qJ4sMs9NLkdAJsRx5l08xmmiGEk1BQ+h9w0EhvTAiT/brYD9f80PSEzcbDN6 q8sYdYMpnNwFEF0r1pxXuOPT8KapVCbfwSZQrHo4O4SqqpwjUsJSVcRBMhdW0kSo3t+U OWVdAUkcmqs2dQOavk4jxHy5E57nEwsaFVGQbwLRcjIoIkK8i0pjzffGX+kiaXW1SHWw mSjLe2B9jtnzYq6vAQ2kXmT+MX2UNrLFYiYsZ0zh3V4Of4cMUXk7pMqskTLNDaEkodqd Qa6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771907528; x=1772512328; 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=eMalNm3TsX32uk+X6/tnYsZe/zOmNCWUKfIF8l7UvOE=; b=E58NO0Azhxj5GjH1x5nBTHtoRPfZc1FriqPCHIXPCfLnn+7wY4Go07W5f5E14RTBb9 nxax/A7J2CEgvuiy+cZuUfsoUUnAVKrUDr47ndlzhPHzIRtSqfYjHsvUQPGkcEHP7u/8 yfPA+IFFf8QWUk/9upwYhczCKkEx4+01uwl9GqnGYwIet/76Ct3DhPliCUrGuj9fmv5J Fsy86LlE0M8wTumRhgZcOhML206/mmDjFkkeruzs0DZUkmjYuz1CagGx/IvEElxP/51K FCkxuar3r8YNijk/qPryw2m8dw3v28f9RQh1AWq0ZrbQNRly41yj7+qAVv8vQyOBEpyc EA3A== X-Forwarded-Encrypted: i=1; AJvYcCVPQO2DqCtADrhuBM98TH+U47ksD5uolo6+RecfCwZ1aj/y15fjaN3/G+jp+8+RleHl+HrmGxMdbQMcq+k=@vger.kernel.org X-Gm-Message-State: AOJu0YxYTu/vbYRfDhQsuPipUdfulAxgN2UCbHXzra1XkOEoovGXINnA 2aIyOyT1lLNQB2QjmjhqoEh0Sg1mP49qTPBt2spkRaQa55rc2xisJpoM X-Gm-Gg: AZuq6aLDnU7IzVHSMGsqsdtPG6bReqNOvQK99x6L2JnEigrW6cyuhr2mZ8D5RII5cPK 2Mw7N8qVIuS0kce9+fGgRthJw6X8oYGeeWcCf+Xr+PVzbMnv1KyBA6BPvNKcJmcThf5Kz9ost3G 91zbslAw9x93V/cgpvou5XWSAnB8prfy9aF7coKw50UjiEulMHU+XS1uf+QqaCNeggK3LH0au68 6A7oG3qYH8pGtrMG/h8Fm1kdRc3dF77xhZFPmNKNs+8+ZJpjkYPbQR6Ah+iQnptVU5/ZfnSAZIh PG+qq53xDyr3tkAWuyifVU0VGyMXLZ1j2fbY9OVx0JVgxMUeAAwh9ccLYM1JfWgw+PM373u7JRI 286oWsPhqEoO6hYzqWIsrtpuTxIObSgijEyaE3QCMG1lUOixqcFJ1UyvoT+N2tGpSi+HMtqbcfL sPnJ3W3xOZ5/R3w1gwC9uO7sHNWfLHfRygRQsidBSpdSXpKWeuB19PySpoGdB7IednAslCbtCvr Fk= X-Received: by 2002:a05:7022:4584:b0:122:2f4:b24b with SMTP id a92af1059eb24-1276ad1a72bmr4729717c88.25.1771907527861; Mon, 23 Feb 2026 20:32:07 -0800 (PST) Received: from lappy (108-228-232-20.lightspeed.sndgca.sbcglobal.net. [108.228.232.20]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1276af7b4c7sm9607887c88.9.2026.02.23.20.32.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Feb 2026 20:32:07 -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 v3 1/6] platform/x86: lenovo-wmi-other: Add LWMI_ATTR_ID Macro Date: Tue, 24 Feb 2026 04:31:55 +0000 Message-ID: <20260224043200.2680384-2-derekjohn.clark@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260224043200.2680384-1-derekjohn.clark@gmail.com> References: <20260224043200.2680384-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. Reviewed-by: Mark Pearson 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 | 36 ++++++---------------- 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/drivers/platform/x86/lenovo/wmi-capdata.h b/drivers/platform/x= 86/lenovo/wmi-capdata.h index 8c1df3efcc55..27202e2dc8a5 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 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 6040f45aa2b0..95886df39c8d 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) @@ -776,7 +771,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 @@ -787,13 +781,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 @@ -804,7 +795,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, @@ -838,7 +828,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 +835,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