From nobody Fri Apr 3 01:28:26 2026 Received: from mail-dy1-f174.google.com (mail-dy1-f174.google.com [74.125.82.174]) (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 7BE932343BE for ; Sun, 15 Feb 2026 06:13:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771136026; cv=none; b=iMyUwzxFTZkWuC3xFJEgeQtkxafgHZ2JpJ3ps8jdAsR5dxnVhUpFxrSP7vrX+tX0/H6WmdSJk0RSIJu2gHkq5gqhVQ3KIq8ym8uWRQF0QDDaOjA2siSZaEgB23XcAhISiXILESngy9PESn7UjzMYI9LWFejHYe0havcOo0oCfY8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771136026; c=relaxed/simple; bh=7TzMQusOog6JF0pcK98i5bR2p+94x7VAFTBLsStvemY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jw6iTDR9LDDO7fhnDZPS6RV4VQsQ+Hx+G0tv8fxP0f5H8hHCAFFe3ude62x0KhBw32OXl5JV1lDYT1PxPVIAbbbKF80tLJiDGuJI5tqVlmDC1efQIzw1itR2sXfgYXAIKGS/700fyCKu/Ed80Revm3LnGiEmHDxtvOBSgdNk/Rg= 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=l0uqnlAd; arc=none smtp.client-ip=74.125.82.174 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="l0uqnlAd" Received: by mail-dy1-f174.google.com with SMTP id 5a478bee46e88-2ba68df3687so3893042eec.1 for ; Sat, 14 Feb 2026 22:13:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771136024; x=1771740824; 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=Cip+4LCLlCAb7SLYCPAq2l9B4U2w4m4LbqREr4Rxhfw=; b=l0uqnlAdfYFM4x6DDRbtO9S5GA/Oq/wSaJMyNWOEXdoTABAuanMNgVLxt8KP/y91id 5WoZYW3bwsI49S2IIs2lEPkfyzdkDQMhoq8NXAtuH+ZcGimIyKCGip+2Oc41HlIGmAQe ypeZEuTRFtkqQ8T3wmzMzrnbhrqUEGi1nmz1EhslRwobXdP1A551SgSab31PUoAmkcQA /1oSYdk34ffw3HV+1OrgDpGnosc/TxAHnvHbzYWenrhIbZ926qXcyKZg9Bh7QwTrpXcx jyUszDt8O6eTE+RR+3MMBNw2mYuZQw3okuv2tiT+M7xWcK6YoagU+tiKa2bvuBgBXGxF fYTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771136024; x=1771740824; 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=Cip+4LCLlCAb7SLYCPAq2l9B4U2w4m4LbqREr4Rxhfw=; b=e1vTaXoNSEBLjFSv9OzAS6BC54iPyKt073AOOzVjbMhGcs5J13+QybygTGRQrkdFRD PP+jL1OUUOEENLrtXRNKSwB8Hytfa70z+9hvD4f1yV4NCWwgSd0Xon4t2qun5OaFAlTG frbTqDjEAeJC31TjM6enH4R2F/elShVq5QM/8acScgOyhuc1vlJVW5XFPuHsJD3vVPXk xU4YvNOrk8oYCju0NC9346aciWzPP5lRvinivx1vZsis9wti3vfmUje1hf3ovIbRx8Ss SbuaKfpUQI0wXUsVTgRgyXVx1E5K9dTqSCNxsVJ0wA2uhaHo+mtJks0zG1fgpgAXk1Kp noWA== X-Forwarded-Encrypted: i=1; AJvYcCUZWbESGMoZyDL1sJAnxZVtNWxfBNDwwIqMgQYzbY3em0LBvHZ1AGKrglLGBIjcHlrl4T4jCQSPnXK8MAw=@vger.kernel.org X-Gm-Message-State: AOJu0YzJOdL0OI45wiOKKuRbLZAHQQQ5bxallGWT6p3THWATZ9CjbDTV vCB17DMtkb8sxREe4tF421g8yOTqA1EpusWhQPApzpUkzEuaptn+cxBB X-Gm-Gg: AZuq6aI4W6dxDdl/wE7/mdVRKJe8YFuqL4WycbsqfICGkdG9rrMk4zwB8aWDb2acq8u NHB1XeW4BDF1fCSOQTsUui5KZVzh+AX/FylpAtYfVCDqiciZS8nJvvKtcWURuIrs6L42m4gwxKW gM1riq45TnbJUhR5Z83shr/184KarxyaExwA7WfwCrTokP2d+sqzJgirszRZ9537xT7GVDuXehP 9clTulYyLayFLY0j88OoD5HNF6ZYMAiVQtOJoIEgcVvXeSrrfWY9wQv2QUrZEvjIbQNcvQ7v5Wa nH12E+lUCzZc7Fs5rg6VcGXSF7Bsb8GCxvCHATddBlniXRe3YBS7j+s8QQEOHXqdKokfLFhbnNI kR43Rb+F9vVF/3QIS3axBiS8LekCKDETK9cy4H6yLBJiXQS6aAhdQ/bBtZCztmsLvm+wOqBaKje k62pxU5BFyOCo1vylOau1COkWYFYTmf2OEq7v5unsTWAXCEcL8Z6XfQlnDJ0atEQVphlvS08D8e T8= X-Received: by 2002:a05:7301:688c:b0:2ae:5d3b:e1ba with SMTP id 5a478bee46e88-2bac9795c65mr1765212eec.23.1771136023599; Sat, 14 Feb 2026 22:13:43 -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-2bacb577bcasm4759245eec.12.2026.02.14.22.13.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Feb 2026 22:13:43 -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 v2 1/6] platform/x86: lenovo-wmi-other: Add LWMI_ATTR_ID Macro Date: Sun, 15 Feb 2026 06:12:54 +0000 Message-ID: <20260215061339.2842486-2-derekjohn.clark@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260215061339.2842486-1-derekjohn.clark@gmail.com> References: <20260215061339.2842486-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 | 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 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..95886df39c8d2 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), base-commit: 5a5203a45b063a594e89a2aeaf9e4923893a5b4c --=20 2.52.0