From nobody Wed Dec 17 17:25:04 2025 Received: from fhigh-b2-smtp.messagingengine.com (fhigh-b2-smtp.messagingengine.com [202.12.124.153]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D89E199E94; Sun, 16 Mar 2025 23:07:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.153 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742166461; cv=none; b=IZovFUxe2QSshsq1Wywp1MZP+Y8+dKAo4UXHZMHAOyjrhkk/1eLJPF4TaKe7J8PCDgQadD13OZKiq49pghsQFtzr56htMkvaj5HcriG4AjSy2mGciTbvwW+MPwV+eFieWOwGcgW9OE7Wq+K05men+SGZT50dfgezfY5564Qw53s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742166461; c=relaxed/simple; bh=d/b92CfRATmE2P2AtJzDEumVRBazVBgp1vXAGiCdHAc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gfuLae9nYMjKsM46KEINvKM0w5Lzcw+DL1qUN5njHMI4g44tfqXZalC62hj27xth/HRpWaTCSP4NfeE5q3aTNnt+KtYlKmh8dX8Ba0uiELYOLtxXSf/5wge94cQ9u0cxskKSPQb7NGikioHwQPo6yeVK98pf4j0S8Q8TTwaJfmM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev; spf=none smtp.mailfrom=ljones.dev; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b=S8eWdMra; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=hjP44SDS; arc=none smtp.client-ip=202.12.124.153 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=ljones.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b="S8eWdMra"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="hjP44SDS" Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfhigh.stl.internal (Postfix) with ESMTP id 04614254012D; Sun, 16 Mar 2025 19:07:37 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Sun, 16 Mar 2025 19:07:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ljones.dev; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1742166457; x= 1742252857; bh=VGDTSGCJyo3MwS0CDSBmdsXpWUz6GNW16gOikh8F+a8=; b=S 8eWdMraTt708WLLBt9aPnU5A/stVmgo5J/3wNAb2Hkxhy/8qpCbrYYbNZDFLgmmy bQ2yh3fLwaKFGOz+GB7Ia0Cz8yf/ofxlY8eU4QMPf1qkvUlQKuNSLfRCNzQc76uM Qfq+0mdPs9zQFtD8UkzEWF/YgUs4hspF+Ym4cce/Dz2OZE+T72M6JBZoYsbL95/X +9O/EoYfE0NXnkw0zxd8icM9/tAfQV09WZRB2CFHvkpuUHeE+mMFyMY0763tS01i pBgsK/J1GVMHB8mby3AFKKqQoS2/DW1I5gU5O2fv8KePfW0IXLKW9UDZiH1T1kdJ in9OmYXYIaQSn3sdSDx7Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; t=1742166457; x=1742252857; bh=V GDTSGCJyo3MwS0CDSBmdsXpWUz6GNW16gOikh8F+a8=; b=hjP44SDSA+neCFqNd TA3XUjvjqgu/G1cGfFK9BLOo7hGIsz35rU6uHlT9r7F+bRW6O9gNodZwKSseX6PO 64XZJv6JbV7TFtWpkGzxQ8s9TmyZn+f9tV/fGsUe710yzmZtqpTv5XsW7Z/Y/Wbi lKgPniok5SaB1bGgr1ADcDaCT+/uLFEjMicvT40fCpF8+J+2MLbDcHMHbLhAU77A DQmUrPitPGdu/tHwuax5Zbeo1F8TPL90C5Lc2IXyUjqN1l2YUfSMU3K3A3KijnAl ABqw0w9GW6KsTAKYLSG4M3MHpg0DNxUpWCORHZvt/LIeCMOBRk89M6jJSZ6Ei8NR FnviQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddufeejkeelucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhgggfestdekredtredt tdenucfhrhhomhepnfhukhgvucflohhnvghsuceolhhukhgvsehljhhonhgvshdruggvvh eqnecuggftrfgrthhtvghrnhepueeuleeffeeihfelhffhheelfeffgeetuefhheevkeet uedugfetfeetlefhieejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomheplhhukhgvsehljhhonhgvshdruggvvhdpnhgspghrtghpthhtohepiedp mhhouggvpehsmhhtphhouhhtpdhrtghpthhtoheplhhinhhugidqkhgvrhhnvghlsehvgh gvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtohephhguvghgohgvuggvsehrvgguhhgr thdrtghomhdprhgtphhtthhopehilhhpohdrjhgrrhhvihhnvghnsehlihhnuhigrdhinh htvghlrdgtohhmpdhrtghpthhtohepphhlrghtfhhorhhmqdgurhhivhgvrhdqgiekiees vhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehmrghrihhordhlihhmohhntg hivghllhhosegrmhgurdgtohhmpdhrtghpthhtoheplhhukhgvsehljhhonhgvshdruggv vh X-ME-Proxy: Feedback-ID: i5ec1447f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 16 Mar 2025 19:07:35 -0400 (EDT) From: Luke Jones To: linux-kernel@vger.kernel.org Cc: hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com, platform-driver-x86@vger.kernel.org, mario.limonciello@amd.com, "Luke D. Jones" Subject: [PATCH v7 1/8] platform/x86: asus-wmi: export symbols used for read/write WMI Date: Mon, 17 Mar 2025 12:07:17 +1300 Message-ID: <20250316230724.100165-2-luke@ljones.dev> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250316230724.100165-1-luke@ljones.dev> References: <20250316230724.100165-1-luke@ljones.dev> 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" From: "Luke D. Jones" Export symbols for read/write WMI symbols using a namespace. Existing functions: - asus_wmi_evaluate_method - asus_wmi_set_devstate New function: - asus_wmi_get_devstate_dsts The new function is inteded for use with DSTS WMI method only and avoids requiring the asus_wmi driver data to select the WMI method. Signed-off-by: Luke D. Jones Reviewed-by: Mario Limonciello --- drivers/platform/x86/asus-wmi.c | 45 ++++++++++++++++++++-- include/linux/platform_data/x86/asus-wmi.h | 9 +++++ 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wm= i.c index cbc64d3a22ad..2784b8e6514e 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -389,7 +389,7 @@ int asus_wmi_evaluate_method(u32 method_id, u32 arg0, u= 32 arg1, u32 *retval) { return asus_wmi_evaluate_method3(method_id, arg0, arg1, 0, retval); } -EXPORT_SYMBOL_GPL(asus_wmi_evaluate_method); +EXPORT_SYMBOL_NS_GPL(asus_wmi_evaluate_method, "ASUS_WMI"); =20 static int asus_wmi_evaluate_method5(u32 method_id, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4, u32 *retval) @@ -553,12 +553,51 @@ static int asus_wmi_get_devstate(struct asus_wmi *asu= s, u32 dev_id, u32 *retval) return 0; } =20 -int asus_wmi_set_devstate(u32 dev_id, u32 ctrl_param, - u32 *retval) + +/** + * asus_wmi_get_devstate_dsts() - Get the WMI function state. + * @dev_id: The WMI method ID to call. + * @retval: A pointer to where to store the value returned from WMI. + * + * On success the return value is 0, and the retval is a valid value retur= ned + * by the successful WMI function call otherwise an error is returned if t= he + * call failed, or if the WMI method ID is unsupported. + */ +int asus_wmi_get_devstate_dsts(u32 dev_id, u32 *retval) +{ + int err; + + err =3D asus_wmi_evaluate_method(ASUS_WMI_METHODID_DSTS, dev_id, 0, retva= l); + if (err) + return err; + + if (*retval =3D=3D ASUS_WMI_UNSUPPORTED_METHOD) + return -ENODEV; + + return 0; +} +EXPORT_SYMBOL_NS_GPL(asus_wmi_get_devstate_dsts, "ASUS_WMI"); + +/** + * asus_wmi_set_devstate() - Set the WMI function state. + * @dev_id: The WMI function to call. + * @ctrl_param: The argument to be used for this WMI function. + * @retval: A pointer to where to store the value returned from WMI. + * + * The returned WMI function state if not checked here for error as + * asus_wmi_set_devstate() is not called unless first paired with a call to + * asus_wmi_get_devstate_dsts() to check that the WMI function is supporte= d. + * + * On success the return value is 0, and the retval is a valid value retur= ned + * by the successful WMI function call. An error value is returned only if= the + * WMI function failed. + */ +int asus_wmi_set_devstate(u32 dev_id, u32 ctrl_param, u32 *retval) { return asus_wmi_evaluate_method(ASUS_WMI_METHODID_DEVS, dev_id, ctrl_param, retval); } +EXPORT_SYMBOL_NS_GPL(asus_wmi_set_devstate, "ASUS_WMI"); =20 /* Helper for special devices with magic return codes */ static int asus_wmi_get_devstate_bits(struct asus_wmi *asus, diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/pla= tform_data/x86/asus-wmi.h index a32cb8865b2f..96ff25b2b51b 100644 --- a/include/linux/platform_data/x86/asus-wmi.h +++ b/include/linux/platform_data/x86/asus-wmi.h @@ -160,6 +160,7 @@ #if IS_REACHABLE(CONFIG_ASUS_WMI) void set_ally_mcu_hack(bool enabled); void set_ally_mcu_powersave(bool enabled); +int asus_wmi_get_devstate_dsts(u32 dev_id, u32 *retval); int asus_wmi_set_devstate(u32 dev_id, u32 ctrl_param, u32 *retval); int asus_wmi_evaluate_method(u32 method_id, u32 arg0, u32 arg1, u32 *retva= l); #else @@ -175,6 +176,14 @@ static inline int asus_wmi_set_devstate(u32 dev_id, u3= 2 ctrl_param, u32 *retval) { return -ENODEV; } +static inline int asus_wmi_get_devstate_dsts(u32 dev_id, u32 *retval) +{ + return -ENODEV; +} +static inline int asus_wmi_set_devstate(u32 dev_id, u32 ctrl_param, u32 *r= etval) +{ + return -ENODEV; +} static inline int asus_wmi_evaluate_method(u32 method_id, u32 arg0, u32 ar= g1, u32 *retval) { --=20 2.48.1 From nobody Wed Dec 17 17:25:04 2025 Received: from fhigh-b2-smtp.messagingengine.com (fhigh-b2-smtp.messagingengine.com [202.12.124.153]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D5A21A23A9; Sun, 16 Mar 2025 23:07:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.153 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742166465; cv=none; b=WH1lvcuqIqbVKdQA8A23tsqtIdRtkszvouBheMGOL1bYx186JoZx3hdZLAOHFxi/rFa8nJvexPUlREZ8LKnTho57WfFXXC3O9yFUryHFDIYkVasZojdO1R4gbvr6IxuNZ3wWp03lMpSisQxsCBBi8yQij+C83A8prelNa6mJEtQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742166465; c=relaxed/simple; bh=+2vonMyd63jHKl2JrdfkXjlQfOmOH+6o2IqSfM21cAk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=vCWrB/Nlu2C32e4ICI1ZhMNdRPjzn/HI569RBKIKAXVukNwmyRQIGMhvkvOX3hQAHII0ihT0a9iBxOwbtqflO5LTF/TZ+bXZKZtH+85nDkN0l1wLeBa4MjflwHGs1mLhjaSby9AxdEosWs+Sy3F/ZppbTfEsdd+Ck32YGhOtAjY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev; spf=none smtp.mailfrom=ljones.dev; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b=dmRRuoNC; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=NA2xYPA9; arc=none smtp.client-ip=202.12.124.153 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=ljones.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b="dmRRuoNC"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="NA2xYPA9" Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfhigh.stl.internal (Postfix) with ESMTP id 395BC2540137; Sun, 16 Mar 2025 19:07:41 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Sun, 16 Mar 2025 19:07:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ljones.dev; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1742166461; x=1742252861; bh=AI3T3Cx2wxlC1rDsZaWnY2SWhu4kF1dcxD0n5Df0Iqk=; b= dmRRuoNCNNBJNUrdOZRDgHRsTErcN3J8fKgzy6htn8vVw3irafV1p9VT05n1gKq/ DOMmsjUdRAAKtAzdNqQ31bcH1kTOUe6sMFPAWm+lr5q6Xtl6j9O92MQpzs5LQcA1 6CjLZuydhFuymOTiR1vCw11U2qZqKiMrYsSoqF06mtf5GoI7J/CVHenB6//6SnPF aDlGNJa9285IMf1J80wCrDSwtOVDDb0G7Ft7uV7MlVjVpEZLkB551A2I2UHK7grM j4dFn1pfUZxvaq/UEO3yv4Q+LmHbp3bE2w+IfwY+8rtbBlKdbBYD7z8wk9BT8sXZ qMuKgRcwXLi4tHF6hbh/vw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1742166461; x= 1742252861; bh=AI3T3Cx2wxlC1rDsZaWnY2SWhu4kF1dcxD0n5Df0Iqk=; b=N A2xYPA9hT+k87XyFDOIsDgxgdCWcLYZaYp2vK3NK/dkfD1IXrovZ8iYfgIkC+gUl InuNzGSCtAHAMA4twURJ+AzcMcAGQ9Vd3VqevrJFsHCSe6u02CPr9mhIRgbeUuWQ 9tE/oQHkM9n0PfkvhWVikaDvQiQsEKhkQ4GaL59AVjo2HZgmpUEJK4Cw+QBWxpS1 0h6IjbCOtOYan8ypH92QLxzw7qYPTCjrDsb7wYSGP5hkgHmJ/uIwE8tBC/z+VEW3 WrNuMdKge+IhcetY0nfdT9tEfVUqOnuA78SH4zZ2pZ5SjiRcHNFRWt5mz2cR8dD1 +UsN4vg0rwcQz7nrDdHjA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddufeejkeelucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpefnuhhkvgculfhonhgvshcuoehluhhkvgeslhhjohhnvghsrdguvg hvqeenucggtffrrghtthgvrhhnpeelfeevleeukedtgedvgeegfeetjedthfdthfefleej kefggfelffeliedtledtveenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehluhhkvgeslhhjohhnvghsrdguvghvpdhnsggprhgtphhtthhopeei pdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehlihhnuhigqdhkvghrnhgvlhesvh hgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehhuggvghhovgguvgesrhgvughh rghtrdgtohhmpdhrtghpthhtohepihhlphhordhjrghrvhhinhgvnheslhhinhhugidrih hnthgvlhdrtghomhdprhgtphhtthhopehplhgrthhfohhrmhdqughrihhvvghrqdigkeei sehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtohepmhgrrhhiohdrlhhimhhonh gtihgvlhhlohesrghmugdrtghomhdprhgtphhtthhopehluhhkvgeslhhjohhnvghsrdgu vghv X-ME-Proxy: Feedback-ID: i5ec1447f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 16 Mar 2025 19:07:38 -0400 (EDT) From: Luke Jones To: linux-kernel@vger.kernel.org Cc: hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com, platform-driver-x86@vger.kernel.org, mario.limonciello@amd.com, "Luke D. Jones" Subject: [PATCH v7 2/8] platform/x86: asus-armoury: move existing tunings to asus-armoury module Date: Mon, 17 Mar 2025 12:07:18 +1300 Message-ID: <20250316230724.100165-3-luke@ljones.dev> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250316230724.100165-1-luke@ljones.dev> References: <20250316230724.100165-1-luke@ljones.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: "Luke D. Jones" The fw_attributes_class provides a much cleaner interface to all of the attributes introduced to asus-wmi. This patch moves all of these extra attributes over to fw_attributes_class, and shifts the bulk of these definitions to a new kernel module to reduce the clutter of asus-wmi with the intention of deprecating the asus-wmi attributes in future. The work applies only to WMI methods which don't have a clearly defined place within the sysfs and as a result ended up lumped together in /sys/devices/platform/asus-nb-wmi/ with no standard API. Where possible the fw attrs now implement defaults, min, max, scalar, choices, etc. As en example dgpu_disable becomes: /sys/class/firmware-attributes/asus-armoury/attributes/dgpu_disable/ =E2=94=9C=E2=94=80=E2=94=80 current_value =E2=94=9C=E2=94=80=E2=94=80 display_name =E2=94=9C=E2=94=80=E2=94=80 possible_values =E2=94=94=E2=94=80=E2=94=80 type as do other attributes. Signed-off-by: Luke D. Jones Reviewed-by: Mario Limonciello --- drivers/platform/x86/Kconfig | 12 + drivers/platform/x86/Makefile | 1 + drivers/platform/x86/asus-armoury.c | 545 +++++++++++++++++++++ drivers/platform/x86/asus-armoury.h | 165 +++++++ drivers/platform/x86/asus-wmi.c | 4 - include/linux/platform_data/x86/asus-wmi.h | 3 + 6 files changed, 726 insertions(+), 4 deletions(-) create mode 100644 drivers/platform/x86/asus-armoury.c create mode 100644 drivers/platform/x86/asus-armoury.h diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 0258dd879d64..294364cc7478 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -267,6 +267,18 @@ config ASUS_WIRELESS If you choose to compile this driver as a module the module will be called asus-wireless. =20 +config ASUS_ARMOURY + tristate "ASUS Armoury driver" + depends on ASUS_WMI + select FW_ATTR_CLASS + help + Say Y here if you have a WMI aware Asus machine and would like to use t= he + firmware_attributes API to control various settings typically exposed in + the ASUS Armoury Crate application available on Windows. + + To compile this driver as a module, choose M here: the module will + be called asus-armoury. + config ASUS_WMI tristate "ASUS WMI Driver" depends on ACPI_WMI diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index e1b142947067..fe3e7e7dede8 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -32,6 +32,7 @@ obj-$(CONFIG_APPLE_GMUX) +=3D apple-gmux.o # ASUS obj-$(CONFIG_ASUS_LAPTOP) +=3D asus-laptop.o obj-$(CONFIG_ASUS_WIRELESS) +=3D asus-wireless.o +obj-$(CONFIG_ASUS_ARMOURY) +=3D asus-armoury.o obj-$(CONFIG_ASUS_WMI) +=3D asus-wmi.o obj-$(CONFIG_ASUS_NB_WMI) +=3D asus-nb-wmi.o obj-$(CONFIG_ASUS_TF103C_DOCK) +=3D asus-tf103c-dock.o diff --git a/drivers/platform/x86/asus-armoury.c b/drivers/platform/x86/asu= s-armoury.c new file mode 100644 index 000000000000..46102cd0c00d --- /dev/null +++ b/drivers/platform/x86/asus-armoury.c @@ -0,0 +1,545 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Asus Armoury (WMI) attributes driver. This driver uses the fw_attributes + * class to expose the various WMI functions that many gaming and some + * non-gaming ASUS laptops have available. + * These typically don't fit anywhere else in the sysfs such as under LED = class, + * hwmon or other, and are set in Windows using the ASUS Armoury Crate too= l. + * + * Copyright(C) 2024 Luke Jones + */ + +#include "linux/cleanup.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "asus-armoury.h" +#include "firmware_attributes_class.h" + +#define ASUS_NB_WMI_EVENT_GUID "0B3CBB35-E3C2-45ED-91C2-4C5A6D195D1C" + +#define ASUS_MINI_LED_MODE_MASK 0x03 +/* Standard modes for devices with only on/off */ +#define ASUS_MINI_LED_OFF 0x00 +#define ASUS_MINI_LED_ON 0x01 +/* Like "on" but the effect is more vibrant or brighter */ +#define ASUS_MINI_LED_STRONG_MODE 0x02 +/* New modes for devices with 3 mini-led mode types */ +#define ASUS_MINI_LED_2024_WEAK 0x00 +#define ASUS_MINI_LED_2024_STRONG 0x01 +#define ASUS_MINI_LED_2024_OFF 0x02 + +static struct asus_armoury_priv { + struct device *fw_attr_dev; + struct kset *fw_attr_kset; + + u32 mini_led_dev_id; + u32 gpu_mux_dev_id; +} asus_armoury; + +struct fw_attrs_group { + bool pending_reboot; +}; + +static struct fw_attrs_group fw_attrs =3D { + .pending_reboot =3D false, +}; + +struct asus_attr_group { + const struct attribute_group *attr_group; + u32 wmi_devid; +}; + +static bool asus_wmi_is_present(u32 dev_id) +{ + u32 retval; + int status; + + status =3D asus_wmi_evaluate_method(ASUS_WMI_METHODID_DSTS, dev_id, 0, &r= etval); + pr_debug("%s called (0x%08x), retval: 0x%08x\n", __func__, dev_id, retval= ); + + return status =3D=3D 0 && (retval & ASUS_WMI_DSTS_PRESENCE_BIT); +} + +static void asus_set_reboot_and_signal_event(void) +{ + fw_attrs.pending_reboot =3D true; + kobject_uevent(&asus_armoury.fw_attr_dev->kobj, KOBJ_CHANGE); +} + +static ssize_t pending_reboot_show(struct kobject *kobj, struct kobj_attri= bute *attr, char *buf) +{ + return sysfs_emit(buf, "%d\n", fw_attrs.pending_reboot); +} + +static struct kobj_attribute pending_reboot =3D __ATTR_RO(pending_reboot); + +static bool asus_bios_requires_reboot(struct kobj_attribute *attr) +{ + return !strcmp(attr->attr.name, "gpu_mux_mode"); +} + +static int armoury_wmi_set_devstate(struct kobj_attribute *attr, u32 value= , u32 wmi_dev) +{ + u32 result; + int err; + + err =3D asus_wmi_set_devstate(wmi_dev, value, &result); + if (err) { + pr_err("Failed to set %s: %d\n", attr->attr.name, err); + return err; + } + /* + * !1 is usually considered a fail by ASUS, but some WMI methods do use >= 1 + * to return a status code or similar. + */ + if (result < 1) { + pr_err("Failed to set %s: (result): 0x%x\n", attr->attr.name, result); + return -EIO; + } + + return 0; +} + +/** + * attr_int_store() - Send an int to wmi method, checks if within min/max = exclusive. + * @kobj: Pointer to the driver object. + * @attr: Pointer to the attribute calling this function. + * @buf: The buffer to read from, this is parsed to `int` type. + * @count: Required by sysfs attribute macros, pass in from the callee att= r. + * @min: Minimum accepted value. Below this returns -EINVAL. + * @max: Maximum accepted value. Above this returns -EINVAL. + * @store_value: Pointer to where the parsed value should be stored. + * @wmi_dev: The WMI function ID to use. + * + * This function is intended to be generic so it can be called from any "_= store" + * attribute which works only with integers. The integer to be sent to the= WMI method + * is range checked and an error returned if out of range. + * + * If the value is valid and WMI is success, then the sysfs attribute is n= otified + * and if asus_bios_requires_reboot() is true then reboot attribute is als= o notified. + * + * Returns: Either count, or an error. + */ +static ssize_t attr_uint_store(struct kobject *kobj, struct kobj_attribute= *attr, const char *buf, + size_t count, u32 min, u32 max, u32 *store_value, u32 wmi_dev) +{ + u32 value; + int err; + + err =3D kstrtouint(buf, 10, &value); + if (err) + return err; + + if (value < min || value > max) + return -EINVAL; + + err =3D armoury_wmi_set_devstate(attr, value, wmi_dev); + if (err) + return err; + + if (store_value !=3D NULL) + *store_value =3D value; + sysfs_notify(kobj, NULL, attr->attr.name); + + if (asus_bios_requires_reboot(attr)) + asus_set_reboot_and_signal_event(); + + return count; +} + +static ssize_t enum_type_show(struct kobject *kobj, struct kobj_attribute = *attr, + char *buf) +{ + return sysfs_emit(buf, "enumeration\n"); +} + +/* Mini-LED mode *********************************************************= *****/ +static ssize_t mini_led_mode_current_value_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + u32 value; + int err; + + err =3D asus_wmi_get_devstate_dsts(asus_armoury.mini_led_dev_id, &value); + if (err) + return err; + + value &=3D ASUS_MINI_LED_MODE_MASK; + + /* + * Remap the mode values to match previous generation mini-LED. The last = gen + * WMI 0 =3D=3D off, while on this version WMI 2 =3D=3D off (flipped). + */ + if (asus_armoury.mini_led_dev_id =3D=3D ASUS_WMI_DEVID_MINI_LED_MODE2) { + switch (value) { + case ASUS_MINI_LED_2024_WEAK: + value =3D ASUS_MINI_LED_ON; + break; + case ASUS_MINI_LED_2024_STRONG: + value =3D ASUS_MINI_LED_STRONG_MODE; + break; + case ASUS_MINI_LED_2024_OFF: + value =3D ASUS_MINI_LED_OFF; + break; + } + } + + return sysfs_emit(buf, "%u\n", value); +} + +static ssize_t mini_led_mode_current_value_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t count) +{ + u32 mode; + int err; + + err =3D kstrtou32(buf, 10, &mode); + if (err) + return err; + + if (asus_armoury.mini_led_dev_id =3D=3D ASUS_WMI_DEVID_MINI_LED_MODE && + mode > ASUS_MINI_LED_ON) + return -EINVAL; + if (asus_armoury.mini_led_dev_id =3D=3D ASUS_WMI_DEVID_MINI_LED_MODE2 && + mode > ASUS_MINI_LED_STRONG_MODE) + return -EINVAL; + + /* + * Remap the mode values so expected behaviour is the same as the last + * generation of mini-LED with 0 =3D=3D off, 1 =3D=3D on. + */ + if (asus_armoury.mini_led_dev_id =3D=3D ASUS_WMI_DEVID_MINI_LED_MODE2) { + switch (mode) { + case ASUS_MINI_LED_OFF: + mode =3D ASUS_MINI_LED_2024_OFF; + break; + case ASUS_MINI_LED_ON: + mode =3D ASUS_MINI_LED_2024_WEAK; + break; + case ASUS_MINI_LED_STRONG_MODE: + mode =3D ASUS_MINI_LED_2024_STRONG; + break; + } + } + + err =3D armoury_wmi_set_devstate(attr, mode, asus_armoury.mini_led_dev_id= ); + if (err) + return err; + + sysfs_notify(kobj, NULL, attr->attr.name); + + return count; +} + +static ssize_t mini_led_mode_possible_values_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + switch (asus_armoury.mini_led_dev_id) { + case ASUS_WMI_DEVID_MINI_LED_MODE: + return sysfs_emit(buf, "0;1\n"); + case ASUS_WMI_DEVID_MINI_LED_MODE2: + return sysfs_emit(buf, "0;1;2\n"); + } + + return sysfs_emit(buf, "0\n"); +} + +ATTR_GROUP_ENUM_CUSTOM(mini_led_mode, "mini_led_mode", "Set the mini-LED b= acklight mode"); + +static ssize_t gpu_mux_mode_current_value_store(struct kobject *kobj, + struct kobj_attribute *attr, const char *buf, + size_t count) +{ + int result, err; + u32 optimus; + + err =3D kstrtou32(buf, 10, &optimus); + if (err) + return err; + + if (optimus > 1) + return -EINVAL; + + if (asus_wmi_is_present(ASUS_WMI_DEVID_DGPU)) { + err =3D asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_DGPU, &result); + if (err) + return err; + if (result && !optimus) { + pr_warn("Can not switch MUX to dGPU mode when dGPU is disabled: %02X %0= 2X\n", + result, optimus); + return -ENODEV; + } + } + + if (asus_wmi_is_present(ASUS_WMI_DEVID_EGPU)) { + err =3D asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_EGPU, &result); + if (err) + return err; + if (result && !optimus) { + pr_warn("Can not switch MUX to dGPU mode when eGPU is enabled\n"); + return -ENODEV; + } + } + + err =3D armoury_wmi_set_devstate(attr, optimus, asus_armoury.gpu_mux_dev_= id); + if (err) + return err; + + sysfs_notify(kobj, NULL, attr->attr.name); + asus_set_reboot_and_signal_event(); + + return count; +} +WMI_SHOW_INT(gpu_mux_mode_current_value, "%d\n", asus_armoury.gpu_mux_dev_= id); +ATTR_GROUP_BOOL_CUSTOM(gpu_mux_mode, "gpu_mux_mode", "Set the GPU display = MUX mode"); + +/* + * A user may be required to store the value twice, typical store first, t= hen + * rescan PCI bus to activate power, then store a second time to save corr= ectly. + */ +static ssize_t dgpu_disable_current_value_store(struct kobject *kobj, + struct kobj_attribute *attr, const char *buf, + size_t count) +{ + int result, err; + u32 disable; + + err =3D kstrtou32(buf, 10, &disable); + if (err) + return err; + + if (disable > 1) + return -EINVAL; + + if (asus_armoury.gpu_mux_dev_id) { + err =3D asus_wmi_get_devstate_dsts(asus_armoury.gpu_mux_dev_id, &result); + if (err) + return err; + if (!result && disable) { + pr_warn("Can not disable dGPU when the MUX is in dGPU mode\n"); + return -ENODEV; + } + } + + err =3D armoury_wmi_set_devstate(attr, disable, ASUS_WMI_DEVID_DGPU); + if (err) + return err; + + sysfs_notify(kobj, NULL, attr->attr.name); + + return count; +} +WMI_SHOW_INT(dgpu_disable_current_value, "%d\n", ASUS_WMI_DEVID_DGPU); +ATTR_GROUP_BOOL_CUSTOM(dgpu_disable, "dgpu_disable", "Disable the dGPU"); + +/* The ACPI call to enable the eGPU also disables the internal dGPU */ +static ssize_t egpu_enable_current_value_store(struct kobject *kobj, struc= t kobj_attribute *attr, + const char *buf, size_t count) +{ + int result, err; + u32 enable; + + err =3D kstrtou32(buf, 10, &enable); + if (err) + return err; + + if (enable > 1) + return -EINVAL; + + err =3D asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_EGPU_CONNECTED, &result= ); + if (err) { + pr_warn("Failed to get eGPU connection status: %d\n", err); + return err; + } + + if (asus_armoury.gpu_mux_dev_id) { + err =3D asus_wmi_get_devstate_dsts(asus_armoury.gpu_mux_dev_id, &result); + if (err) { + pr_warn("Failed to get GPU MUX status: %d\n", result); + return result; + } + if (!result && enable) { + pr_warn("Can not enable eGPU when the MUX is in dGPU mode\n"); + return -ENODEV; + } + } + + err =3D armoury_wmi_set_devstate(attr, enable, ASUS_WMI_DEVID_EGPU); + if (err) + return err; + + sysfs_notify(kobj, NULL, attr->attr.name); + + return count; +} +WMI_SHOW_INT(egpu_enable_current_value, "%d\n", ASUS_WMI_DEVID_EGPU); +ATTR_GROUP_BOOL_CUSTOM(egpu_enable, "egpu_enable", "Enable the eGPU (also = disables dGPU)"); + +/* Simple attribute creation */ +ATTR_GROUP_ENUM_INT_RO(charge_mode, "charge_mode", ASUS_WMI_DEVID_CHARGE_M= ODE, "0;1;2", + "Show the current mode of charging"); + +ATTR_GROUP_BOOL_RW(boot_sound, "boot_sound", ASUS_WMI_DEVID_BOOT_SOUND, + "Set the boot POST sound"); +ATTR_GROUP_BOOL_RW(mcu_powersave, "mcu_powersave", ASUS_WMI_DEVID_MCU_POWE= RSAVE, + "Set MCU powersaving mode"); +ATTR_GROUP_BOOL_RW(panel_od, "panel_overdrive", ASUS_WMI_DEVID_PANEL_OD, + "Set the panel refresh overdrive"); +ATTR_GROUP_BOOL_RO(egpu_connected, "egpu_connected", ASUS_WMI_DEVID_EGPU_C= ONNECTED, + "Show the eGPU connection status"); + +/* If an attribute does not require any special case handling add it here = */ +static const struct asus_attr_group armoury_attr_groups[] =3D { + { &egpu_connected_attr_group, ASUS_WMI_DEVID_EGPU_CONNECTED }, + { &egpu_enable_attr_group, ASUS_WMI_DEVID_EGPU }, + { &dgpu_disable_attr_group, ASUS_WMI_DEVID_DGPU }, + + { &charge_mode_attr_group, ASUS_WMI_DEVID_CHARGE_MODE }, + { &boot_sound_attr_group, ASUS_WMI_DEVID_BOOT_SOUND }, + { &mcu_powersave_attr_group, ASUS_WMI_DEVID_MCU_POWERSAVE }, + { &panel_od_attr_group, ASUS_WMI_DEVID_PANEL_OD }, +}; + +static int asus_fw_attr_add(void) +{ + int err, i; + + asus_armoury.fw_attr_dev =3D device_create(&firmware_attributes_class, NU= LL, MKDEV(0, 0), + NULL, "%s", DRIVER_NAME); + if (IS_ERR(asus_armoury.fw_attr_dev)) { + err =3D PTR_ERR(asus_armoury.fw_attr_dev); + goto fail_class_get; + } + + asus_armoury.fw_attr_kset =3D kset_create_and_add("attributes", NULL, + &asus_armoury.fw_attr_dev->kobj); + if (!asus_armoury.fw_attr_kset) { + err =3D -ENOMEM; + goto err_destroy_classdev; + } + + err =3D sysfs_create_file(&asus_armoury.fw_attr_kset->kobj, &pending_rebo= ot.attr); + if (err) { + pr_err("Failed to create sysfs level attributes\n"); + goto err_destroy_kset; + } + + asus_armoury.mini_led_dev_id =3D 0; + if (asus_wmi_is_present(ASUS_WMI_DEVID_MINI_LED_MODE)) + asus_armoury.mini_led_dev_id =3D ASUS_WMI_DEVID_MINI_LED_MODE; + else if (asus_wmi_is_present(ASUS_WMI_DEVID_MINI_LED_MODE2)) + asus_armoury.mini_led_dev_id =3D ASUS_WMI_DEVID_MINI_LED_MODE2; + + if (asus_armoury.mini_led_dev_id) { + err =3D sysfs_create_group(&asus_armoury.fw_attr_kset->kobj, + &mini_led_mode_attr_group); + if (err) { + pr_err("Failed to create sysfs-group for mini_led\n"); + goto err_remove_file; + } + } + + asus_armoury.gpu_mux_dev_id =3D 0; + if (asus_wmi_is_present(ASUS_WMI_DEVID_GPU_MUX)) + asus_armoury.gpu_mux_dev_id =3D ASUS_WMI_DEVID_GPU_MUX; + else if (asus_wmi_is_present(ASUS_WMI_DEVID_GPU_MUX_VIVO)) + asus_armoury.gpu_mux_dev_id =3D ASUS_WMI_DEVID_GPU_MUX_VIVO; + + if (asus_armoury.gpu_mux_dev_id) { + err =3D sysfs_create_group(&asus_armoury.fw_attr_kset->kobj, + &gpu_mux_mode_attr_group); + if (err) { + pr_err("Failed to create sysfs-group for gpu_mux\n"); + goto err_remove_mini_led_group; + } + } + + for (i =3D 0; i < ARRAY_SIZE(armoury_attr_groups); i++) { + if (!asus_wmi_is_present(armoury_attr_groups[i].wmi_devid)) + continue; + + err =3D sysfs_create_group(&asus_armoury.fw_attr_kset->kobj, + armoury_attr_groups[i].attr_group); + if (err) { + pr_err("Failed to create sysfs-group for %s\n", + armoury_attr_groups[i].attr_group->name); + goto err_remove_groups; + } + } + + return 0; + +err_remove_groups: + while (--i >=3D 0) { + if (asus_wmi_is_present(armoury_attr_groups[i].wmi_devid)) + sysfs_remove_group(&asus_armoury.fw_attr_kset->kobj, + armoury_attr_groups[i].attr_group); + } + if (asus_armoury.gpu_mux_dev_id) + sysfs_remove_group(&asus_armoury.fw_attr_kset->kobj, &gpu_mux_mode_attr_= group); +err_remove_mini_led_group: + if (asus_armoury.mini_led_dev_id) + sysfs_remove_group(&asus_armoury.fw_attr_kset->kobj, &mini_led_mode_attr= _group); +err_remove_file: + sysfs_remove_file(&asus_armoury.fw_attr_kset->kobj, &pending_reboot.attr); +err_destroy_kset: + kset_unregister(asus_armoury.fw_attr_kset); +err_destroy_classdev: +fail_class_get: + device_destroy(&firmware_attributes_class, MKDEV(0, 0)); + return err; +} + +/* Init / exit ***********************************************************= *****/ + +static int __init asus_fw_init(void) +{ + char *wmi_uid; + int err; + + wmi_uid =3D wmi_get_acpi_device_uid(ASUS_WMI_MGMT_GUID); + if (!wmi_uid) + return -ENODEV; + + /* + * if equal to "ASUSWMI" then it's DCTS that can't be used for this + * driver, DSTS is required. + */ + if (!strcmp(wmi_uid, ASUS_ACPI_UID_ASUSWMI)) + return -ENODEV; + + err =3D asus_fw_attr_add(); + if (err) + return err; + + return 0; +} + +static void __exit asus_fw_exit(void) +{ + sysfs_remove_file(&asus_armoury.fw_attr_kset->kobj, &pending_reboot.attr); + kset_unregister(asus_armoury.fw_attr_kset); + device_destroy(&firmware_attributes_class, MKDEV(0, 0)); +} + +module_init(asus_fw_init); +module_exit(asus_fw_exit); + +MODULE_IMPORT_NS("ASUS_WMI"); +MODULE_AUTHOR("Luke Jones "); +MODULE_DESCRIPTION("ASUS BIOS Configuration Driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("wmi:" ASUS_NB_WMI_EVENT_GUID); diff --git a/drivers/platform/x86/asus-armoury.h b/drivers/platform/x86/asu= s-armoury.h new file mode 100644 index 000000000000..42c8171e5d8a --- /dev/null +++ b/drivers/platform/x86/asus-armoury.h @@ -0,0 +1,165 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * Definitions for kernel modules using asus-armoury driver + * + * Copyright (c) 2024 Luke Jones + */ + +#ifndef _ASUS_ARMOURY_H_ +#define _ASUS_ARMOURY_H_ + +#include +#include + +#define DRIVER_NAME "asus-armoury" + +#define __ASUS_ATTR_RO(_func, _name) \ + { \ + .attr =3D { .name =3D __stringify(_name), .mode =3D 0444 }, \ + .show =3D _func##_##_name##_show, \ + } + +#define __ASUS_ATTR_RO_AS(_name, _show) \ + { \ + .attr =3D { .name =3D __stringify(_name), .mode =3D 0444 }, \ + .show =3D _show, \ + } + +#define __ASUS_ATTR_RW(_func, _name) \ + __ATTR(_name, 0644, _func##_##_name##_show, _func##_##_name##_store) + +#define __WMI_STORE_INT(_attr, _min, _max, _wmi) \ + static ssize_t _attr##_store(struct kobject *kobj, \ + struct kobj_attribute *attr, \ + const char *buf, size_t count) \ + { \ + return attr_uint_store(kobj, attr, buf, count, _min, \ + _max, NULL, _wmi); \ + } + +#define WMI_SHOW_INT(_attr, _fmt, _wmi) \ + static ssize_t _attr##_show(struct kobject *kobj, \ + struct kobj_attribute *attr, char *buf) \ + { \ + u32 result; \ + int err; \ + \ + err =3D asus_wmi_get_devstate_dsts(_wmi, &result); \ + if (err) \ + return err; \ + return sysfs_emit(buf, _fmt, \ + result & ~ASUS_WMI_DSTS_PRESENCE_BIT); \ + } + +/* Create functions and attributes for use in other macros or on their own= */ + +/* Shows a formatted static variable */ +#define __ATTR_SHOW_FMT(_prop, _attrname, _fmt, _val) \ + static ssize_t _attrname##_##_prop##_show( \ + struct kobject *kobj, struct kobj_attribute *attr, char *buf) \ + { \ + return sysfs_emit(buf, _fmt, _val); \ + } \ + static struct kobj_attribute attr_##_attrname##_##_prop =3D \ + __ASUS_ATTR_RO(_attrname, _prop) + + +#define __ATTR_RO_INT_GROUP_ENUM(_attrname, _wmi, _fsname, _possible, _dis= pname)\ + WMI_SHOW_INT(_attrname##_current_value, "%d\n", _wmi); \ + static struct kobj_attribute attr_##_attrname##_current_value =3D \ + __ASUS_ATTR_RO(_attrname, current_value); \ + __ATTR_SHOW_FMT(display_name, _attrname, "%s\n", _dispname); \ + __ATTR_SHOW_FMT(possible_values, _attrname, "%s\n", _possible); \ + static struct kobj_attribute attr_##_attrname##_type =3D \ + __ASUS_ATTR_RO_AS(type, enum_type_show); \ + static struct attribute *_attrname##_attrs[] =3D { \ + &attr_##_attrname##_current_value.attr, \ + &attr_##_attrname##_display_name.attr, \ + &attr_##_attrname##_possible_values.attr, \ + &attr_##_attrname##_type.attr, \ + NULL \ + }; \ + static const struct attribute_group _attrname##_attr_group =3D { \ + .name =3D _fsname, .attrs =3D _attrname##_attrs \ + } + +#define __ATTR_RW_INT_GROUP_ENUM(_attrname, _minv, _maxv, _wmi, _fsname,\ + _possible, _dispname) \ + __WMI_STORE_INT(_attrname##_current_value, _minv, _maxv, _wmi); \ + WMI_SHOW_INT(_attrname##_current_value, "%d\n", _wmi); \ + static struct kobj_attribute attr_##_attrname##_current_value =3D \ + __ASUS_ATTR_RW(_attrname, current_value); \ + __ATTR_SHOW_FMT(display_name, _attrname, "%s\n", _dispname); \ + __ATTR_SHOW_FMT(possible_values, _attrname, "%s\n", _possible); \ + static struct kobj_attribute attr_##_attrname##_type =3D \ + __ASUS_ATTR_RO_AS(type, enum_type_show); \ + static struct attribute *_attrname##_attrs[] =3D { \ + &attr_##_attrname##_current_value.attr, \ + &attr_##_attrname##_display_name.attr, \ + &attr_##_attrname##_possible_values.attr, \ + &attr_##_attrname##_type.attr, \ + NULL \ + }; \ + static const struct attribute_group _attrname##_attr_group =3D { \ + .name =3D _fsname, .attrs =3D _attrname##_attrs \ + } + +/* Boolean style enumeration, base macro. Requires adding show/store */ +#define __ATTR_GROUP_ENUM(_attrname, _fsname, _possible, _dispname) \ + __ATTR_SHOW_FMT(display_name, _attrname, "%s\n", _dispname); \ + __ATTR_SHOW_FMT(possible_values, _attrname, "%s\n", _possible); \ + static struct kobj_attribute attr_##_attrname##_type =3D \ + __ASUS_ATTR_RO_AS(type, enum_type_show); \ + static struct attribute *_attrname##_attrs[] =3D { \ + &attr_##_attrname##_current_value.attr, \ + &attr_##_attrname##_display_name.attr, \ + &attr_##_attrname##_possible_values.attr, \ + &attr_##_attrname##_type.attr, \ + NULL \ + }; \ + static const struct attribute_group _attrname##_attr_group =3D { \ + .name =3D _fsname, .attrs =3D _attrname##_attrs \ + } + +#define ATTR_GROUP_BOOL_RO(_attrname, _fsname, _wmi, _dispname) \ + __ATTR_RO_INT_GROUP_ENUM(_attrname, _wmi, _fsname, "0;1", _dispname) + + +#define ATTR_GROUP_BOOL_RW(_attrname, _fsname, _wmi, _dispname) \ + __ATTR_RW_INT_GROUP_ENUM(_attrname, 0, 1, _wmi, _fsname, "0;1", _dispname) + +#define ATTR_GROUP_ENUM_INT_RO(_attrname, _fsname, _wmi, _possible, _dispn= ame) \ + __ATTR_RO_INT_GROUP_ENUM(_attrname, _wmi, _fsname, _possible, _dispname) + +/* + * Requires _current_value_show(), _current_value_show() + */ +#define ATTR_GROUP_BOOL_CUSTOM(_attrname, _fsname, _dispname) \ + static struct kobj_attribute attr_##_attrname##_current_value =3D \ + __ASUS_ATTR_RW(_attrname, current_value); \ + __ATTR_GROUP_ENUM(_attrname, _fsname, "0;1", _dispname) + +/* + * Requires _current_value_show(), _current_value_show() + * and _possible_values_show() + */ +#define ATTR_GROUP_ENUM_CUSTOM(_attrname, _fsname, _dispname) \ + __ATTR_SHOW_FMT(display_name, _attrname, "%s\n", _dispname); \ + static struct kobj_attribute attr_##_attrname##_current_value =3D \ + __ASUS_ATTR_RW(_attrname, current_value); \ + static struct kobj_attribute attr_##_attrname##_possible_values =3D \ + __ASUS_ATTR_RO(_attrname, possible_values); \ + static struct kobj_attribute attr_##_attrname##_type =3D \ + __ASUS_ATTR_RO_AS(type, enum_type_show); \ + static struct attribute *_attrname##_attrs[] =3D { \ + &attr_##_attrname##_current_value.attr, \ + &attr_##_attrname##_display_name.attr, \ + &attr_##_attrname##_possible_values.attr, \ + &attr_##_attrname##_type.attr, \ + NULL \ + }; \ + static const struct attribute_group _attrname##_attr_group =3D { \ + .name =3D _fsname, .attrs =3D _attrname##_attrs \ + } + +#endif /* _ASUS_ARMOURY_H_ */ diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wm= i.c index 2784b8e6514e..e2ac3f20760a 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -55,8 +55,6 @@ module_param(fnlock_default, bool, 0444); #define to_asus_wmi_driver(pdrv) \ (container_of((pdrv), struct asus_wmi_driver, platform_driver)) =20 -#define ASUS_WMI_MGMT_GUID "97845ED0-4E6D-11DE-8A39-0800200C9A66" - #define NOTIFY_BRNUP_MIN 0x11 #define NOTIFY_BRNUP_MAX 0x1f #define NOTIFY_BRNDOWN_MIN 0x20 @@ -105,8 +103,6 @@ module_param(fnlock_default, bool, 0444); #define USB_INTEL_XUSB2PR 0xD0 #define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI 0x9c31 =20 -#define ASUS_ACPI_UID_ASUSWMI "ASUSWMI" - #define WMI_EVENT_MASK 0xFFFF =20 #define FAN_CURVE_POINTS 8 diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/pla= tform_data/x86/asus-wmi.h index 96ff25b2b51b..4574e30c53fc 100644 --- a/include/linux/platform_data/x86/asus-wmi.h +++ b/include/linux/platform_data/x86/asus-wmi.h @@ -6,6 +6,9 @@ #include #include =20 +#define ASUS_WMI_MGMT_GUID "97845ED0-4E6D-11DE-8A39-0800200C9A66" +#define ASUS_ACPI_UID_ASUSWMI "ASUSWMI" + /* WMI Methods */ #define ASUS_WMI_METHODID_SPEC 0x43455053 /* BIOS SPECification */ #define ASUS_WMI_METHODID_SFBD 0x44424653 /* Set First Boot Device */ --=20 2.48.1 From nobody Wed Dec 17 17:25:04 2025 Received: from fout-b2-smtp.messagingengine.com (fout-b2-smtp.messagingengine.com [202.12.124.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 910841DDC1A; Sun, 16 Mar 2025 23:07:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742166468; cv=none; b=UNe0s5wupUhUOeQXTbnbzHrIrltn/1EAAoYikTpfl77BftSNptEYoo1F8udG8COar+p9Qk8J4LupPwsWp650866xtRU+V7TaLq+kIhiIu982NW3kOuwaDX1GHvrOsFRw03ZRsf7QnQjBPQ+0ZzSPtiS6Dhx0wpq1+VXGtbIz/1M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742166468; c=relaxed/simple; bh=46WnLkXBCC8Q4qk/P/AsPz+rSo/E7tQn0RARj7ZttOM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MlhTY3Ua35z0m7qSrLENo/ZDS5rsE8xexV6+p/IzgDcz3fF1CcosAe+ZH44xTRlKdQqeT0ty0/eFjZFq9ys6jWoPbvJ1I6oEaTX8gxwO2FZBgtd12XdI2JjFcHHoSuBpNj0B5gto86ulsjBVlNO2NHM3GMlriPxRGhJ373/gI6k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev; spf=none smtp.mailfrom=ljones.dev; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b=VyyyRA5d; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=bdiNXqVm; arc=none smtp.client-ip=202.12.124.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=ljones.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b="VyyyRA5d"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="bdiNXqVm" Received: from phl-compute-09.internal (phl-compute-09.phl.internal [10.202.2.49]) by mailfout.stl.internal (Postfix) with ESMTP id 6A8CC114012A; Sun, 16 Mar 2025 19:07:44 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-09.internal (MEProxy); Sun, 16 Mar 2025 19:07:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ljones.dev; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1742166464; x= 1742252864; bh=vGeBk46c9FNFYWuKCM05ZhwpfTPJVFkWFqmzYRnfcCA=; b=V yyyRA5daeHGLFbp31HoFKfugHO0MqjGiNT7N1xII0zgiAi3kn0VrtfA1r9O2D5lT qyhTtGqGHBnfU8/fNps0MnmzqRVyoSkccu660jyQsDuvpMh0LDAdTYobci7Rn4lo bUufiV0svsp13kgmepPzyrAvb5SIQZubrFqACb4i9cx6afKfcrirSRZB9ztzfBXu EOsg1z9AwpCxAlRR+y1IbpMPWAZiKdQy+udvT4U48XoJRQxuYdaWNANbYg37nvp4 cJy0xnQDa5WBvMC80pMkTG27Dy31PPStx/2vGkylSZT9/7SyHyraJRcrmwTCCzjA aCyq512MXMeDJZY/JPOGw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; t=1742166464; x=1742252864; bh=v GeBk46c9FNFYWuKCM05ZhwpfTPJVFkWFqmzYRnfcCA=; b=bdiNXqVmKpmiQAMoG xSoT9lCnaH3wL6Ertxkkg54thmhaYSY0Jl+lqR0dSf9CgbYhRq/B0TQ2DBVklv8s nVDrG6tmA6+jYUo3dd/NDxD7TkGqNeQIzQUxcE1ahD7MAVfhLV04ifajSQh79F2U 449rFfZ9zRJlUuSD4fUyoKcSAPbdlvAKY11HKxnjNbd5TO/s7GBkUIvnzNjKpngO 6ES+r1VATOmVk4rA0SsGEqq16VEZX3U+xpr4yLRoYmGjJeJtk9vxqAJx+qBTL1f0 chEo6uleKBgmXiSUjO/IkHanH6JVNHNz7ifuH1akzHO8o7DJnpnYYi9XgteZM8x7 V8PyA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddufeejkeelucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhgggfestdekredtredt tdenucfhrhhomhepnfhukhgvucflohhnvghsuceolhhukhgvsehljhhonhgvshdruggvvh eqnecuggftrfgrthhtvghrnhepueeuleeffeeihfelhffhheelfeffgeetuefhheevkeet uedugfetfeetlefhieejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomheplhhukhgvsehljhhonhgvshdruggvvhdpnhgspghrtghpthhtohepiedp mhhouggvpehsmhhtphhouhhtpdhrtghpthhtoheplhhinhhugidqkhgvrhhnvghlsehvgh gvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtohephhguvghgohgvuggvsehrvgguhhgr thdrtghomhdprhgtphhtthhopehilhhpohdrjhgrrhhvihhnvghnsehlihhnuhigrdhinh htvghlrdgtohhmpdhrtghpthhtohepphhlrghtfhhorhhmqdgurhhivhgvrhdqgiekiees vhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehmrghrihhordhlihhmohhntg hivghllhhosegrmhgurdgtohhmpdhrtghpthhtoheplhhukhgvsehljhhonhgvshdruggv vh X-ME-Proxy: Feedback-ID: i5ec1447f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 16 Mar 2025 19:07:41 -0400 (EDT) From: Luke Jones To: linux-kernel@vger.kernel.org Cc: hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com, platform-driver-x86@vger.kernel.org, mario.limonciello@amd.com, "Luke D. Jones" Subject: [PATCH v7 3/8] platform/x86: asus-armoury: add panel_hd_mode attribute Date: Mon, 17 Mar 2025 12:07:19 +1300 Message-ID: <20250316230724.100165-4-luke@ljones.dev> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250316230724.100165-1-luke@ljones.dev> References: <20250316230724.100165-1-luke@ljones.dev> 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" From: "Luke D. Jones" Add panel_hd_mode to toggle the panel mode between single and high definition modes. Signed-off-by: Luke D. Jones Reviewed-by: Mario Limonciello --- drivers/platform/x86/asus-armoury.c | 6 +++++- include/linux/platform_data/x86/asus-wmi.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/asus-armoury.c b/drivers/platform/x86/asu= s-armoury.c index 46102cd0c00d..449b2605b7e6 100644 --- a/drivers/platform/x86/asus-armoury.c +++ b/drivers/platform/x86/asus-armoury.c @@ -87,7 +87,8 @@ static struct kobj_attribute pending_reboot =3D __ATTR_RO= (pending_reboot); =20 static bool asus_bios_requires_reboot(struct kobj_attribute *attr) { - return !strcmp(attr->attr.name, "gpu_mux_mode"); + return !strcmp(attr->attr.name, "gpu_mux_mode") || + !strcmp(attr->attr.name, "panel_hd_mode"); } =20 static int armoury_wmi_set_devstate(struct kobj_attribute *attr, u32 value= , u32 wmi_dev) @@ -398,6 +399,8 @@ ATTR_GROUP_BOOL_RW(mcu_powersave, "mcu_powersave", ASUS= _WMI_DEVID_MCU_POWERSAVE, "Set MCU powersaving mode"); ATTR_GROUP_BOOL_RW(panel_od, "panel_overdrive", ASUS_WMI_DEVID_PANEL_OD, "Set the panel refresh overdrive"); +ATTR_GROUP_BOOL_RW(panel_hd_mode, "panel_hd_mode", ASUS_WMI_DEVID_PANEL_HD, + "Set the panel HD mode to UHD<0> or FHD<1>"); ATTR_GROUP_BOOL_RO(egpu_connected, "egpu_connected", ASUS_WMI_DEVID_EGPU_C= ONNECTED, "Show the eGPU connection status"); =20 @@ -411,6 +414,7 @@ static const struct asus_attr_group armoury_attr_groups= [] =3D { { &boot_sound_attr_group, ASUS_WMI_DEVID_BOOT_SOUND }, { &mcu_powersave_attr_group, ASUS_WMI_DEVID_MCU_POWERSAVE }, { &panel_od_attr_group, ASUS_WMI_DEVID_PANEL_OD }, + { &panel_hd_mode_attr_group, ASUS_WMI_DEVID_PANEL_HD }, }; =20 static int asus_fw_attr_add(void) diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/pla= tform_data/x86/asus-wmi.h index 4574e30c53fc..62a9adb1af2f 100644 --- a/include/linux/platform_data/x86/asus-wmi.h +++ b/include/linux/platform_data/x86/asus-wmi.h @@ -76,6 +76,7 @@ #define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY_VIVO 0x00110019 =20 /* Misc */ +#define ASUS_WMI_DEVID_PANEL_HD 0x0005001C #define ASUS_WMI_DEVID_PANEL_OD 0x00050019 #define ASUS_WMI_DEVID_CAMERA 0x00060013 #define ASUS_WMI_DEVID_LID_FLIP 0x00060062 --=20 2.48.1 From nobody Wed Dec 17 17:25:04 2025 Received: from fout-b2-smtp.messagingengine.com (fout-b2-smtp.messagingengine.com [202.12.124.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87F0519F11F; Sun, 16 Mar 2025 23:07:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742166470; cv=none; b=KAzJHE+iO3ATKrfB4XdFR/UbYztWMGZmZM0RMqXzK108CTDHfaPZXvhflqgQ5E8YaRGx54skzb2PDgh3tGtS3wI/MUsJD4YjzmKAbYuIttuUOnaSLYMWtzA85vwYlHvlt6ToKE9I+q29gZdjXCT01UnVboSB59a5aJyunhMiWKY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742166470; c=relaxed/simple; bh=DPcp4gma1H5OBj+tYPGck3H4Vo4EpJNHz9faAlWZoo0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=a3tXOsMwjbwh/dLFfgVTgsjRYcPKz1jQnQzdtfVWGqrZlGLK4A/Wzu4XyYalZeBYNrnI+axuDkpFekvixZ0ZFfmpk9bAqsRrPw/QB4FldsR+ig+Bpk3PCTNtJDqnZ9eZRPpEZgy2lQUMUskLralShN+FRQYmLF6FAva9xziOi6M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev; spf=none smtp.mailfrom=ljones.dev; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b=LdS/FM72; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=VlnU/c45; arc=none smtp.client-ip=202.12.124.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=ljones.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b="LdS/FM72"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="VlnU/c45" Received: from phl-compute-13.internal (phl-compute-13.phl.internal [10.202.2.53]) by mailfout.stl.internal (Postfix) with ESMTP id 7A7BA1140120; Sun, 16 Mar 2025 19:07:47 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-13.internal (MEProxy); Sun, 16 Mar 2025 19:07:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ljones.dev; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1742166467; x= 1742252867; bh=I3K6aSeQ1Zqsy/jvj7lz6b3ZWaQ4LfqC3auXDr51j9U=; b=L dS/FM72oNJ7UFKUdFnLt/Y9bRn9GyOEdumD+D7sNiQ00mxSsYnvtHGJgnvruNbvw U2TDQP4UA1+jI+nCyjEaaeJsOX+UQCPGblg4pY3HJ6OX4TchWt68R+ssN0x4bA6N jP+qlillf7OlNgmEbhutsR2XyNCMA1bizxOCBBSuma0Rkr2vRj+r8219q7Ymt+2Y yGN6sCDzLhhUkOzXC0yvK04FrgIXUHazZxt8OC8M27LTsm2oQDXvHJhfsQ8y5Prk GW12by9QyuP3PNTPvan3PLO3EfmIN5E6frMsjk7NdjK+t5MviIWB4DFFsA5ynmJj PoE/6syqkP7whOxDz5Q9w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; t=1742166467; x=1742252867; bh=I 3K6aSeQ1Zqsy/jvj7lz6b3ZWaQ4LfqC3auXDr51j9U=; b=VlnU/c45hYParCR2H Ot/sa6eNGZeKSkKu8tjnScvHp5oFTgZGc64nZ+sULQ0aFFWy/kfXFI8z1aIzFoCS rLBuea4FADcBgNCs+cgMf35h19GHWdqtWvrtFLPRkbm5rwHppLvlXvfA4rqX45Wk Lhtpeyd5xyDHkRpsc+mGVwa3nefzukaw70acxPlzDjJIVWN4BqT/vE6DwvXrGZPJ cGsA+QbtAVgKcEiSJSeG3HnOuLoR2v0bLGxE79j3wt3yVdxq9MgFtoW3tmdideLd 9gNM351ERP4HaZk3tseRXtE24cbOvLqOoW1VH0uHNKhCiMEGadZZd/lZs9wXhFGM SJ+LQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddufeejkeelucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhgggfestdekredtredt tdenucfhrhhomhepnfhukhgvucflohhnvghsuceolhhukhgvsehljhhonhgvshdruggvvh eqnecuggftrfgrthhtvghrnhepueeuleeffeeihfelhffhheelfeffgeetuefhheevkeet uedugfetfeetlefhieejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomheplhhukhgvsehljhhonhgvshdruggvvhdpnhgspghrtghpthhtohepiedp mhhouggvpehsmhhtphhouhhtpdhrtghpthhtoheplhhinhhugidqkhgvrhhnvghlsehvgh gvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtohephhguvghgohgvuggvsehrvgguhhgr thdrtghomhdprhgtphhtthhopehilhhpohdrjhgrrhhvihhnvghnsehlihhnuhigrdhinh htvghlrdgtohhmpdhrtghpthhtohepphhlrghtfhhorhhmqdgurhhivhgvrhdqgiekiees vhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehmrghrihhordhlihhmohhntg hivghllhhosegrmhgurdgtohhmpdhrtghpthhtoheplhhukhgvsehljhhonhgvshdruggv vh X-ME-Proxy: Feedback-ID: i5ec1447f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 16 Mar 2025 19:07:44 -0400 (EDT) From: Luke Jones To: linux-kernel@vger.kernel.org Cc: hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com, platform-driver-x86@vger.kernel.org, mario.limonciello@amd.com, "Luke D. Jones" Subject: [PATCH v7 4/8] platform/x86: asus-armoury: add apu-mem control support Date: Mon, 17 Mar 2025 12:07:20 +1300 Message-ID: <20250316230724.100165-5-luke@ljones.dev> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250316230724.100165-1-luke@ljones.dev> References: <20250316230724.100165-1-luke@ljones.dev> 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" From: "Luke D. Jones" Implement the APU memory size control under the asus-armoury module using the fw_attributes class. This allows the APU allocated memory size to be adjusted depending on the users priority. A reboot is required after change. Signed-off-by: Luke D. Jones Reviewed-by: Mario Limonciello --- drivers/platform/x86/asus-armoury.c | 114 +++++++++++++++++++++ include/linux/platform_data/x86/asus-wmi.h | 2 + 2 files changed, 116 insertions(+) diff --git a/drivers/platform/x86/asus-armoury.c b/drivers/platform/x86/asu= s-armoury.c index 449b2605b7e6..882376008093 100644 --- a/drivers/platform/x86/asus-armoury.c +++ b/drivers/platform/x86/asus-armoury.c @@ -389,6 +389,119 @@ static ssize_t egpu_enable_current_value_store(struct= kobject *kobj, struct kobj WMI_SHOW_INT(egpu_enable_current_value, "%d\n", ASUS_WMI_DEVID_EGPU); ATTR_GROUP_BOOL_CUSTOM(egpu_enable, "egpu_enable", "Enable the eGPU (also = disables dGPU)"); =20 +/* Device memory available to APU */ + +static ssize_t apu_mem_current_value_show(struct kobject *kobj, struct kob= j_attribute *attr, + char *buf) +{ + int err; + u32 mem; + + err =3D asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_APU_MEM, &mem); + if (err) + return err; + + switch (mem) { + case 0x100: + mem =3D 0; + break; + case 0x102: + mem =3D 1; + break; + case 0x103: + mem =3D 2; + break; + case 0x104: + mem =3D 3; + break; + case 0x105: + mem =3D 4; + break; + case 0x106: + /* This is out of order and looks wrong but is correct */ + mem =3D 8; + break; + case 0x107: + mem =3D 5; + break; + case 0x108: + mem =3D 6; + break; + case 0x109: + mem =3D 7; + break; + default: + mem =3D 4; + break; + } + + return sysfs_emit(buf, "%u\n", mem); +} + +static ssize_t apu_mem_current_value_store(struct kobject *kobj, struct ko= bj_attribute *attr, + const char *buf, size_t count) +{ + int result, err; + u32 requested, mem; + + result =3D kstrtou32(buf, 10, &requested); + if (result) + return result; + + switch (requested) { + case 0: + mem =3D 0x000; + break; + case 1: + mem =3D 0x102; + break; + case 2: + mem =3D 0x103; + break; + case 3: + mem =3D 0x104; + break; + case 4: + mem =3D 0x105; + break; + case 5: + mem =3D 0x107; + break; + case 6: + mem =3D 0x108; + break; + case 7: + mem =3D 0x109; + break; + case 8: + /* This is out of order and looks wrong but is correct */ + mem =3D 0x106; + break; + default: + return -EIO; + } + + err =3D asus_wmi_set_devstate(ASUS_WMI_DEVID_APU_MEM, mem, &result); + if (err) { + pr_warn("Failed to set apu_mem: %d\n", err); + return err; + } + + pr_info("APU memory changed to %uGB, reboot required\n", requested); + sysfs_notify(kobj, NULL, attr->attr.name); + + asus_set_reboot_and_signal_event(); + + return count; +} + +static ssize_t apu_mem_possible_values_show(struct kobject *kobj, struct k= obj_attribute *attr, + char *buf) +{ + return sysfs_emit(buf, "0;1;2;3;4;5;6;7;8\n"); +} +ATTR_GROUP_ENUM_CUSTOM(apu_mem, "apu_mem", "Set available system RAM (in G= B) for the APU to use"); + /* Simple attribute creation */ ATTR_GROUP_ENUM_INT_RO(charge_mode, "charge_mode", ASUS_WMI_DEVID_CHARGE_M= ODE, "0;1;2", "Show the current mode of charging"); @@ -409,6 +522,7 @@ static const struct asus_attr_group armoury_attr_groups= [] =3D { { &egpu_connected_attr_group, ASUS_WMI_DEVID_EGPU_CONNECTED }, { &egpu_enable_attr_group, ASUS_WMI_DEVID_EGPU }, { &dgpu_disable_attr_group, ASUS_WMI_DEVID_DGPU }, + { &apu_mem_attr_group, ASUS_WMI_DEVID_APU_MEM }, =20 { &charge_mode_attr_group, ASUS_WMI_DEVID_CHARGE_MODE }, { &boot_sound_attr_group, ASUS_WMI_DEVID_BOOT_SOUND }, diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/pla= tform_data/x86/asus-wmi.h index 62a9adb1af2f..f3494a9efea7 100644 --- a/include/linux/platform_data/x86/asus-wmi.h +++ b/include/linux/platform_data/x86/asus-wmi.h @@ -137,6 +137,8 @@ /* dgpu on/off */ #define ASUS_WMI_DEVID_DGPU 0x00090020 =20 +#define ASUS_WMI_DEVID_APU_MEM 0x000600C1 + /* gpu mux switch, 0 =3D dGPU, 1 =3D Optimus */ #define ASUS_WMI_DEVID_GPU_MUX 0x00090016 #define ASUS_WMI_DEVID_GPU_MUX_VIVO 0x00090026 --=20 2.48.1 From nobody Wed Dec 17 17:25:04 2025 Received: from fhigh-b2-smtp.messagingengine.com (fhigh-b2-smtp.messagingengine.com [202.12.124.153]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 729FA19F495; Sun, 16 Mar 2025 23:07:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.153 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742166473; cv=none; b=RwHnq3kBsJqMo+5m6HTwwt5MTC3rsdreciDc3ti3jJ5Ws+ShBBHgCxfEdhGLhnfQHd4GVJwPuJxZ6moOoOyr5Q7UnCKnzC4ZWycnsUbOsx4+Pw7jrlSCDY7qC8zYHY1Rh2f1ZdN+dABnhhzlgq/fvI40jcuyuGYepCKxWXTjOn4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742166473; c=relaxed/simple; bh=qDp2kbumgawPXiwWPkNoxfbG+S1T9tSLPTwdEytUlwE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t7HKkiWXn2luFYZyGajZTGiX2z41gqk/VuMavi8qtEHsgWg7OHHfWqtCOKLCkKcCVAjlV1uVBCJ9tyvkuPsk9LWQtMRV5hEsMfD1Rhs2byI70OLDqIYesmA72WWn2fiJYrgQDL+THhZhDhPGVDdBgmkqfx2nVSBTM15cahXexRk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev; spf=none smtp.mailfrom=ljones.dev; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b=P7UaTDZn; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=Fvu+a363; arc=none smtp.client-ip=202.12.124.153 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=ljones.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b="P7UaTDZn"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="Fvu+a363" Received: from phl-compute-13.internal (phl-compute-13.phl.internal [10.202.2.53]) by mailfhigh.stl.internal (Postfix) with ESMTP id 9CA9B25400C8; Sun, 16 Mar 2025 19:07:50 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-13.internal (MEProxy); Sun, 16 Mar 2025 19:07:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ljones.dev; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1742166470; x= 1742252870; bh=IfsQIVsguAqkaVQhvwfVmmBsO0Kpac0OymE2MFE9GIs=; b=P 7UaTDZn2ZPoPOz1sXO/CRF/Hd2q/2e0XgLZ2HeD/CcsGMFkdNZ30iUbKi7KBVF/F 5+CwH3O6URVTdGt6unhuPgstNRW/E0LtHKM3zG7TQ5EPaRVWBJI6MV2vxt8kWC2f Jrut0ypJK1vEzpBojocNdeDzg5Kp0R/LeBIlLiBB68hJ7d7VaFPyf7EmgSvFZ4EA avR5EMbcCSIawREmbswhdcVxBjxRJYRGuV7cGjcqJqfToFmt5AtySjmuRYpY925a W8dC3/02Sp86xw5Z9LrWvP0/OLx4LtEI1G28l7EGN12lN9J5sDcq2XlMDCfIW9Iv qxkRpF79nAHkovPg3wM0Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; t=1742166470; x=1742252870; bh=I fsQIVsguAqkaVQhvwfVmmBsO0Kpac0OymE2MFE9GIs=; b=Fvu+a363Dj22gMv3G ZjHE7i7F5SIIAN6wDPJ6T3ij+7wEVT4YddK8nLWsvQCSwZavBzQIsMA7m5UHG/7Q +Eq2nrzU+VyXggB35NgNZdn3vPNKR0iJaAlhsWen7SMfgeAJ6dZYvGxelCSSuqb3 PrHfw96l5bg5t14oosGjMaPondiK+O6eTYr1S2sDTCwe74tkeEdiubzi4cGP75Wm sDbf6GD3Cdmu3KdXCStvR1OF+5Acw0ouI99B+T1l0SI+av53RkZtPtL7pXirRo+t 7K51oshuJL9XO43llzz52GVN9USRth7ENd+sll1V+iX72gFZLE8GQNc/TFyCM2EP E5j7A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddufeejkeelucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhgggfestdekredtredt tdenucfhrhhomhepnfhukhgvucflohhnvghsuceolhhukhgvsehljhhonhgvshdruggvvh eqnecuggftrfgrthhtvghrnhepueeuleeffeeihfelhffhheelfeffgeetuefhheevkeet uedugfetfeetlefhieejnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehmrg hilhhfrhhomheplhhukhgvsehljhhonhgvshdruggvvhdpnhgspghrtghpthhtohepiedp mhhouggvpehsmhhtphhouhhtpdhrtghpthhtoheplhhinhhugidqkhgvrhhnvghlsehvgh gvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtohephhguvghgohgvuggvsehrvgguhhgr thdrtghomhdprhgtphhtthhopehilhhpohdrjhgrrhhvihhnvghnsehlihhnuhigrdhinh htvghlrdgtohhmpdhrtghpthhtohepphhlrghtfhhorhhmqdgurhhivhgvrhdqgiekiees vhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehmrghrihhordhlihhmohhntg hivghllhhosegrmhgurdgtohhmpdhrtghpthhtoheplhhukhgvsehljhhonhgvshdruggv vh X-ME-Proxy: Feedback-ID: i5ec1447f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 16 Mar 2025 19:07:48 -0400 (EDT) From: Luke Jones To: linux-kernel@vger.kernel.org Cc: hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com, platform-driver-x86@vger.kernel.org, mario.limonciello@amd.com, "Luke D. Jones" Subject: [PATCH v7 5/8] platform/x86: asus-armoury: add core count control Date: Mon, 17 Mar 2025 12:07:21 +1300 Message-ID: <20250316230724.100165-6-luke@ljones.dev> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250316230724.100165-1-luke@ljones.dev> References: <20250316230724.100165-1-luke@ljones.dev> 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" From: "Luke D. Jones" Implement Intel core enablement under the asus-armoury module using the fw_attributes class. This allows users to enable or disable preformance or efficiency cores depending on their requirements. After change a reboot is required. Signed-off-by: Luke D. Jones Reviewed-by: Mario Limonciello --- drivers/platform/x86/asus-armoury.c | 258 ++++++++++++++++++++- drivers/platform/x86/asus-armoury.h | 28 +++ include/linux/platform_data/x86/asus-wmi.h | 5 + 3 files changed, 289 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/asus-armoury.c b/drivers/platform/x86/asu= s-armoury.c index 882376008093..6f0686fd5a4b 100644 --- a/drivers/platform/x86/asus-armoury.c +++ b/drivers/platform/x86/asus-armoury.c @@ -9,7 +9,6 @@ * Copyright(C) 2024 Luke Jones */ =20 -#include "linux/cleanup.h" #include #include #include @@ -40,13 +39,49 @@ #define ASUS_MINI_LED_2024_STRONG 0x01 #define ASUS_MINI_LED_2024_OFF 0x02 =20 +#define ASUS_POWER_CORE_MASK GENMASK(15, 8) +#define ASUS_PERF_CORE_MASK GENMASK(7, 0) + +enum cpu_core_type { + CPU_CORE_PERF =3D 0, + CPU_CORE_POWER, +}; + +enum cpu_core_value { + CPU_CORE_DEFAULT =3D 0, + CPU_CORE_MIN, + CPU_CORE_MAX, + CPU_CORE_CURRENT, +}; + +#define CPU_PERF_CORE_COUNT_MIN 4 +#define CPU_POWR_CORE_COUNT_MIN 0 + +/* Tunables provided by ASUS for gaming laptops */ +struct cpu_cores { + u32 cur_perf_cores; + u32 min_perf_cores; + u32 max_perf_cores; + u32 cur_power_cores; + u32 min_power_cores; + u32 max_power_cores; +}; + static struct asus_armoury_priv { struct device *fw_attr_dev; struct kset *fw_attr_kset; =20 + struct cpu_cores *cpu_cores; u32 mini_led_dev_id; u32 gpu_mux_dev_id; -} asus_armoury; + /* + * Mutex to prevent big/little core count changes writing to same + * endpoint at the same time. Must lock during attr store. + */ + struct mutex cpu_core_mutex; +} asus_armoury =3D { + .cpu_core_mutex =3D __MUTEX_INITIALIZER(asus_armoury.cpu_core_mutex) +}; =20 struct fw_attrs_group { bool pending_reboot; @@ -88,6 +123,8 @@ static struct kobj_attribute pending_reboot =3D __ATTR_R= O(pending_reboot); static bool asus_bios_requires_reboot(struct kobj_attribute *attr) { return !strcmp(attr->attr.name, "gpu_mux_mode") || + !strcmp(attr->attr.name, "cores_performance") || + !strcmp(attr->attr.name, "cores_efficiency") || !strcmp(attr->attr.name, "panel_hd_mode"); } =20 @@ -166,6 +203,12 @@ static ssize_t enum_type_show(struct kobject *kobj, st= ruct kobj_attribute *attr, return sysfs_emit(buf, "enumeration\n"); } =20 +static ssize_t int_type_show(struct kobject *kobj, struct kobj_attribute *= attr, + char *buf) +{ + return sysfs_emit(buf, "integer\n"); +} + /* Mini-LED mode *********************************************************= *****/ static ssize_t mini_led_mode_current_value_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) @@ -502,6 +545,201 @@ static ssize_t apu_mem_possible_values_show(struct ko= bject *kobj, struct kobj_at } ATTR_GROUP_ENUM_CUSTOM(apu_mem, "apu_mem", "Set available system RAM (in G= B) for the APU to use"); =20 +static int init_max_cpu_cores(void) +{ + u32 cores; + int err; + + err =3D asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_CORES_MAX, &cores); + if (err) + return err; + + cores &=3D ~ASUS_WMI_DSTS_PRESENCE_BIT; + asus_armoury.cpu_cores->max_power_cores =3D FIELD_GET(ASUS_POWER_CORE_MAS= K, cores); + asus_armoury.cpu_cores->max_perf_cores =3D FIELD_GET(ASUS_PERF_CORE_MASK,= cores); + + err =3D asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_CORES, &cores); + if (err) { + pr_err("Could not get CPU core count: error %d", err); + return err; + } + + asus_armoury.cpu_cores->cur_perf_cores =3D FIELD_GET(ASUS_PERF_CORE_MASK,= cores); + asus_armoury.cpu_cores->cur_power_cores =3D FIELD_GET(ASUS_POWER_CORE_MAS= K, cores); + + asus_armoury.cpu_cores->min_perf_cores =3D CPU_PERF_CORE_COUNT_MIN; + asus_armoury.cpu_cores->min_power_cores =3D CPU_POWR_CORE_COUNT_MIN; + + return 0; +} + +static ssize_t cores_value_show(struct kobject *kobj, struct kobj_attribut= e *attr, char *buf, + enum cpu_core_type core_type, enum cpu_core_value core_value) +{ + u32 cores; + + switch (core_value) { + case CPU_CORE_DEFAULT: + case CPU_CORE_MAX: + if (core_type =3D=3D CPU_CORE_PERF) + return sysfs_emit(buf, "%d\n", + asus_armoury.cpu_cores->max_perf_cores); + else + return sysfs_emit(buf, "%d\n", + asus_armoury.cpu_cores->max_power_cores); + case CPU_CORE_MIN: + if (core_type =3D=3D CPU_CORE_PERF) + return sysfs_emit(buf, "%d\n", + asus_armoury.cpu_cores->min_perf_cores); + else + return sysfs_emit(buf, "%d\n", + asus_armoury.cpu_cores->min_power_cores); + default: + break; + } + + if (core_type =3D=3D CPU_CORE_PERF) + cores =3D asus_armoury.cpu_cores->cur_perf_cores; + else + cores =3D asus_armoury.cpu_cores->cur_power_cores; + + return sysfs_emit(buf, "%d\n", cores); +} + +static ssize_t cores_current_value_store(struct kobject *kobj, struct kobj= _attribute *attr, + const char *buf, enum cpu_core_type core_type) +{ + u32 new_cores, perf_cores, power_cores, out_val, min, max; + int result, err; + + result =3D kstrtou32(buf, 10, &new_cores); + if (result) + return result; + + mutex_lock(&asus_armoury.cpu_core_mutex); + + if (core_type =3D=3D CPU_CORE_PERF) { + perf_cores =3D new_cores; + power_cores =3D out_val =3D asus_armoury.cpu_cores->cur_power_cores; + min =3D asus_armoury.cpu_cores->min_perf_cores; + max =3D asus_armoury.cpu_cores->max_perf_cores; + } else { + perf_cores =3D asus_armoury.cpu_cores->cur_perf_cores; + power_cores =3D out_val =3D new_cores; + min =3D asus_armoury.cpu_cores->min_power_cores; + max =3D asus_armoury.cpu_cores->max_power_cores; + } + + if (new_cores < min || new_cores > max) { + mutex_unlock(&asus_armoury.cpu_core_mutex); + return -EINVAL; + } + + out_val =3D 0; + out_val |=3D FIELD_PREP(ASUS_PERF_CORE_MASK, perf_cores); + out_val |=3D FIELD_PREP(ASUS_POWER_CORE_MASK, power_cores); + + err =3D asus_wmi_set_devstate(ASUS_WMI_DEVID_CORES, out_val, &result); + + if (err) { + pr_warn("Failed to set CPU core count: %d\n", err); + mutex_unlock(&asus_armoury.cpu_core_mutex); + return err; + } + + if (result > 1) { + pr_warn("Failed to set CPU core count (result): 0x%x\n", result); + mutex_unlock(&asus_armoury.cpu_core_mutex); + return -EIO; + } + + pr_info("CPU core count changed, reboot required\n"); + mutex_unlock(&asus_armoury.cpu_core_mutex); + + sysfs_notify(kobj, NULL, attr->attr.name); + asus_set_reboot_and_signal_event(); + + return 0; +} + +static ssize_t cores_performance_min_value_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return cores_value_show(kobj, attr, buf, CPU_CORE_PERF, CPU_CORE_MIN); +} + +static ssize_t cores_performance_max_value_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return cores_value_show(kobj, attr, buf, CPU_CORE_PERF, CPU_CORE_MAX); +} + +static ssize_t cores_performance_default_value_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return cores_value_show(kobj, attr, buf, CPU_CORE_PERF, CPU_CORE_DEFAULT); +} + +static ssize_t cores_performance_current_value_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return cores_value_show(kobj, attr, buf, CPU_CORE_PERF, CPU_CORE_CURRENT); +} + +static ssize_t cores_performance_current_value_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t count) +{ + int err; + + err =3D cores_current_value_store(kobj, attr, buf, CPU_CORE_PERF); + if (err) + return err; + + return count; +} +ATTR_GROUP_CORES_RW(cores_performance, "cores_performance", + "Set the max available performance cores"); + +static ssize_t cores_efficiency_min_value_show(struct kobject *kobj, struc= t kobj_attribute *attr, + char *buf) +{ + return cores_value_show(kobj, attr, buf, CPU_CORE_POWER, CPU_CORE_MIN); +} + +static ssize_t cores_efficiency_max_value_show(struct kobject *kobj, struc= t kobj_attribute *attr, + char *buf) +{ + return cores_value_show(kobj, attr, buf, CPU_CORE_POWER, CPU_CORE_MAX); +} + +static ssize_t cores_efficiency_default_value_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return cores_value_show(kobj, attr, buf, CPU_CORE_POWER, CPU_CORE_DEFAULT= ); +} + +static ssize_t cores_efficiency_current_value_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return cores_value_show(kobj, attr, buf, CPU_CORE_POWER, CPU_CORE_CURRENT= ); +} + +static ssize_t cores_efficiency_current_value_store(struct kobject *kobj, + struct kobj_attribute *attr, const char *buf, + size_t count) +{ + int err; + + err =3D cores_current_value_store(kobj, attr, buf, CPU_CORE_POWER); + if (err) + return err; + + return count; +} +ATTR_GROUP_CORES_RW(cores_efficiency, "cores_efficiency", + "Set the max available efficiency cores"); + /* Simple attribute creation */ ATTR_GROUP_ENUM_INT_RO(charge_mode, "charge_mode", ASUS_WMI_DEVID_CHARGE_M= ODE, "0;1;2", "Show the current mode of charging"); @@ -523,6 +761,8 @@ static const struct asus_attr_group armoury_attr_groups= [] =3D { { &egpu_enable_attr_group, ASUS_WMI_DEVID_EGPU }, { &dgpu_disable_attr_group, ASUS_WMI_DEVID_DGPU }, { &apu_mem_attr_group, ASUS_WMI_DEVID_APU_MEM }, + { &cores_efficiency_attr_group, ASUS_WMI_DEVID_CORES_MAX }, + { &cores_performance_attr_group, ASUS_WMI_DEVID_CORES_MAX }, =20 { &charge_mode_attr_group, ASUS_WMI_DEVID_CHARGE_MODE }, { &boot_sound_attr_group, ASUS_WMI_DEVID_BOOT_SOUND }, @@ -639,6 +879,20 @@ static int __init asus_fw_init(void) if (!strcmp(wmi_uid, ASUS_ACPI_UID_ASUSWMI)) return -ENODEV; =20 + + if (asus_wmi_is_present(ASUS_WMI_DEVID_CORES_MAX)) { + asus_armoury.cpu_cores =3D kzalloc(sizeof(struct cpu_cores), GFP_KERNEL); + if (!asus_armoury.cpu_cores) + return -ENOMEM; + + err =3D init_max_cpu_cores(); + if (err) { + kfree(asus_armoury.cpu_cores); + pr_err("Could not initialise CPU core control %d\n", err); + return err; + } + } + err =3D asus_fw_attr_add(); if (err) return err; diff --git a/drivers/platform/x86/asus-armoury.h b/drivers/platform/x86/asu= s-armoury.h index 42c8171e5d8a..584a75df113d 100644 --- a/drivers/platform/x86/asus-armoury.h +++ b/drivers/platform/x86/asus-armoury.h @@ -162,4 +162,32 @@ .name =3D _fsname, .attrs =3D _attrname##_attrs \ } =20 +/* CPU core attributes need a little different in setup */ +#define ATTR_GROUP_CORES_RW(_attrname, _fsname, _dispname) \ + __ATTR_SHOW_FMT(scalar_increment, _attrname, "%d\n", 1); \ + __ATTR_SHOW_FMT(display_name, _attrname, "%s\n", _dispname); \ + static struct kobj_attribute attr_##_attrname##_current_value =3D \ + __ASUS_ATTR_RW(_attrname, current_value); \ + static struct kobj_attribute attr_##_attrname##_default_value =3D \ + __ASUS_ATTR_RO(_attrname, default_value); \ + static struct kobj_attribute attr_##_attrname##_min_value =3D \ + __ASUS_ATTR_RO(_attrname, min_value); \ + static struct kobj_attribute attr_##_attrname##_max_value =3D \ + __ASUS_ATTR_RO(_attrname, max_value); \ + static struct kobj_attribute attr_##_attrname##_type =3D \ + __ASUS_ATTR_RO_AS(type, int_type_show); \ + static struct attribute *_attrname##_attrs[] =3D { \ + &attr_##_attrname##_current_value.attr, \ + &attr_##_attrname##_default_value.attr, \ + &attr_##_attrname##_min_value.attr, \ + &attr_##_attrname##_max_value.attr, \ + &attr_##_attrname##_scalar_increment.attr, \ + &attr_##_attrname##_display_name.attr, \ + &attr_##_attrname##_type.attr, \ + NULL \ + }; \ + static const struct attribute_group _attrname##_attr_group =3D { \ + .name =3D _fsname, .attrs =3D _attrname##_attrs \ + } + #endif /* _ASUS_ARMOURY_H_ */ diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/pla= tform_data/x86/asus-wmi.h index f3494a9efea7..e735f35b423c 100644 --- a/include/linux/platform_data/x86/asus-wmi.h +++ b/include/linux/platform_data/x86/asus-wmi.h @@ -137,6 +137,11 @@ /* dgpu on/off */ #define ASUS_WMI_DEVID_DGPU 0x00090020 =20 +/* Intel E-core and P-core configuration in a format 0x0[E]0[P] */ +#define ASUS_WMI_DEVID_CORES 0x001200D2 + /* Maximum Intel E-core and P-core availability */ +#define ASUS_WMI_DEVID_CORES_MAX 0x001200D3 + #define ASUS_WMI_DEVID_APU_MEM 0x000600C1 =20 /* gpu mux switch, 0 =3D dGPU, 1 =3D Optimus */ --=20 2.48.1 From nobody Wed Dec 17 17:25:04 2025 Received: from fout-b2-smtp.messagingengine.com (fout-b2-smtp.messagingengine.com [202.12.124.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B9CE31F4621; Sun, 16 Mar 2025 23:07:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742166476; cv=none; b=IG1t3bUq5dZUPcNVhSYNKOzRf4PVDFURlgsBFOqITnTMOhp7itnfJVifvBhpifqeS1ySYN2rA/wi0fGuf5j3UGrKdgOqmhS0Jb90N7t3SNbjLOyJQ+G0eSOd+88yGlLIuxt9HWhQrHBhueY7MmAGG72KMWqJ2Ukebrqcr7KMRTk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742166476; c=relaxed/simple; bh=RZbuMwNPemWgWEk7xeCCXafogpmib0Txw2MfA3xh3ZE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eKp8cVVH9gxOaEfQuLIc200e3VhldvBBvOMr4XjyPMdFz/5vrqkdD95xzhpxOa2HoVqpAAjvsGhC2kS4LxO9xX4M0ahoD9/P6ZRfhKkHo5tYVJtra2/4VDJ0EF1qxyPuJRhjOjJ+UZNciIxwZyFa9rvCSlvVaTXVZ8Xaeu17AAs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev; spf=none smtp.mailfrom=ljones.dev; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b=V8tH/nGS; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=ZQXr5bYJ; arc=none smtp.client-ip=202.12.124.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=ljones.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b="V8tH/nGS"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="ZQXr5bYJ" Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfout.stl.internal (Postfix) with ESMTP id C77D21140126; Sun, 16 Mar 2025 19:07:53 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-11.internal (MEProxy); Sun, 16 Mar 2025 19:07:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ljones.dev; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1742166473; x= 1742252873; bh=6NZlVAHceIzSgE+BAy+U7CGc4XuOgGtS2nNPgvQuhAA=; b=V 8tH/nGSGkx5tlYdH9W7Uqjp147r9mp0ej0LOOgU5znO3dHZnCeU6Fan+pjweOELU a1vBKxbh6O+97JKvUTD6bOpcsyXjYJQWv8JgnAeiOqK7BtjIGvQYYRGhXGOropue 1HXp8cXTZuPgC4nyE5zc5MjvFrfUM+uZrL/ycHkX4hxBNWtC4YlX7/AU5s2KYX18 o3u5Wy/Qb+GQQD9aODWc1GSQfWt7YbKVa/5ExaaUfl5eL+PK+P3k3LFkZjmKv9Ti e8Jn2VVqermSMpbcZ6xrh3TKzZL960+YODVQh1DJput7Sr+b4zOzKzpODrA+v1kj +vVuaKWA9eafN3+1lQQ4g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; t=1742166473; x=1742252873; bh=6 NZlVAHceIzSgE+BAy+U7CGc4XuOgGtS2nNPgvQuhAA=; b=ZQXr5bYJ+2I1VfdZZ pC8tqdlBD4inuEx4X5ggv8g089NIri42buMReHGxm0cTB++sBi7HocZtmzC1XZtr rtC07eOSu8FKJbcYnmwoX2pnr6fA+WSKc35o2AiUdhAUrdXB5r6QaLssmrSC1ovh xpB/DsVpcdP7/4wLcgVIKPrVCNw1gzsxS3sRo1P8agbQKXADEdgf/wnU9eEipw2J E6hJAx7PhsUxTNxA6eL4+nqBO6QefFjOI91p58tJgOj1ldZ/0u/idz0SBUgkTSK7 l9/PS6pTymlb/TZ7FLpFW9RuxLt1fiF3/K4vqtB8NJgqZvNhr5cVKGKHZa0xMHNt qTdhA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddufeejkeelucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefnuhhkvgculfhonhgvshcu oehluhhkvgeslhhjohhnvghsrdguvghvqeenucggtffrrghtthgvrhhnpeeuueelfeefie fhlefhhfehleefffegteeuhfehveekteeuudfgteefteelhfeijeenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehluhhkvgeslhhjohhnvghsrd guvghvpdhnsggprhgtphhtthhopeeipdhmohguvgepshhmthhpohhuthdprhgtphhtthho pehlihhnuhigqdhkvghrnhgvlhesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtth hopehhuggvghhovgguvgesrhgvughhrghtrdgtohhmpdhrtghpthhtohepihhlphhordhj rghrvhhinhgvnheslhhinhhugidrihhnthgvlhdrtghomhdprhgtphhtthhopehplhgrth hfohhrmhdqughrihhvvghrqdigkeeisehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghp thhtohepmhgrrhhiohdrlhhimhhonhgtihgvlhhlohesrghmugdrtghomhdprhgtphhtth hopehluhhkvgeslhhjohhnvghsrdguvghv X-ME-Proxy: Feedback-ID: i5ec1447f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 16 Mar 2025 19:07:51 -0400 (EDT) From: Luke Jones To: linux-kernel@vger.kernel.org Cc: hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com, platform-driver-x86@vger.kernel.org, mario.limonciello@amd.com, Luke Jones Subject: [PATCH v7 6/8] platform/x86: asus-armoury: add screen auto-brightness toggle Date: Mon, 17 Mar 2025 12:07:22 +1300 Message-ID: <20250316230724.100165-7-luke@ljones.dev> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250316230724.100165-1-luke@ljones.dev> References: <20250316230724.100165-1-luke@ljones.dev> 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" Add screen_auto_brightness toggle supported on some laptops. Signed-off-by: Luke D. Jones Reviewed-by: Mario Limonciello --- drivers/platform/x86/asus-armoury.c | 3 +++ include/linux/platform_data/x86/asus-wmi.h | 1 + 2 files changed, 4 insertions(+) diff --git a/drivers/platform/x86/asus-armoury.c b/drivers/platform/x86/asu= s-armoury.c index 6f0686fd5a4b..591805f46725 100644 --- a/drivers/platform/x86/asus-armoury.c +++ b/drivers/platform/x86/asus-armoury.c @@ -752,6 +752,9 @@ ATTR_GROUP_BOOL_RW(panel_od, "panel_overdrive", ASUS_WM= I_DEVID_PANEL_OD, "Set the panel refresh overdrive"); ATTR_GROUP_BOOL_RW(panel_hd_mode, "panel_hd_mode", ASUS_WMI_DEVID_PANEL_HD, "Set the panel HD mode to UHD<0> or FHD<1>"); +ATTR_GROUP_BOOL_RW(screen_auto_brightness, "screen_auto_brightness", + ASUS_WMI_DEVID_SCREEN_AUTO_BRIGHTNESS, + "Set the panel brightness to Off<0> or On<1>"); ATTR_GROUP_BOOL_RO(egpu_connected, "egpu_connected", ASUS_WMI_DEVID_EGPU_C= ONNECTED, "Show the eGPU connection status"); =20 diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/pla= tform_data/x86/asus-wmi.h index e735f35b423c..92fea0710ada 100644 --- a/include/linux/platform_data/x86/asus-wmi.h +++ b/include/linux/platform_data/x86/asus-wmi.h @@ -83,6 +83,7 @@ #define ASUS_WMI_DEVID_LID_FLIP_ROG 0x00060077 #define ASUS_WMI_DEVID_MINI_LED_MODE 0x0005001E #define ASUS_WMI_DEVID_MINI_LED_MODE2 0x0005002E +#define ASUS_WMI_DEVID_SCREEN_AUTO_BRIGHTNESS 0x0005002A =20 /* Storage */ #define ASUS_WMI_DEVID_CARDREADER 0x00080013 --=20 2.48.1 From nobody Wed Dec 17 17:25:04 2025 Received: from fout-b2-smtp.messagingengine.com (fout-b2-smtp.messagingengine.com [202.12.124.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C1C431F583E; Sun, 16 Mar 2025 23:07:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742166480; cv=none; b=Dsa3YATll9rAiYq57ktgppF8j3RcYMogoYyB6BZoSYVsvjPzmIw6Vqfeia7Ci5tJCotzaRJETHrvrmxgOKynhITWzGWr3D0JQ18I2OpDaScWusoH0W6i2qIlQnUGDGm0KdOqI/k0HZH4Fhqy8qAups9D+3QObdR1KMPUv1rYGGk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742166480; c=relaxed/simple; bh=T6XIgrf07EcCKxoWvfSA/TXNYLluI+00uFyB/nUfPis=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QmbqedS/qeH5zls5igs3cBv3j84sVi95e4lz3PU33KxVJOyc6Wjy7qZssV9Tault4isejpylG8kKcdUxqEmh0BUNi6tFcxCv3TUy6lLVRoY6HIUfYB+iV26C15LP1GtG8JPKAUVTjsyFZwoiiVItQvcEd53qBIm4A+xWyg6dvHA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev; spf=none smtp.mailfrom=ljones.dev; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b=AXbz4sxO; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=5zMW2+s7; arc=none smtp.client-ip=202.12.124.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=ljones.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b="AXbz4sxO"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="5zMW2+s7" Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfout.stl.internal (Postfix) with ESMTP id AC34C1140127; Sun, 16 Mar 2025 19:07:56 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Sun, 16 Mar 2025 19:07:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ljones.dev; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1742166476; x= 1742252876; bh=ooU31hRTvCN83QM65FMliuKyhs1J4P1fRcvZ3RaRhn8=; b=A Xbz4sxOZ4DUOvhs+GoiSyCLQwpKAMV24CPo7DQwVkURZrBiCt+C6C8xgJDGkk+uQ VhnOZ7gdxcqsL1To9YDqRwA0kViBkWIkZQ29TRtbwmzGz4F6weqLmvRH86n/B2VD bIlArp2JUIdvGTjjb0oAU6rwLobgYutzrJyAtpT5oBdwiRkljpdP/G/D1iTtsIdO 8foA7fGX0R2LTzKQh3l94Uw8NlvRCCCJUee6mAZEYnKX9uBfSB64pdOKFL4ap+vG cfBEfLT7GPpskuobjuOydin/9EU+BwFFmvEMp0a+jSdyHJ9Hka8Z9pJ0Z8ZI5xil N1oPZGdklC7lwPP/gui9A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; t=1742166476; x=1742252876; bh=o oU31hRTvCN83QM65FMliuKyhs1J4P1fRcvZ3RaRhn8=; b=5zMW2+s7zqNI/Tc/m 6S1La3owst2DHuUhe/0hcSqpN5UBWtg2IuIafdWYUXbbUb2Ans/DrTUn5eBNlBTc GLgwLCXwN/wPyC2WILWPuqDiO9UquPfR0V9uXZlX+0MZOVoU2SFbdLUz13wIVsY9 Luxn+MUQWmp+nWWl3fHL7YfFERN8cKlVv+o4cBtNJMzhtvxaj1ZJyfcJM4jVWeWP 93fYf2WWGUGn41UoVY1HyqfGsh2lRWrb4+AQ+/5sUAJJxuqYAq6GC9N0Pi8ktlxG LyheCjqCtHFpv/lXSHKTcqUEUvx0tvibqMrek02iLqecP/TyjKzU4noIQa1Ww0ZT Bg97w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddufeejkeelucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhgggfestdekredtredt tdenucfhrhhomhepnfhukhgvucflohhnvghsuceolhhukhgvsehljhhonhgvshdruggvvh eqnecuggftrfgrthhtvghrnhepueeuleeffeeihfelhffhheelfeffgeetuefhheevkeet uedugfetfeetlefhieejnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehmrg hilhhfrhhomheplhhukhgvsehljhhonhgvshdruggvvhdpnhgspghrtghpthhtohepiedp mhhouggvpehsmhhtphhouhhtpdhrtghpthhtoheplhhinhhugidqkhgvrhhnvghlsehvgh gvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtohephhguvghgohgvuggvsehrvgguhhgr thdrtghomhdprhgtphhtthhopehilhhpohdrjhgrrhhvihhnvghnsehlihhnuhigrdhinh htvghlrdgtohhmpdhrtghpthhtohepphhlrghtfhhorhhmqdgurhhivhgvrhdqgiekiees vhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehmrghrihhordhlihhmohhntg hivghllhhosegrmhgurdgtohhmpdhrtghpthhtoheplhhukhgvsehljhhonhgvshdruggv vh X-ME-Proxy: Feedback-ID: i5ec1447f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 16 Mar 2025 19:07:54 -0400 (EDT) From: Luke Jones To: linux-kernel@vger.kernel.org Cc: hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com, platform-driver-x86@vger.kernel.org, mario.limonciello@amd.com, "Luke D. Jones" Subject: [PATCH v7 7/8] platform/x86: asus-wmi: deprecate bios features Date: Mon, 17 Mar 2025 12:07:23 +1300 Message-ID: <20250316230724.100165-8-luke@ljones.dev> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250316230724.100165-1-luke@ljones.dev> References: <20250316230724.100165-1-luke@ljones.dev> 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" From: "Luke D. Jones" With the existence of the asus-armoury module the attributes no-longer need to live under the /sys/devices/platform/asus-nb-wmi/ path. Deprecate all those that were implemented in asus-bioscfg with the goal of removing them fully in the next LTS cycle. Signed-off-by: Luke D. Jones Reviewed-by: Mario Limonciello --- .../ABI/testing/sysfs-platform-asus-wmi | 17 +++ drivers/platform/x86/Kconfig | 11 ++ drivers/platform/x86/asus-wmi.c | 121 ++++++++++++++---- 3 files changed, 124 insertions(+), 25 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-platform-asus-wmi b/Documentat= ion/ABI/testing/sysfs-platform-asus-wmi index 28144371a0f1..765d50b0d9df 100644 --- a/Documentation/ABI/testing/sysfs-platform-asus-wmi +++ b/Documentation/ABI/testing/sysfs-platform-asus-wmi @@ -63,6 +63,7 @@ Date: Aug 2022 KernelVersion: 6.1 Contact: "Luke Jones" Description: + DEPRECATED, WILL BE REMOVED SOON Switch the GPU hardware MUX mode. Laptops with this feature can can be toggled to boot with only the dGPU (discrete mode) or in standard Optimus/Hybrid mode. On switch a reboot is required: @@ -75,6 +76,7 @@ Date: Aug 2022 KernelVersion: 5.17 Contact: "Luke Jones" Description: + DEPRECATED, WILL BE REMOVED SOON Disable discrete GPU: * 0 - Enable dGPU, * 1 - Disable dGPU @@ -84,6 +86,7 @@ Date: Aug 2022 KernelVersion: 5.17 Contact: "Luke Jones" Description: + DEPRECATED, WILL BE REMOVED SOON Enable the external GPU paired with ROG X-Flow laptops. Toggling this setting will also trigger ACPI to disable the dGPU: =20 @@ -95,6 +98,7 @@ Date: Aug 2022 KernelVersion: 5.17 Contact: "Luke Jones" Description: + DEPRECATED, WILL BE REMOVED SOON Enable an LCD response-time boost to reduce or remove ghosting: * 0 - Disable, * 1 - Enable @@ -104,6 +108,7 @@ Date: Jun 2023 KernelVersion: 6.5 Contact: "Luke Jones" Description: + DEPRECATED, WILL BE REMOVED SOON Get the current charging mode being used: * 1 - Barrel connected charger, * 2 - USB-C charging @@ -114,6 +119,7 @@ Date: Jun 2023 KernelVersion: 6.5 Contact: "Luke Jones" Description: + DEPRECATED, WILL BE REMOVED SOON Show if the egpu (XG Mobile) is correctly connected: * 0 - False, * 1 - True @@ -123,6 +129,7 @@ Date: Jun 2023 KernelVersion: 6.5 Contact: "Luke Jones" Description: + DEPRECATED, WILL BE REMOVED SOON Change the mini-LED mode: * 0 - Single-zone, * 1 - Multi-zone @@ -133,6 +140,7 @@ Date: Apr 2024 KernelVersion: 6.10 Contact: "Luke Jones" Description: + DEPRECATED, WILL BE REMOVED SOON List the available mini-led modes. =20 What: /sys/devices/platform//ppt_pl1_spl @@ -140,6 +148,7 @@ Date: Jun 2023 KernelVersion: 6.5 Contact: "Luke Jones" Description: + DEPRECATED, WILL BE REMOVED SOON Set the Package Power Target total of CPU: PL1 on Intel, SPL on AMD. Shown on Intel+Nvidia or AMD+Nvidia based systems: =20 @@ -150,6 +159,7 @@ Date: Jun 2023 KernelVersion: 6.5 Contact: "Luke Jones" Description: + DEPRECATED, WILL BE REMOVED SOON Set the Slow Package Power Tracking Limit of CPU: PL2 on Intel, SPPT, on AMD. Shown on Intel+Nvidia or AMD+Nvidia based systems: =20 @@ -160,6 +170,7 @@ Date: Jun 2023 KernelVersion: 6.5 Contact: "Luke Jones" Description: + DEPRECATED, WILL BE REMOVED SOON Set the Fast Package Power Tracking Limit of CPU. AMD+Nvidia only: * min=3D5, max=3D250 =20 @@ -168,6 +179,7 @@ Date: Jun 2023 KernelVersion: 6.5 Contact: "Luke Jones" Description: + DEPRECATED, WILL BE REMOVED SOON Set the APU SPPT limit. Shown on full AMD systems only: * min=3D5, max=3D130 =20 @@ -176,6 +188,7 @@ Date: Jun 2023 KernelVersion: 6.5 Contact: "Luke Jones" Description: + DEPRECATED, WILL BE REMOVED SOON Set the platform SPPT limit. Shown on full AMD systems only: * min=3D5, max=3D130 =20 @@ -184,6 +197,7 @@ Date: Jun 2023 KernelVersion: 6.5 Contact: "Luke Jones" Description: + DEPRECATED, WILL BE REMOVED SOON Set the dynamic boost limit of the Nvidia dGPU: * min=3D5, max=3D25 =20 @@ -192,6 +206,7 @@ Date: Jun 2023 KernelVersion: 6.5 Contact: "Luke Jones" Description: + DEPRECATED, WILL BE REMOVED SOON Set the target temperature limit of the Nvidia dGPU: * min=3D75, max=3D87 =20 @@ -200,6 +215,7 @@ Date: Apr 2024 KernelVersion: 6.10 Contact: "Luke Jones" Description: + DEPRECATED, WILL BE REMOVED SOON Set if the BIOS POST sound is played on boot. * 0 - False, * 1 - True @@ -209,6 +225,7 @@ Date: Apr 2024 KernelVersion: 6.10 Contact: "Luke Jones" Description: + DEPRECATED, WILL BE REMOVED SOON Set if the MCU can go in to low-power mode on system sleep * 0 - False, * 1 - True diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 294364cc7478..7edab99d3ae9 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -301,6 +301,17 @@ config ASUS_WMI To compile this driver as a module, choose M here: the module will be called asus-wmi. =20 +config ASUS_WMI_DEPRECATED_ATTRS + bool "BIOS option support in WMI platform (DEPRECATED)" + depends on ASUS_WMI + default y + help + Say Y to expose the configurable BIOS options through the asus-wmi + driver. + + This can be used with or without the asus-armoury driver which + has the same attributes, but more, and better features. + config ASUS_NB_WMI tristate "Asus Notebook WMI Driver" depends on ASUS_WMI diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wm= i.c index e2ac3f20760a..ccaa06352d53 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -335,6 +335,13 @@ struct asus_wmi { /* Global to allow setting externally without requiring driver data */ static bool use_ally_mcu_hack; =20 +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) +static void asus_wmi_show_deprecated(void) +{ + pr_notice_once("Accessing attributes through /sys/bus/platform/asus_wmi i= s deprecated and will be removed in a future release. Please switch over to= /sys/class/firmware_attributes.\n"); +} +#endif /* IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) */ + /* WMI *******************************************************************= *****/ =20 static int asus_wmi_evaluate_method3(u32 method_id, @@ -726,6 +733,7 @@ static void asus_wmi_tablet_mode_get_state(struct asus_= wmi *asus) } =20 /* Charging mode, 1=3DBarrel, 2=3DUSB ************************************= ******/ +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) static ssize_t charge_mode_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -736,12 +744,16 @@ static ssize_t charge_mode_show(struct device *dev, if (result < 0) return result; =20 + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%d\n", value & 0xff); } =20 static DEVICE_ATTR_RO(charge_mode); +#endif /* IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) */ =20 /* dGPU ******************************************************************= **/ +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) static ssize_t dgpu_disable_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -752,6 +764,8 @@ static ssize_t dgpu_disable_show(struct device *dev, if (result < 0) return result; =20 + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%d\n", result); } =20 @@ -805,8 +819,10 @@ static ssize_t dgpu_disable_store(struct device *dev, return count; } static DEVICE_ATTR_RW(dgpu_disable); +#endif /* IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) */ =20 /* eGPU ******************************************************************= **/ +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) static ssize_t egpu_enable_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -817,6 +833,8 @@ static ssize_t egpu_enable_show(struct device *dev, if (result < 0) return result; =20 + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%d\n", result); } =20 @@ -873,8 +891,10 @@ static ssize_t egpu_enable_store(struct device *dev, return count; } static DEVICE_ATTR_RW(egpu_enable); +#endif /* IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) */ =20 /* Is eGPU connected? ****************************************************= *****/ +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) static ssize_t egpu_connected_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -885,12 +905,16 @@ static ssize_t egpu_connected_show(struct device *dev, if (result < 0) return result; =20 + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%d\n", result); } =20 static DEVICE_ATTR_RO(egpu_connected); +#endif /* IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) */ =20 /* gpu mux switch ********************************************************= *****/ +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) static ssize_t gpu_mux_mode_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -901,6 +925,8 @@ static ssize_t gpu_mux_mode_show(struct device *dev, if (result < 0) return result; =20 + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%d\n", result); } =20 @@ -959,6 +985,7 @@ static ssize_t gpu_mux_mode_store(struct device *dev, return count; } static DEVICE_ATTR_RW(gpu_mux_mode); +#endif /* IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) */ =20 /* TUF Laptop Keyboard RGB Modes *****************************************= *****/ static ssize_t kbd_rgb_mode_store(struct device *dev, @@ -1082,6 +1109,7 @@ static const struct attribute_group *kbd_rgb_mode_gro= ups[] =3D { }; =20 /* Tunable: PPT: Intel=3DPL1, AMD=3DSPPT *********************************= ********/ +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) static ssize_t ppt_pl2_sppt_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) @@ -1120,6 +1148,8 @@ static ssize_t ppt_pl2_sppt_show(struct device *dev, { struct asus_wmi *asus =3D dev_get_drvdata(dev); =20 + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%u\n", asus->ppt_pl2_sppt); } static DEVICE_ATTR_RW(ppt_pl2_sppt); @@ -1162,6 +1192,8 @@ static ssize_t ppt_pl1_spl_show(struct device *dev, { struct asus_wmi *asus =3D dev_get_drvdata(dev); =20 + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%u\n", asus->ppt_pl1_spl); } static DEVICE_ATTR_RW(ppt_pl1_spl); @@ -1205,6 +1237,8 @@ static ssize_t ppt_fppt_show(struct device *dev, { struct asus_wmi *asus =3D dev_get_drvdata(dev); =20 + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%u\n", asus->ppt_fppt); } static DEVICE_ATTR_RW(ppt_fppt); @@ -1248,6 +1282,8 @@ static ssize_t ppt_apu_sppt_show(struct device *dev, { struct asus_wmi *asus =3D dev_get_drvdata(dev); =20 + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%u\n", asus->ppt_apu_sppt); } static DEVICE_ATTR_RW(ppt_apu_sppt); @@ -1291,6 +1327,8 @@ static ssize_t ppt_platform_sppt_show(struct device *= dev, { struct asus_wmi *asus =3D dev_get_drvdata(dev); =20 + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%u\n", asus->ppt_platform_sppt); } static DEVICE_ATTR_RW(ppt_platform_sppt); @@ -1334,6 +1372,8 @@ static ssize_t nv_dynamic_boost_show(struct device *d= ev, { struct asus_wmi *asus =3D dev_get_drvdata(dev); =20 + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%u\n", asus->nv_dynamic_boost); } static DEVICE_ATTR_RW(nv_dynamic_boost); @@ -1377,9 +1417,12 @@ static ssize_t nv_temp_target_show(struct device *de= v, { struct asus_wmi *asus =3D dev_get_drvdata(dev); =20 + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%u\n", asus->nv_temp_target); } static DEVICE_ATTR_RW(nv_temp_target); +#endif /* IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) */ =20 /* Ally MCU Powersave ****************************************************= ****/ =20 @@ -1420,6 +1463,7 @@ void set_ally_mcu_powersave(bool enabled) } EXPORT_SYMBOL_NS_GPL(set_ally_mcu_powersave, "ASUS_WMI"); =20 +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) static ssize_t mcu_powersave_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -1430,6 +1474,8 @@ static ssize_t mcu_powersave_show(struct device *dev, if (result < 0) return result; =20 + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%d\n", result); } =20 @@ -1465,6 +1511,7 @@ static ssize_t mcu_powersave_store(struct device *dev, return count; } static DEVICE_ATTR_RW(mcu_powersave); +#endif /* IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) */ =20 /* Battery ***************************************************************= *****/ =20 @@ -2338,6 +2385,7 @@ static int asus_wmi_rfkill_init(struct asus_wmi *asus) } =20 /* Panel Overdrive *******************************************************= *****/ +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) static ssize_t panel_od_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -2348,6 +2396,8 @@ static ssize_t panel_od_show(struct device *dev, if (result < 0) return result; =20 + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%d\n", result); } =20 @@ -2384,9 +2434,10 @@ static ssize_t panel_od_store(struct device *dev, return count; } static DEVICE_ATTR_RW(panel_od); +#endif /* IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) */ =20 /* Bootup sound **********************************************************= *****/ - +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) static ssize_t boot_sound_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -2397,6 +2448,8 @@ static ssize_t boot_sound_show(struct device *dev, if (result < 0) return result; =20 + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%d\n", result); } =20 @@ -2432,8 +2485,10 @@ static ssize_t boot_sound_store(struct device *dev, return count; } static DEVICE_ATTR_RW(boot_sound); +#endif /* IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) */ =20 /* Mini-LED mode *********************************************************= *****/ +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) static ssize_t mini_led_mode_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -2464,6 +2519,8 @@ static ssize_t mini_led_mode_show(struct device *dev, } } =20 + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%d\n", value); } =20 @@ -2534,10 +2591,13 @@ static ssize_t available_mini_led_mode_show(struct = device *dev, return sysfs_emit(buf, "0 1 2\n"); } =20 + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "0\n"); } =20 static DEVICE_ATTR_RO(available_mini_led_mode); +#endif /* IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) */ =20 /* Quirks ****************************************************************= *****/ =20 @@ -3825,6 +3885,7 @@ static int throttle_thermal_policy_set_default(struct= asus_wmi *asus) return throttle_thermal_policy_write(asus); } =20 +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) static ssize_t throttle_thermal_policy_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -3868,6 +3929,7 @@ static ssize_t throttle_thermal_policy_store(struct d= evice *dev, * Throttle thermal policy: 0 - default, 1 - overboost, 2 - silent */ static DEVICE_ATTR_RW(throttle_thermal_policy); +#endif /* IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) */ =20 /* Platform profile ******************************************************= *****/ static int asus_wmi_platform_profile_get(struct device *dev, @@ -4469,27 +4531,29 @@ static struct attribute *platform_attributes[] =3D { &dev_attr_camera.attr, &dev_attr_cardr.attr, &dev_attr_touchpad.attr, - &dev_attr_charge_mode.attr, - &dev_attr_egpu_enable.attr, - &dev_attr_egpu_connected.attr, - &dev_attr_dgpu_disable.attr, - &dev_attr_gpu_mux_mode.attr, &dev_attr_lid_resume.attr, &dev_attr_als_enable.attr, &dev_attr_fan_boost_mode.attr, - &dev_attr_throttle_thermal_policy.attr, - &dev_attr_ppt_pl2_sppt.attr, - &dev_attr_ppt_pl1_spl.attr, - &dev_attr_ppt_fppt.attr, - &dev_attr_ppt_apu_sppt.attr, - &dev_attr_ppt_platform_sppt.attr, - &dev_attr_nv_dynamic_boost.attr, - &dev_attr_nv_temp_target.attr, - &dev_attr_mcu_powersave.attr, - &dev_attr_boot_sound.attr, - &dev_attr_panel_od.attr, - &dev_attr_mini_led_mode.attr, - &dev_attr_available_mini_led_mode.attr, +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) + &dev_attr_charge_mode.attr, + &dev_attr_egpu_enable.attr, + &dev_attr_egpu_connected.attr, + &dev_attr_dgpu_disable.attr, + &dev_attr_gpu_mux_mode.attr, + &dev_attr_ppt_pl2_sppt.attr, + &dev_attr_ppt_pl1_spl.attr, + &dev_attr_ppt_fppt.attr, + &dev_attr_ppt_apu_sppt.attr, + &dev_attr_ppt_platform_sppt.attr, + &dev_attr_nv_dynamic_boost.attr, + &dev_attr_nv_temp_target.attr, + &dev_attr_mcu_powersave.attr, + &dev_attr_boot_sound.attr, + &dev_attr_panel_od.attr, + &dev_attr_mini_led_mode.attr, + &dev_attr_available_mini_led_mode.attr, + &dev_attr_throttle_thermal_policy.attr, +#endif /* IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) */ NULL }; =20 @@ -4511,7 +4575,11 @@ static umode_t asus_sysfs_is_visible(struct kobject = *kobj, devid =3D ASUS_WMI_DEVID_LID_RESUME; else if (attr =3D=3D &dev_attr_als_enable.attr) devid =3D ASUS_WMI_DEVID_ALS_ENABLE; - else if (attr =3D=3D &dev_attr_charge_mode.attr) + else if (attr =3D=3D &dev_attr_fan_boost_mode.attr) + ok =3D asus->fan_boost_mode_available; + +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) + if (attr =3D=3D &dev_attr_charge_mode.attr) devid =3D ASUS_WMI_DEVID_CHARGE_MODE; else if (attr =3D=3D &dev_attr_egpu_enable.attr) ok =3D asus->egpu_enable_available; @@ -4549,6 +4617,7 @@ static umode_t asus_sysfs_is_visible(struct kobject *= kobj, ok =3D asus->mini_led_dev_id !=3D 0; else if (attr =3D=3D &dev_attr_available_mini_led_mode.attr) ok =3D asus->mini_led_dev_id !=3D 0; +#endif /* IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) */ =20 if (devid !=3D -1) { ok =3D !(asus_wmi_get_devstate_simple(asus, devid) < 0); @@ -4801,6 +4870,7 @@ static int asus_wmi_add(struct platform_device *pdev) } =20 /* ensure defaults for tunables */ +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) asus->ppt_pl2_sppt =3D 5; asus->ppt_pl1_spl =3D 5; asus->ppt_apu_sppt =3D 5; @@ -4822,17 +4892,18 @@ static int asus_wmi_add(struct platform_device *pde= v) asus->gpu_mux_dev =3D ASUS_WMI_DEVID_GPU_MUX; else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_GPU_MUX_VIVO)) asus->gpu_mux_dev =3D ASUS_WMI_DEVID_GPU_MUX_VIVO; - - if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE)) - asus->kbd_rgb_dev =3D ASUS_WMI_DEVID_TUF_RGB_MODE; - else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE2)) - asus->kbd_rgb_dev =3D ASUS_WMI_DEVID_TUF_RGB_MODE2; +#endif /* IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) */ =20 if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY)) asus->throttle_thermal_policy_dev =3D ASUS_WMI_DEVID_THROTTLE_THERMAL_PO= LICY; else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_THROTTLE_THERMAL_PO= LICY_VIVO)) asus->throttle_thermal_policy_dev =3D ASUS_WMI_DEVID_THROTTLE_THERMAL_PO= LICY_VIVO; =20 + if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE)) + asus->kbd_rgb_dev =3D ASUS_WMI_DEVID_TUF_RGB_MODE; + else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE2)) + asus->kbd_rgb_dev =3D ASUS_WMI_DEVID_TUF_RGB_MODE2; + err =3D fan_boost_mode_check_present(asus); if (err) goto fail_fan_boost_mode; --=20 2.48.1 From nobody Wed Dec 17 17:25:04 2025 Received: from fhigh-b2-smtp.messagingengine.com (fhigh-b2-smtp.messagingengine.com [202.12.124.153]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 178281F4621; Sun, 16 Mar 2025 23:08:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.153 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742166483; cv=none; b=u102uHsvuzCz+BFwr/EJdvYsnZeR7lLiIzEWyrlnG4cmbL3k/K/hIoHetNQz+h7au2+ZwsnJWX5tF9TU1vMSEme9vnsYfvq1h256yWHHFWjFzYyZZAFK6k1qkU3WXDmjNafnn//LBKGortpbc4XVneKioCqiyuVVl6PrpVS2HBM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742166483; c=relaxed/simple; bh=T3zHyRpnQkuklrDwADRbRsPwTeUl+rRDT/uC2+/js0Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=C4UO8udUs/G615wgKR3fJvv+JzNkKw4RwcX8j+IyxrkQDaLkemummgvPAm+wrcylHc9qWqEUgKJyV2S+e0IRWieLy3i3lPlHXtjBY7bp/gLEy1uCV2qKG3iXnU1GkhnH6SiRX4wYmIQ2zLcBeTc4+vM4MKQGJb9+w8HX0Hmf6LU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev; spf=none smtp.mailfrom=ljones.dev; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b=bAVbTFyS; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=f9JZbcia; arc=none smtp.client-ip=202.12.124.153 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=ljones.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b="bAVbTFyS"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="f9JZbcia" Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfhigh.stl.internal (Postfix) with ESMTP id 01457254012D; Sun, 16 Mar 2025 19:07:59 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-06.internal (MEProxy); Sun, 16 Mar 2025 19:08:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ljones.dev; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1742166479; x= 1742252879; bh=T1i2gx5VGhhH3xwtYDE40rmNDEw1Cuo4MaLBw25mF78=; b=b AVbTFyS70xY+vADJGJkHvKoSVL36qQkozneGjPBUqF28WzlxJDBBOLYwwMaJU7n2 mEIQCbflUmnsVKQyDY9b6/3t+BKjCN1qVHcLeafVNKtzP1cHqBUko3hCCLKkA8TT gPFdVeq69JJZT0Tq2KJOF+uBuNNtWXmQlE0v3lM3Eomxr650+UpntbfOqmASCchh Yj9KdrMkrL52s1glzdOITCSaQYKtbiA3RlMj80yem1Ys54jmSMtDIZSC/MqH0TqY 5309oTm4Xton1lScTO7IqV0M5z+fiuHWIt79i8M6v7dt9W3Qn7c/bwAOVXbM9N43 ef3xdbY8dB+GX/+i/4b3Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; t=1742166479; x=1742252879; bh=T 1i2gx5VGhhH3xwtYDE40rmNDEw1Cuo4MaLBw25mF78=; b=f9JZbciaAIYchK6Ay gfMyqqBfC6SooA5d+2+3LUG9bpkzKnVlCLj70IjpWsw3Vff40dUn6C8fbVB2VRgH Hiq2PkNPNAHLgipqlC3ta/D5s5/30SRI2S2YdftEmJXAujLBxv0Kb5M/RSriaUZz KPYeDc2y6U+DUocn+aQLL1kWyqb6gHoDEytwQpSpw6cDYznZ4SxWtW+LHhQ3by+7 FOPm/gBSw5t6/9UvzwpzguqMbpsoItyORP9CwpVpEi4hzM/cLDRjM58SV4yFvOUW I5JmeM5Ni/iDVCnY1gON0tTPEHb18lBG3vFBRQ/ONzEdcEbw4CX3pG9OtHu7Qj4u P1EVA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddufeejkeelucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhgggfestdekredtredt tdenucfhrhhomhepnfhukhgvucflohhnvghsuceolhhukhgvsehljhhonhgvshdruggvvh eqnecuggftrfgrthhtvghrnhepueeuleeffeeihfelhffhheelfeffgeetuefhheevkeet uedugfetfeetlefhieejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomheplhhukhgvsehljhhonhgvshdruggvvhdpnhgspghrtghpthhtohepiedp mhhouggvpehsmhhtphhouhhtpdhrtghpthhtoheplhhinhhugidqkhgvrhhnvghlsehvgh gvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtohephhguvghgohgvuggvsehrvgguhhgr thdrtghomhdprhgtphhtthhopehilhhpohdrjhgrrhhvihhnvghnsehlihhnuhigrdhinh htvghlrdgtohhmpdhrtghpthhtohepphhlrghtfhhorhhmqdgurhhivhgvrhdqgiekiees vhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehmrghrihhordhlihhmohhntg hivghllhhosegrmhgurdgtohhmpdhrtghpthhtoheplhhukhgvsehljhhonhgvshdruggv vh X-ME-Proxy: Feedback-ID: i5ec1447f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 16 Mar 2025 19:07:57 -0400 (EDT) From: Luke Jones To: linux-kernel@vger.kernel.org Cc: hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com, platform-driver-x86@vger.kernel.org, mario.limonciello@amd.com, "Luke D. Jones" Subject: [PATCH v7 8/8] platform/x86: asus-armoury: add ppt_* and nv_* tuning knobs Date: Mon, 17 Mar 2025 12:07:24 +1300 Message-ID: <20250316230724.100165-9-luke@ljones.dev> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250316230724.100165-1-luke@ljones.dev> References: <20250316230724.100165-1-luke@ljones.dev> 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" From: "Luke D. Jones" Adds the ppt_* and nv_* tuning knobs that are available via WMI methods and adds proper min/max levels plus defaults. The min/max are defined by ASUS and typically gained by looking at what they allow in the ASUS Armoury Crate application - ASUS does not share the values outside of this. It could also be possible to gain the AMD values by use of ryzenadj and testing for the minimum stable value. The general rule of thumb for adding to the match table is that if the model range has a single CPU used throughout, then the DMI match can omit the last letter of the model number as this is the GPU model. If a min or max value is not provided it is assumed that the particular setting is not supported. for example ppt_pl2_sppt_min/max is not set. If a _def is not set then the default is assumed to be _max Signed-off-by: Luke D. Jones --- drivers/platform/x86/asus-armoury.c | 217 +++- drivers/platform/x86/asus-armoury.h | 1087 +++++++++++++++++++- include/linux/platform_data/x86/asus-wmi.h | 3 + 3 files changed, 1300 insertions(+), 7 deletions(-) diff --git a/drivers/platform/x86/asus-armoury.c b/drivers/platform/x86/asu= s-armoury.c index 591805f46725..5598da5295b8 100644 --- a/drivers/platform/x86/asus-armoury.c +++ b/drivers/platform/x86/asus-armoury.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include =20 @@ -67,11 +68,25 @@ struct cpu_cores { u32 max_power_cores; }; =20 +struct rog_tunables { + const struct power_data *tuning_limits; + u32 ppt_pl1_spl; // cpu + u32 ppt_pl2_sppt; // cpu + u32 ppt_pl3_fppt; // cpu + u32 ppt_apu_sppt; // plat + u32 ppt_platform_sppt; // plat + + u32 nv_dynamic_boost; + u32 nv_temp_target; + u32 nv_tgp; +}; + static struct asus_armoury_priv { struct device *fw_attr_dev; struct kset *fw_attr_kset; =20 struct cpu_cores *cpu_cores; + struct rog_tunables *rog_tunables; u32 mini_led_dev_id; u32 gpu_mux_dev_id; /* @@ -741,6 +756,26 @@ ATTR_GROUP_CORES_RW(cores_efficiency, "cores_efficienc= y", "Set the max available efficiency cores"); =20 /* Simple attribute creation */ +ATTR_GROUP_ROG_TUNABLE(ppt_pl1_spl, "ppt_pl1_spl", ASUS_WMI_DEVID_PPT_PL1_= SPL, + "Set the CPU slow package limit"); +ATTR_GROUP_ROG_TUNABLE(ppt_pl2_sppt, "ppt_pl2_sppt", ASUS_WMI_DEVID_PPT_PL= 2_SPPT, + "Set the CPU fast package limit"); +ATTR_GROUP_ROG_TUNABLE(ppt_pl3_fppt, "ppt_pl3_fppt", ASUS_WMI_DEVID_PPT_FP= PT, + "Set the CPU fastest package limit"); +ATTR_GROUP_ROG_TUNABLE(ppt_apu_sppt, "ppt_apu_sppt", ASUS_WMI_DEVID_PPT_AP= U_SPPT, + "Set the APU package limit"); +ATTR_GROUP_ROG_TUNABLE(ppt_platform_sppt, "ppt_platform_sppt", ASUS_WMI_DE= VID_PPT_PLAT_SPPT, + "Set the platform package limit"); +ATTR_GROUP_ROG_TUNABLE(nv_dynamic_boost, "nv_dynamic_boost", ASUS_WMI_DEVI= D_NV_DYN_BOOST, + "Set the Nvidia dynamic boost limit"); +ATTR_GROUP_ROG_TUNABLE(nv_temp_target, "nv_temp_target", ASUS_WMI_DEVID_NV= _THERM_TARGET, + "Set the Nvidia max thermal limit"); +ATTR_GROUP_ROG_TUNABLE(nv_tgp, "dgpu_tgp", ASUS_WMI_DEVID_DGPU_SET_TGP, + "Set the additional TGP on top of the base TGP"); +ATTR_GROUP_INT_VALUE_ONLY_RO(nv_base_tgp, "nv_base_tgp", ASUS_WMI_DEVID_DG= PU_BASE_TGP, + "Read the base TGP value"); + + ATTR_GROUP_ENUM_INT_RO(charge_mode, "charge_mode", ASUS_WMI_DEVID_CHARGE_M= ODE, "0;1;2", "Show the current mode of charging"); =20 @@ -767,6 +802,16 @@ static const struct asus_attr_group armoury_attr_group= s[] =3D { { &cores_efficiency_attr_group, ASUS_WMI_DEVID_CORES_MAX }, { &cores_performance_attr_group, ASUS_WMI_DEVID_CORES_MAX }, =20 + { &ppt_pl1_spl_attr_group, ASUS_WMI_DEVID_PPT_PL1_SPL }, + { &ppt_pl2_sppt_attr_group, ASUS_WMI_DEVID_PPT_PL2_SPPT }, + { &ppt_pl3_fppt_attr_group, ASUS_WMI_DEVID_PPT_FPPT }, + { &ppt_apu_sppt_attr_group, ASUS_WMI_DEVID_PPT_APU_SPPT }, + { &ppt_platform_sppt_attr_group, ASUS_WMI_DEVID_PPT_PLAT_SPPT }, + { &nv_dynamic_boost_attr_group, ASUS_WMI_DEVID_NV_DYN_BOOST }, + { &nv_temp_target_attr_group, ASUS_WMI_DEVID_NV_THERM_TARGET }, + { &nv_base_tgp_attr_group, ASUS_WMI_DEVID_DGPU_BASE_TGP }, + { &nv_tgp_attr_group, ASUS_WMI_DEVID_DGPU_SET_TGP }, + { &charge_mode_attr_group, ASUS_WMI_DEVID_CHARGE_MODE }, { &boot_sound_attr_group, ASUS_WMI_DEVID_BOOT_SOUND }, { &mcu_powersave_attr_group, ASUS_WMI_DEVID_MCU_POWERSAVE }, @@ -774,8 +819,64 @@ static const struct asus_attr_group armoury_attr_group= s[] =3D { { &panel_hd_mode_attr_group, ASUS_WMI_DEVID_PANEL_HD }, }; =20 +/** + * should_create_tunable_attr - Determines if a tunable attribute should b= e created + * @name: The name of the attribute + * @limits: Pointer to the power_limits structure containing limit values + * + * This function checks if a power-related tunable attribute should be cre= ated + * based on whether appropriate limit values are available. It also logs a= n error + * if the attribute should exist but is missing required limit values. + * + * Return: true if the attribute should be created, false otherwise + */ +static bool should_create_tunable_attr(const char *name, + const struct power_limits *limits) +{ + bool is_tunable_attr =3D false; + bool has_limit =3D false; + + if (!limits) + return false; + + struct { + const char *attr_name; + u32 limit_value; + } limit_map[] =3D { + { "ppt_pl1_spl", limits->ppt_pl1_spl_max }, + { "ppt_pl2_sppt", limits->ppt_pl2_sppt_max }, + { "ppt_pl3_fppt", limits->ppt_pl3_fppt_max }, + { "ppt_apu_sppt", limits->ppt_apu_sppt_max }, + { "ppt_platform_sppt", limits->ppt_platform_sppt_max }, + { "nv_dynamic_boost", limits->nv_dynamic_boost_max }, + { "nv_temp_target", limits->nv_temp_target_max }, + { "nv_base_tgp", limits->nv_tgp_max }, + { "dgpu_tgp", limits->nv_tgp_max }, + }; + + for (int i =3D 0; i < ARRAY_SIZE(limit_map); i++) { + if (!strcmp(name, limit_map[i].attr_name)) { + is_tunable_attr =3D true; + has_limit =3D limit_map[i].limit_value > 0; + break; + } + } + + if (!is_tunable_attr) + return true; + + if (!has_limit) + pr_err("Missing max value on %s for tunable: %s\n", + dmi_get_system_info(DMI_BOARD_NAME), name); + + return has_limit; +} + static int asus_fw_attr_add(void) { + const struct power_limits *limits; + bool should_create; + const char *name; int err, i; =20 asus_armoury.fw_attr_dev =3D device_create(&firmware_attributes_class, NU= LL, MKDEV(0, 0), @@ -832,12 +933,25 @@ static int asus_fw_attr_add(void) if (!asus_wmi_is_present(armoury_attr_groups[i].wmi_devid)) continue; =20 - err =3D sysfs_create_group(&asus_armoury.fw_attr_kset->kobj, - armoury_attr_groups[i].attr_group); - if (err) { - pr_err("Failed to create sysfs-group for %s\n", - armoury_attr_groups[i].attr_group->name); - goto err_remove_groups; + /* Always create by default, unless PPT is not present */ + should_create =3D true; + name =3D armoury_attr_groups[i].attr_group->name; + + /* Check if this is a power-related tunable requiring limits */ + if (asus_armoury.rog_tunables && asus_armoury.rog_tunables->tuning_limit= s) { + limits =3D asus_armoury.rog_tunables->tuning_limits->ac_data; + should_create =3D should_create_tunable_attr(name, limits); + } + + if (should_create) { + err =3D sysfs_create_group( + &asus_armoury.fw_attr_kset->kobj, + armoury_attr_groups[i].attr_group); + if (err) { + pr_err("Failed to create sysfs-group for %s\n", + armoury_attr_groups[i].attr_group->name); + goto err_remove_groups; + } } } =20 @@ -866,6 +980,87 @@ static int asus_fw_attr_add(void) =20 /* Init / exit ***********************************************************= *****/ =20 +/* Set up the min/max and defaults for ROG tunables */ +static bool init_rog_tunables(struct rog_tunables *rog) +{ + const struct dmi_system_id *dmi_id; + const struct power_data *power_data; + const struct power_limits *limits; + + /* Match the system against the power_limits table */ + dmi_id =3D dmi_first_match(power_limits); + if (!dmi_id) { + pr_warn("No matching power limits found for this system\n"); + // rog->tuning_limits =3D &default_power_data; + rog->tuning_limits =3D NULL; + return false; + } + + /* Get the power data for this system */ + power_data =3D dmi_id->driver_data; + if (!power_data) { + pr_info("No power data available for this system\n"); + return false; + } + + /* Store the power limits for later use */ + rog->tuning_limits =3D power_data; + + if (power_supply_is_system_supplied()) { + limits =3D power_data->ac_data; + if (!limits) { + pr_warn("No AC power limits available\n"); + return false; + } + } else { + limits =3D power_data->dc_data; + if (!limits) { + rog->ppt_pl1_spl =3D 0; + rog->ppt_pl2_sppt =3D 0; + rog->ppt_pl3_fppt =3D 0; + rog->ppt_apu_sppt =3D 0; + rog->ppt_platform_sppt =3D 0; + rog->nv_dynamic_boost =3D 0; + rog->nv_temp_target =3D 0; + rog->nv_tgp =3D 0; + + pr_warn("No DC power limits available, initializing to 0\n"); + return true; + } + } + + /* Set initial values */ + rog->ppt_pl1_spl =3D limits->ppt_pl1_spl_def ? + limits->ppt_pl1_spl_def : + limits->ppt_pl1_spl_max; + + rog->ppt_pl2_sppt =3D limits->ppt_pl2_sppt_def ? + limits->ppt_pl2_sppt_def : + limits->ppt_pl2_sppt_max; + + rog->ppt_pl3_fppt =3D limits->ppt_pl3_fppt_def ? + limits->ppt_pl3_fppt_def : + limits->ppt_pl3_fppt_max; + + rog->ppt_apu_sppt =3D limits->ppt_apu_sppt_def ? + limits->ppt_apu_sppt_def : + limits->ppt_apu_sppt_max; + + rog->ppt_platform_sppt =3D limits->ppt_platform_sppt_def ? + limits->ppt_platform_sppt_def : + limits->ppt_platform_sppt_max; + + rog->nv_dynamic_boost =3D limits->nv_dynamic_boost_max; + rog->nv_temp_target =3D limits->nv_temp_target_max; + rog->nv_tgp =3D limits->nv_tgp_max; + + pr_debug("Power limits initialized for %s (%s power)\n", + dmi_id->matches[0].substr, + power_supply_is_system_supplied() ? "AC" : "DC"); + + return true; +} + static int __init asus_fw_init(void) { char *wmi_uid; @@ -896,6 +1091,16 @@ static int __init asus_fw_init(void) } } =20 + asus_armoury.rog_tunables =3D kzalloc(sizeof(struct rog_tunables), GFP_KE= RNEL); + if (!asus_armoury.rog_tunables) + return -ENOMEM; + /* Init logs warn/error and the driver should still be usable if init fai= ls */ + if (!init_rog_tunables(asus_armoury.rog_tunables)) { + kfree(asus_armoury.rog_tunables); + pr_err("Could not initialise PPT tunable control %d\n", err); + } + + /* Must always be last step to ensure data is available */ err =3D asus_fw_attr_add(); if (err) return err; diff --git a/drivers/platform/x86/asus-armoury.h b/drivers/platform/x86/asu= s-armoury.h index 584a75df113d..e61cf3fdb559 100644 --- a/drivers/platform/x86/asus-armoury.h +++ b/drivers/platform/x86/asus-armoury.h @@ -8,6 +8,7 @@ #ifndef _ASUS_ARMOURY_H_ #define _ASUS_ARMOURY_H_ =20 +#include #include #include =20 @@ -63,7 +64,6 @@ static struct kobj_attribute attr_##_attrname##_##_prop =3D \ __ASUS_ATTR_RO(_attrname, _prop) =20 - #define __ATTR_RO_INT_GROUP_ENUM(_attrname, _wmi, _fsname, _possible, _dis= pname)\ WMI_SHOW_INT(_attrname##_current_value, "%d\n", _wmi); \ static struct kobj_attribute attr_##_attrname##_current_value =3D \ @@ -190,4 +190,1089 @@ .name =3D _fsname, .attrs =3D _attrname##_attrs \ } =20 +#define ATTR_GROUP_INT_VALUE_ONLY_RO(_attrname, _fsname, _wmi, _dispname) \ + WMI_SHOW_INT(_attrname##_current_value, "%d\n", _wmi); \ + static struct kobj_attribute attr_##_attrname##_current_value =3D \ + __ASUS_ATTR_RO(_attrname, current_value); \ + __ATTR_SHOW_FMT(display_name, _attrname, "%s\n", _dispname); \ + static struct kobj_attribute attr_##_attrname##_type =3D \ + __ASUS_ATTR_RO_AS(type, int_type_show); \ + static struct attribute *_attrname##_attrs[] =3D { \ + &attr_##_attrname##_current_value.attr, \ + &attr_##_attrname##_display_name.attr, \ + &attr_##_attrname##_type.attr, NULL \ + }; \ + static const struct attribute_group _attrname##_attr_group =3D { \ + .name =3D _fsname, .attrs =3D _attrname##_attrs \ + } + +/* + * ROG PPT attributes need a little different in setup as they + * require rog_tunables members. + */ + + #define __ROG_TUNABLE_SHOW(_prop, _attrname, _val) \ + static ssize_t _attrname##_##_prop##_show( \ + struct kobject *kobj, struct kobj_attribute *attr, char *buf) \ + { \ + const struct power_limits *limits; \ + limits =3D power_supply_is_system_supplied() ? \ + asus_armoury.rog_tunables->tuning_limits->ac_data : \ + asus_armoury.rog_tunables->tuning_limits->dc_data; \ + if (!limits) \ + return -ENODEV; \ + return sysfs_emit(buf, "%d\n", limits->_val); \ + } \ + static struct kobj_attribute attr_##_attrname##_##_prop =3D \ + __ASUS_ATTR_RO(_attrname, _prop) + +#define __ROG_TUNABLE_SHOW_DEFAULT(_attrname) \ + static ssize_t _attrname##_default_value_show( \ + struct kobject *kobj, struct kobj_attribute *attr, char *buf) \ + { \ + const struct power_limits *limits; \ + limits =3D power_supply_is_system_supplied() ? \ + asus_armoury.rog_tunables->tuning_limits->ac_data : \ + asus_armoury.rog_tunables->tuning_limits->dc_data; \ + if (!limits) \ + return -ENODEV; \ + return sysfs_emit(buf, "%d\n", \ + limits->_attrname##_def ? \ + limits->_attrname##_def : \ + limits->_attrname##_max); \ + } \ + static struct kobj_attribute attr_##_attrname##_default_value =3D \ + __ASUS_ATTR_RO(_attrname, default_value) + +#define __ROG_TUNABLE_RW(_attr, _wmi) \ + static ssize_t _attr##_current_value_store( \ + struct kobject *kobj, struct kobj_attribute *attr, \ + const char *buf, size_t count) \ + { \ + const struct power_limits *limits; \ + limits =3D power_supply_is_system_supplied() ? \ + asus_armoury.rog_tunables->tuning_limits->ac_data : \ + asus_armoury.rog_tunables->tuning_limits->dc_data; \ + if (!limits) \ + return -ENODEV; \ + return attr_uint_store(kobj, attr, buf, count, \ + limits->_attr##_min, \ + limits->_attr##_max, \ + &asus_armoury.rog_tunables->_attr, \ + _wmi); \ + } \ + static ssize_t _attr##_current_value_show( \ + struct kobject *kobj, struct kobj_attribute *attr, \ + char *buf) \ + { \ + return sysfs_emit(buf, "%u\n", \ + asus_armoury.rog_tunables->_attr); \ + } \ + static struct kobj_attribute attr_##_attr##_current_value =3D \ + __ASUS_ATTR_RW(_attr, current_value) + +#define ATTR_GROUP_ROG_TUNABLE(_attrname, _fsname, _wmi, _dispname) \ + __ROG_TUNABLE_RW(_attrname, _wmi); \ + __ROG_TUNABLE_SHOW_DEFAULT(_attrname); \ + __ROG_TUNABLE_SHOW(min_value, _attrname, _attrname##_min); \ + __ROG_TUNABLE_SHOW(max_value, _attrname, _attrname##_max); \ + __ATTR_SHOW_FMT(scalar_increment, _attrname, "%d\n", 1); \ + __ATTR_SHOW_FMT(display_name, _attrname, "%s\n", _dispname); \ + static struct kobj_attribute attr_##_attrname##_type =3D \ + __ASUS_ATTR_RO_AS(type, int_type_show); \ + static struct attribute *_attrname##_attrs[] =3D { \ + &attr_##_attrname##_current_value.attr, \ + &attr_##_attrname##_default_value.attr, \ + &attr_##_attrname##_min_value.attr, \ + &attr_##_attrname##_max_value.attr, \ + &attr_##_attrname##_scalar_increment.attr, \ + &attr_##_attrname##_display_name.attr, \ + &attr_##_attrname##_type.attr, \ + NULL \ + }; \ + static const struct attribute_group _attrname##_attr_group =3D { \ + .name =3D _fsname, .attrs =3D _attrname##_attrs \ + } + +/* Default is always the maximum value unless *_def is specified */ +struct power_limits { + u8 ppt_pl1_spl_min; + u8 ppt_pl1_spl_def; + u8 ppt_pl1_spl_max; + u8 ppt_pl2_sppt_min; + u8 ppt_pl2_sppt_def; + u8 ppt_pl2_sppt_max; + u8 ppt_pl3_fppt_min; + u8 ppt_pl3_fppt_def; + u8 ppt_pl3_fppt_max; + u8 ppt_apu_sppt_min; + u8 ppt_apu_sppt_def; + u8 ppt_apu_sppt_max; + u8 ppt_platform_sppt_min; + u8 ppt_platform_sppt_def; + u8 ppt_platform_sppt_max; + /* Nvidia GPU specific, default is always max */ + u8 nv_dynamic_boost_def; // unused. exists for macro + u8 nv_dynamic_boost_min; + u8 nv_dynamic_boost_max; + u8 nv_temp_target_def; // unused. exists for macro + u8 nv_temp_target_min; + u8 nv_temp_target_max; + u8 nv_tgp_def; // unused. exists for macro + u8 nv_tgp_min; + u8 nv_tgp_max; +}; + +struct power_data { + const struct power_limits *ac_data; + const struct power_limits *dc_data; + bool requires_fan_curve; +}; + +/* + * For each avilable attribute there must be a min and a max. + * _def is not required and will be assumed to be default =3D=3D max if mi= ssing. + */ +static const struct dmi_system_id power_limits[] =3D { + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "FA401W"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_max =3D 80, + .ppt_pl2_sppt_min =3D 35, + .ppt_pl2_sppt_max =3D 80, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_max =3D 80, + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 25, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + .nv_tgp_min =3D 55, + .nv_tgp_max =3D 75, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 25, + .ppt_pl1_spl_max =3D 30, + .ppt_pl2_sppt_min =3D 31, + .ppt_pl2_sppt_max =3D 44, + .ppt_pl3_fppt_min =3D 45, + .ppt_pl3_fppt_max =3D 65, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "FA507N"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_max =3D 80, + .ppt_pl2_sppt_min =3D 35, + .ppt_pl2_sppt_max =3D 80, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_max =3D 80, + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 25, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_def =3D 45, + .ppt_pl1_spl_max =3D 65, + .ppt_pl2_sppt_min =3D 35, + .ppt_pl2_sppt_def =3D 54, + .ppt_pl2_sppt_max =3D 65, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_max =3D 65, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + } + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "FA507R"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_max =3D 80, + .ppt_pl2_sppt_min =3D 25, + .ppt_pl2_sppt_max =3D 80, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_max =3D 80 + }, + .dc_data =3D NULL + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "FA507X"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_max =3D 80, + .ppt_pl2_sppt_min =3D 35, + .ppt_pl2_sppt_max =3D 80, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_max =3D 80, + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 20, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + .nv_tgp_min =3D 55, + .nv_tgp_max =3D 85, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_def =3D 45, + .ppt_pl1_spl_max =3D 65, + .ppt_pl2_sppt_min =3D 35, + .ppt_pl2_sppt_def =3D 54, + .ppt_pl2_sppt_max =3D 65, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_max =3D 65, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + } + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "FA507Z"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 28, + .ppt_pl1_spl_max =3D 65, + .ppt_pl2_sppt_min =3D 28, + .ppt_pl2_sppt_max =3D 105, + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 15, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + .nv_tgp_min =3D 55, + .nv_tgp_max =3D 85, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 25, + .ppt_pl1_spl_max =3D 45, + .ppt_pl2_sppt_min =3D 35, + .ppt_pl2_sppt_max =3D 60, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + } + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "FA607P"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 30, + .ppt_pl1_spl_def =3D 100, + .ppt_pl1_spl_max =3D 135, + .ppt_pl2_sppt_min =3D 30, + .ppt_pl2_sppt_def =3D 115, + .ppt_pl2_sppt_max =3D 135, + .ppt_pl3_fppt_min =3D 30, + .ppt_pl3_fppt_max =3D 135, + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 25, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + .nv_tgp_min =3D 55, + .nv_tgp_max =3D 115, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 25, + .ppt_pl1_spl_def =3D 45, + .ppt_pl1_spl_max =3D 80, + .ppt_pl2_sppt_min =3D 25, + .ppt_pl2_sppt_def =3D 60, + .ppt_pl2_sppt_max =3D 80, + .ppt_pl3_fppt_min =3D 25, + .ppt_pl3_fppt_max =3D 80, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + } + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "FA617NS"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_apu_sppt_min =3D 15, + .ppt_apu_sppt_max =3D 80, + .ppt_platform_sppt_min =3D 30, + .ppt_platform_sppt_max =3D 120 + }, + .dc_data =3D &(struct power_limits) { + .ppt_apu_sppt_min =3D 25, + .ppt_apu_sppt_max =3D 35, + .ppt_platform_sppt_min =3D 45, + .ppt_platform_sppt_max =3D 100 + } + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "FA617NT"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_apu_sppt_min =3D 15, + .ppt_apu_sppt_max =3D 80, + .ppt_platform_sppt_min =3D 30, + .ppt_platform_sppt_max =3D 115 + }, + .dc_data =3D &(struct power_limits) { + .ppt_apu_sppt_min =3D 15, + .ppt_apu_sppt_max =3D 45, + .ppt_platform_sppt_min =3D 30, + .ppt_platform_sppt_max =3D 50 + } + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "FA617XS"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_apu_sppt_min =3D 15, + .ppt_apu_sppt_max =3D 80, + .ppt_platform_sppt_min =3D 30, + .ppt_platform_sppt_max =3D 120, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .dc_data =3D &(struct power_limits) { + .ppt_apu_sppt_min =3D 25, + .ppt_apu_sppt_max =3D 35, + .ppt_platform_sppt_min =3D 45, + .ppt_platform_sppt_max =3D 100, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + } + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "FX507Z"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 28, + .ppt_pl1_spl_max =3D 90, + .ppt_pl2_sppt_min =3D 28, + .ppt_pl2_sppt_max =3D 135, + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 15, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 25, + .ppt_pl1_spl_max =3D 45, + .ppt_pl2_sppt_min =3D 35, + .ppt_pl2_sppt_max =3D 60, + }, + .requires_fan_curve =3D true, + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "GA401Q"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_max =3D 80, + .ppt_pl2_sppt_min =3D 15, + .ppt_pl2_sppt_max =3D 80, + }, + .dc_data =3D NULL + }, + }, + { + .matches =3D { + // This model is full AMD. No Nvidia dGPU. + DMI_MATCH(DMI_BOARD_NAME, "GA402R"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_apu_sppt_min =3D 15, + .ppt_apu_sppt_max =3D 80, + .ppt_platform_sppt_min =3D 30, + .ppt_platform_sppt_max =3D 115, + }, + .dc_data =3D &(struct power_limits) { + .ppt_apu_sppt_min =3D 25, + .ppt_apu_sppt_def =3D 30, + .ppt_apu_sppt_max =3D 45, + .ppt_platform_sppt_min =3D 40, + .ppt_platform_sppt_max =3D 60, + } + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "GA402X"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_def =3D 35, + .ppt_pl1_spl_max =3D 80, + .ppt_pl2_sppt_min =3D 25, + .ppt_pl2_sppt_def =3D 65, + .ppt_pl2_sppt_max =3D 80, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_max =3D 80, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_max =3D 35, + .ppt_pl2_sppt_min =3D 25, + .ppt_pl2_sppt_max =3D 35, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_max =3D 65, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .requires_fan_curve =3D true, + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "GA403U"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_max =3D 80, + .ppt_pl2_sppt_min =3D 25, + .ppt_pl2_sppt_max =3D 80, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_max =3D 80, + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 25, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + .nv_tgp_min =3D 55, + .nv_tgp_max =3D 65, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_max =3D 35, + .ppt_pl2_sppt_min =3D 25, + .ppt_pl2_sppt_max =3D 35, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_max =3D 65, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .requires_fan_curve =3D true, + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "GA503R"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_def =3D 35, + .ppt_pl1_spl_max =3D 80, + .ppt_pl2_sppt_min =3D 35, + .ppt_pl2_sppt_def =3D 65, + .ppt_pl2_sppt_max =3D 80, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_max =3D 80, + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 20, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_def =3D 25, + .ppt_pl1_spl_max =3D 65, + .ppt_pl2_sppt_min =3D 35, + .ppt_pl2_sppt_def =3D 54, + .ppt_pl2_sppt_max =3D 60, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_max =3D 65 + } + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "GA605W"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_max =3D 80, + .ppt_pl2_sppt_min =3D 35, + .ppt_pl2_sppt_max =3D 80, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_max =3D 80, + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 20, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + .nv_tgp_min =3D 55, + .nv_tgp_max =3D 85, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 25, + .ppt_pl1_spl_max =3D 35, + .ppt_pl2_sppt_min =3D 31, + .ppt_pl2_sppt_max =3D 44, + .ppt_pl3_fppt_min =3D 45, + .ppt_pl3_fppt_max =3D 65, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .requires_fan_curve =3D true, + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "GU603Z"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 25, + .ppt_pl1_spl_max =3D 60, + .ppt_pl2_sppt_min =3D 25, + .ppt_pl2_sppt_max =3D 135, + /* Only allowed in AC mode */ + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 20, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 25, + .ppt_pl1_spl_max =3D 40, + .ppt_pl2_sppt_min =3D 25, + .ppt_pl2_sppt_max =3D 40, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + } + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "GU604V"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 65, + .ppt_pl1_spl_max =3D 120, + .ppt_pl2_sppt_min =3D 65, + .ppt_pl2_sppt_max =3D 150, + /* Only allowed in AC mode */ + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 25, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 25, + .ppt_pl1_spl_max =3D 40, + .ppt_pl2_sppt_min =3D 35, + .ppt_pl2_sppt_def =3D 40, + .ppt_pl2_sppt_max =3D 60, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + } + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "GU605M"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 28, + .ppt_pl1_spl_max =3D 90, + .ppt_pl2_sppt_min =3D 28, + .ppt_pl2_sppt_max =3D 135, + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 20, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 25, + .ppt_pl1_spl_max =3D 35, + .ppt_pl2_sppt_min =3D 38, + .ppt_pl2_sppt_max =3D 53, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .requires_fan_curve =3D true, + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "GV301Q"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_max =3D 45, + .ppt_pl2_sppt_min =3D 65, + .ppt_pl2_sppt_max =3D 80, + }, + .dc_data =3D NULL + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "GV301R"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_max =3D 45, + .ppt_pl2_sppt_min =3D 25, + .ppt_pl2_sppt_max =3D 54, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_max =3D 65, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_max =3D 35, + .ppt_pl2_sppt_min =3D 25, + .ppt_pl2_sppt_max =3D 35, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_max =3D 65, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + } + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "GV601R"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_def =3D 35, + .ppt_pl1_spl_max =3D 90, + .ppt_pl2_sppt_min =3D 35, + .ppt_pl2_sppt_def =3D 54, + .ppt_pl2_sppt_max =3D 100, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_def =3D 80, + .ppt_pl3_fppt_max =3D 125, + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 25, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_def =3D 28, + .ppt_pl1_spl_max =3D 65, + .ppt_pl2_sppt_min =3D 35, + .ppt_pl2_sppt_def =3D 54, + .ppt_pl2_sppt_def =3D 40, + .ppt_pl2_sppt_max =3D 60, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_def =3D 80, + .ppt_pl3_fppt_max =3D 65, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + } + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "GV601V"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 28, + .ppt_pl1_spl_def =3D 100, + .ppt_pl1_spl_max =3D 110, + .ppt_pl2_sppt_min =3D 28, + .ppt_pl2_sppt_max =3D 135, + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 20, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 25, + .ppt_pl1_spl_max =3D 40, + .ppt_pl2_sppt_min =3D 35, + .ppt_pl2_sppt_def =3D 40, + .ppt_pl2_sppt_max =3D 60, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + } + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "GX650P"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_def =3D 110, + .ppt_pl1_spl_max =3D 130, + .ppt_pl2_sppt_min =3D 35, + .ppt_pl2_sppt_def =3D 125, + .ppt_pl2_sppt_max =3D 130, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_def =3D 125, + .ppt_pl3_fppt_max =3D 135, + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 25, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_def =3D 25, + .ppt_pl1_spl_max =3D 65, + .ppt_pl2_sppt_min =3D 35, + .ppt_pl2_sppt_def =3D 35, + .ppt_pl2_sppt_max =3D 65, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_def =3D 42, + .ppt_pl3_fppt_max =3D 65, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + } + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "G513I"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + /* Yes this laptop is very limited */ + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_max =3D 80, + .ppt_pl2_sppt_min =3D 15, + .ppt_pl2_sppt_max =3D 80, + }, + .dc_data =3D NULL, + .requires_fan_curve =3D true, + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "G513QM"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + /* Yes this laptop is very limited */ + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_max =3D 100, + .ppt_pl2_sppt_min =3D 15, + .ppt_pl2_sppt_max =3D 190, + }, + .dc_data =3D NULL, + .requires_fan_curve =3D true, + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "G513R"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 35, + .ppt_pl1_spl_max =3D 90, + .ppt_pl2_sppt_min =3D 54, + .ppt_pl2_sppt_max =3D 100, + .ppt_pl3_fppt_min =3D 54, + .ppt_pl3_fppt_max =3D 125, + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 25, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 28, + .ppt_pl1_spl_max =3D 50, + .ppt_pl2_sppt_min =3D 28, + .ppt_pl2_sppt_max =3D 50, + .ppt_pl3_fppt_min =3D 28, + .ppt_pl3_fppt_max =3D 65, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .requires_fan_curve =3D true, + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "G614J"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 28, + .ppt_pl1_spl_max =3D 140, + .ppt_pl2_sppt_min =3D 28, + .ppt_pl2_sppt_max =3D 175, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 25, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 25, + .ppt_pl1_spl_max =3D 55, + .ppt_pl2_sppt_min =3D 25, + .ppt_pl2_sppt_max =3D 70, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .requires_fan_curve =3D true, + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "G634J"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 28, + .ppt_pl1_spl_max =3D 140, + .ppt_pl2_sppt_min =3D 28, + .ppt_pl2_sppt_max =3D 175, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 25, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 25, + .ppt_pl1_spl_max =3D 55, + .ppt_pl2_sppt_min =3D 25, + .ppt_pl2_sppt_max =3D 70, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .requires_fan_curve =3D true, + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "G733C"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 28, + .ppt_pl1_spl_max =3D 170, + .ppt_pl2_sppt_min =3D 28, + .ppt_pl2_sppt_max =3D 175, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 25, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 28, + .ppt_pl1_spl_max =3D 35, + .ppt_pl2_sppt_min =3D 28, + .ppt_pl2_sppt_max =3D 35, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .requires_fan_curve =3D true, + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "G733P"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 30, + .ppt_pl1_spl_def =3D 100, + .ppt_pl1_spl_max =3D 130, + .ppt_pl2_sppt_min =3D 65, + .ppt_pl2_sppt_def =3D 125, + .ppt_pl2_sppt_max =3D 130, + .ppt_pl3_fppt_min =3D 65, + .ppt_pl3_fppt_def =3D 125, + .ppt_pl3_fppt_max =3D 130, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 25, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 25, + .ppt_pl1_spl_max =3D 65, + .ppt_pl2_sppt_min =3D 25, + .ppt_pl2_sppt_max =3D 65, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_max =3D 75, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .requires_fan_curve =3D true, + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "G814J"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 28, + .ppt_pl1_spl_max =3D 140, + .ppt_pl2_sppt_min =3D 28, + .ppt_pl2_sppt_max =3D 140, + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 25, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 25, + .ppt_pl1_spl_max =3D 55, + .ppt_pl2_sppt_min =3D 25, + .ppt_pl2_sppt_max =3D 70, + }, + .requires_fan_curve =3D true, + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "G834J"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 28, + .ppt_pl1_spl_max =3D 140, + .ppt_pl2_sppt_min =3D 28, + .ppt_pl2_sppt_max =3D 175, + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 25, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 25, + .ppt_pl1_spl_max =3D 55, + .ppt_pl2_sppt_min =3D 25, + .ppt_pl2_sppt_max =3D 70, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .requires_fan_curve =3D true, + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "H7606W"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_max =3D 80, + .ppt_pl2_sppt_min =3D 35, + .ppt_pl2_sppt_max =3D 80, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_max =3D 80, + .nv_dynamic_boost_min =3D 5, + .nv_dynamic_boost_max =3D 20, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + .nv_tgp_min =3D 55, + .nv_tgp_max =3D 85, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 25, + .ppt_pl1_spl_max =3D 35, + .ppt_pl2_sppt_min =3D 31, + .ppt_pl2_sppt_max =3D 44, + .ppt_pl3_fppt_min =3D 45, + .ppt_pl3_fppt_max =3D 65, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + } + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "RC71"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 7, + .ppt_pl1_spl_max =3D 30, + .ppt_pl2_sppt_min =3D 15, + .ppt_pl2_sppt_max =3D 43, + .ppt_pl3_fppt_min =3D 15, + .ppt_pl3_fppt_max =3D 53 + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 7, + .ppt_pl1_spl_def =3D 15, + .ppt_pl1_spl_max =3D 25, + .ppt_pl2_sppt_min =3D 15, + .ppt_pl2_sppt_def =3D 20, + .ppt_pl2_sppt_max =3D 30, + .ppt_pl3_fppt_min =3D 15, + .ppt_pl3_fppt_def =3D 25, + .ppt_pl3_fppt_max =3D 35 + } + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "RC72"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 7, + .ppt_pl1_spl_max =3D 30, + .ppt_pl2_sppt_min =3D 15, + .ppt_pl2_sppt_max =3D 43, + .ppt_pl3_fppt_min =3D 15, + .ppt_pl3_fppt_max =3D 53 + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 7, + .ppt_pl1_spl_def =3D 17, + .ppt_pl1_spl_max =3D 25, + .ppt_pl2_sppt_min =3D 15, + .ppt_pl2_sppt_def =3D 24, + .ppt_pl2_sppt_max =3D 30, + .ppt_pl3_fppt_min =3D 15, + .ppt_pl3_fppt_def =3D 30, + .ppt_pl3_fppt_max =3D 35 + } + }, + }, + {} +}; + #endif /* _ASUS_ARMOURY_H_ */ diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/pla= tform_data/x86/asus-wmi.h index 92fea0710ada..bf53592e2a2f 100644 --- a/include/linux/platform_data/x86/asus-wmi.h +++ b/include/linux/platform_data/x86/asus-wmi.h @@ -145,6 +145,9 @@ =20 #define ASUS_WMI_DEVID_APU_MEM 0x000600C1 =20 +#define ASUS_WMI_DEVID_DGPU_BASE_TGP 0x00120099 +#define ASUS_WMI_DEVID_DGPU_SET_TGP 0x00120098 + /* gpu mux switch, 0 =3D dGPU, 1 =3D Optimus */ #define ASUS_WMI_DEVID_GPU_MUX 0x00090016 #define ASUS_WMI_DEVID_GPU_MUX_VIVO 0x00090026 --=20 2.48.1