From nobody Fri Dec 19 15:48:13 2025 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9A3F02D0C7E for ; Mon, 13 Oct 2025 18:06:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760378763; cv=none; b=rPtgKr6Af2XiLlJfzZKxjdlodwU/1pxByvqTL3UruA3kNAGlNUr1U3gTHe0zXmDnFdu+ZqVReZM4yUO3mB3OjyGqsxDsO9W1ox+25q/BDeFAVDA48t9usEN0VKt/4esz34QLSFSA2GW+DovwICGkz9J7YcbM8bPuQ9NTJ3ix8GY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760378763; c=relaxed/simple; bh=N2ZXUZbekSyi2QUa5AhmczgUZDM3XEWCe9o7oZmLxSU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rBgI0A3fbbxdoQ0Iv6XtVjpqQmRpz+0gNU3asXLJDq08/zeucvUBK30h+M+aAIV4eLi38UJ1CtLskM3+PEZyur6VfVEK7vR+CyPjj8zxUJxDzokkSAR8tm5VgoW6s63Nxb8CGIwKr/kTbejUvKqPtM8GtONd4HE986uFBz6F2bQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BV4TihKH; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BV4TihKH" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-46fcf9f63b6so3517355e9.2 for ; Mon, 13 Oct 2025 11:06:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760378760; x=1760983560; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OAfg/MBoirlA9xSB1hCJrMdG5U1jpf80VoCLnIdIJws=; b=BV4TihKH3ZOnIP904W58dafZYvN8FwqWc8yNSUUi4UBVXfFvFenKCoHrw0v4El+o1b wDkERrHHM6R4QeK+pmd7lKzclNOfrG0w0UfudHMcyeZT421lHpFBheY25uChxqLU+D0g ZNzjXQy9uqvdSnqLq/WX3IAHZ4VjLxOvDRXKuKEjpUBCeTiBKac/Pj6kwMW43VAejUNo 4SkTAeDE7dFh8nAKhR3eJY8oYIY3kigaWjqxIe8j6aNUk/UISQe8TzrBTR6dDzbIDH2b piANbxDA0dpIQ7yIWECnHNcKETtGFMi+Zw03jNcwQw+P7/6Kk16ku4+5904ZNHIyV5Ov mFJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760378760; x=1760983560; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OAfg/MBoirlA9xSB1hCJrMdG5U1jpf80VoCLnIdIJws=; b=wpP+Be36z4R4+Fy3BbQBs17YnAfe1HV6TKepxjHVSektYFPQS54s3SQDJUnbUT+W91 kz8j3bujrw3Y14PyEd5qiEbGAMYZ3tODZgA47RSPMsxX/mio446Z02NxgzlJDJCZlEDy bx1O19kysxjrYWtKfPWUi1Ji0c5L0EmXrPo/BH8sdKuoW+mdOm76gduRZUs9rO3aTRN+ 5j0S4LTt24Nmw2lXG8r/mraa37dvstEoM3rMkw9SsSBdS85juolJ7vKDqxEjIXNc3t0V 5iRbF7nBDiyR6/W20lT+DVap3+lE3vWHZkMDdtUBQ4tqIhHywhTKmJz4VxOUvsA38PaU 0nFg== X-Gm-Message-State: AOJu0YySTqtuX1QGvhcqNhdszTQvzfftAU2O3E43RwOM/4n8HbsVCbDQ dgNomAtXd1efBqw9EyDd5EU6xlo4PwnNGumBilvrBDwIGn0Ff3sgYc3AcNY/Ew== X-Gm-Gg: ASbGncupTcNerS7DH9zg9ZbabeI9tFMcjeLZMSxv1DTFfPgOxioLUAPIxuHZxkxpWYZ fJgVMbdTFw+d4HhCQMCZ4rrhcHsHYC1DzWhcz3I6/Hvh9yBjIWVUHGeZN5gCVVc+z7h8Ass4o1G TKL8Adcub6IPgGX2sp1aHfYO/WbCNKz3fMLaxrYdBiUoJCTLO8lxs6MInfausggipqLEgH49UMe jeXTvoXCgvkbBMmBmuWVIusGE+bCujN/P9sOgZ4jK7B7elDtEKgbTH7h/xo9HKji8GhFovI6YjK CSRSSIeAtHU6VZGXP8t9N8wv8ZWFqu8xcsXOhp1vMUxsKhwKeoM3WelMTkqGFNIJ/cmDuhaKWE5 SkI6izxCFwjv37ubu9gsJher6FOy0KMSBRjJL0kxM9rLUZ1vgxaHx9cmr X-Google-Smtp-Source: AGHT+IFfDwwsAH09+g4Iav/Kv9Dm8NCqclnvfRSKnJYDbTBfQmTlV4Qida/l+KvTxHEmIMF+71kyaQ== X-Received: by 2002:a05:600c:4687:b0:46e:37a4:d003 with SMTP id 5b1f17b1804b1-46fae33dbbdmr140036145e9.8.1760378759648; Mon, 13 Oct 2025 11:05:59 -0700 (PDT) Received: from denis-pc ([176.206.100.218]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce589b3dsm19933428f8f.24.2025.10.13.11.05.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Oct 2025 11:05:59 -0700 (PDT) From: Denis Benato To: linux-kernel@vger.kernel.org Cc: platform-driver-x86@vger.kernel.org, "Hans de Goede" , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , "Limonciello, Mario" , "Luke D . Jones" , "Alok Tiwari" , "Derek John Clark" , "Mateusz Schyboll" , porfet828@gmail.com, Denis Benato Subject: [PATCH v13 1/8] platform/x86: asus-wmi: export symbols used for read/write WMI Date: Mon, 13 Oct 2025 20:05:27 +0200 Message-ID: <20251013180534.1222432-2-benato.denis96@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013180534.1222432-1-benato.denis96@gmail.com> References: <20251013180534.1222432-1-benato.denis96@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: "Luke D. Jones" Export symbols for reading/writing 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 intended for use with DSTS WMI method only and avoids requiring the asus_wmi driver data to select the WMI method. Signed-off-by: Denis Benato Signed-off-by: Luke D. Jones Reviewed-by: Mario Limonciello --- drivers/platform/x86/asus-wmi.c | 40 ++++++++++++++++++++-- include/linux/platform_data/x86/asus-wmi.h | 5 +++ 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wm= i.c index e72a2b5d158e..38ab5306e05a 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -390,7 +390,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) @@ -554,12 +554,46 @@ 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. + * @return: 0 on success and retval is filled. + * @return: -ENODEV if the method ID is unsupported. + * @return: everything else is an error from WMI call. + */ +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. + * @return: 0 on success and retval is filled. + * @return: everything else is an error from WMI call. + * + * A asus_wmi_set_devstate() call must be paired with a + * asus_wmi_get_devstate_dsts() to check if the WMI function is supported. + */ +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 8a515179113d..dbd44d9fbb6f 100644 --- a/include/linux/platform_data/x86/asus-wmi.h +++ b/include/linux/platform_data/x86/asus-wmi.h @@ -166,6 +166,7 @@ enum asus_ally_mcu_hack { #if IS_REACHABLE(CONFIG_ASUS_WMI) void set_ally_mcu_hack(enum asus_ally_mcu_hack status); 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 @@ -179,6 +180,10 @@ 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_evaluate_method(u32 method_id, u32 arg0, u32 ar= g1, u32 *retval) { --=20 2.51.0 From nobody Fri Dec 19 15:48:13 2025 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 848412D0C89 for ; Mon, 13 Oct 2025 18:06:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760378766; cv=none; b=rjGaldN8BbPoeFRy1kdNXqaDpkidSeJjem98/U3Dx85vB8bP2eDtOdGf8c13BApaRYlH2lPCuznSPAGYyNtdeuJkTqTI4ckyHNiPCHXs3+W7tA0k0OX/IetZwWckH0r8IF7RMBqHgXauMVnY28XlmaQtjA3BbntsKEschmF9IYk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760378766; c=relaxed/simple; bh=JnFEB1zfPIgTeNvxDUlq/ENOs5f13JuP3gq33Phdwu4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Un5/YerC2D0p89PolMyENesJcgmMG1ShLtBW2fp+lCDXPY1XL4GF+iewdXaNGXf1v5ersyisVtGbrIhfC8aspWe/krQUa6Bm0S952DxjqAVOljti8Dt+g/uChQHbnCqLEN9GVBVSzCoI2SmzGqm7d4NJ2QaM+MznJQmevQ8whrY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Bd47B/mI; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Bd47B/mI" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-46e504975dbso26355205e9.1 for ; Mon, 13 Oct 2025 11:06:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760378761; x=1760983561; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DvW/p3WSXzasdlPz6egbM6LxJzT8873EOQRHO7ajI9A=; b=Bd47B/mIJvtSnTVBj2+QwP3kCc4xoGFHhYj3bMO6abtoyJhJhZJVwWCgTki6SrYcma F3KOyT6z0yTmv2tCTveyE62gF86FaQasCWbkgdNpDT2keKRFnjcKrIceS6UUFh+HwIik wuEOg4IZk5xoYcBz+yQecw547cMJzzMGOxDkvymELw5Jg5fJUjVO1KKX53WPYaaXLXRM c+jzYEmjJN1HRnmCH92oQp0z3b1mhFmRxJFWIjS4nPu8bye/gec9olFbxFJ+R6VVzog3 bRRe7w+X1lEKiYM5RU00VKE/xWfeoOS8UGSKqkUXkiV/Xuz8P6wANuI61VVJH1qoDT4S vooA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760378761; x=1760983561; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DvW/p3WSXzasdlPz6egbM6LxJzT8873EOQRHO7ajI9A=; b=cGXgT4uZG/oHiuZh3cLU8NPcTt7GHTj3LZ2UXzhscJH+p5gQUpNnegJ2ZzvAAG9C/V dUeoMYEqAEzoFPRwRRw5KimbB/3DuLv66yWJwCBjG87sRzoCXImKfrtiPWV1YmOEoJA4 p6JGggSXykVKL2CjXUlpuItYMJYPgjAUWJlaUMK+zMIZrMlSv28iZ/sp8oQ8KnTxx1c4 GuFXVg7FwgVLgb6sL6Ui0zeKWYaTYAcjPEPHYNR58pMJccPJ+wvwNFLANn8qzB1EA+Iu UdjhuRBh4EGVDxwA1fU2rYxB+o7A6GOHmGuAEi0+JrmPG6Fb/i85c4LZEZAcuBBLApUQ X8BQ== X-Gm-Message-State: AOJu0YzdazomUsop2C3iUipFJNa1AqqlSQFnzFGT0Ac8kNMdHerA5n+s 8aOTxGtwt0DVaxwMGLHfE1USDUQN8U0TDmLzZZKkzKQQvT+hHsMN6xQlGj5JyA== X-Gm-Gg: ASbGnct92pcPsuR63ipMsw00vREfUwiIG7I0up+hIT0aVr9/5r5ILJLWBB4hOCK+d3+ JYe/7ssd7DK9+a8IeqLrLqIRQuxVKSd1p9lJfBJW9K3Tlt2r9MKFs2TECPhWsQt0ChLkLaRS/hG w8lih4CPAQ5ZcNVXgeBpawPvjjtgRsVcCukErBWDjtujZS1k8HzRmA0MUEW7Bg0bsYOg8QQh73Z IX2W9L3Sznte3V9qfWeeWCEBsiBY8B06Gf/Nv6q4rMT80s4BcW/uqRDmWYC6Q2TiRWqmPQvAPpH 0IM8mTAPexwE3ir8obw15NsE2Cl+lakdEAIifrnOgyGmvwTFjsM/E/FQUudBJRGAna1Bnwju4Dq 4V3MCLkJkd8RguG450mVPAAtceXdSHWorcGTCFr20AW1QN5h9uNhMVBNn X-Google-Smtp-Source: AGHT+IHrkeEJ4I5DxRWTshUvQKvNXx3DTWgCp7xKzhF3NFqwHJYsZJp9fVK8mWGb3LBUGd+wZ0Eosw== X-Received: by 2002:a05:600c:4e94:b0:46e:4586:57e4 with SMTP id 5b1f17b1804b1-46fa9aef553mr158442655e9.24.1760378760532; Mon, 13 Oct 2025 11:06:00 -0700 (PDT) Received: from denis-pc ([176.206.100.218]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce589b3dsm19933428f8f.24.2025.10.13.11.05.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Oct 2025 11:06:00 -0700 (PDT) From: Denis Benato To: linux-kernel@vger.kernel.org Cc: platform-driver-x86@vger.kernel.org, "Hans de Goede" , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , "Limonciello, Mario" , "Luke D . Jones" , "Alok Tiwari" , "Derek John Clark" , "Mateusz Schyboll" , porfet828@gmail.com, Denis Benato Subject: [PATCH v13 2/8] platform/x86: asus-armoury: move existing tunings to asus-armoury module Date: Mon, 13 Oct 2025 20:05:28 +0200 Message-ID: <20251013180534.1222432-3-benato.denis96@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013180534.1222432-1-benato.denis96@gmail.com> References: <20251013180534.1222432-1-benato.denis96@gmail.com> 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: Denis Benato Signed-off-by: Luke D. Jones Reviewed-by: Mario Limonciello --- drivers/hid/hid-asus.c | 1 + drivers/platform/x86/Kconfig | 12 + drivers/platform/x86/Makefile | 1 + drivers/platform/x86/asus-armoury.c | 545 ++++++++++++++++++ drivers/platform/x86/asus-armoury.h | 164 ++++++ drivers/platform/x86/asus-wmi.c | 5 +- .../platform_data/x86/asus-wmi-leds-ids.h | 50 ++ include/linux/platform_data/x86/asus-wmi.h | 43 +- 8 files changed, 777 insertions(+), 44 deletions(-) create mode 100644 drivers/platform/x86/asus-armoury.c create mode 100644 drivers/platform/x86/asus-armoury.h create mode 100644 include/linux/platform_data/x86/asus-wmi-leds-ids.h diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index a444d41e53b6..472bca54642b 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include /* For to_usb_interface for T100 touchpad intf chec= k */ #include diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 46e62feeda3c..8b827680754c 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -262,6 +262,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 c7db2a88c11a..4b1220f9b194 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -33,6 +33,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..57ed9449ec5f --- /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 various WMI functions + * that are present in many gaming and some non-gaming ASUS laptops. + * + * These typically don't fit anywhere else in the sysfs such as under LED = class, + * hwmon or others, and are set in Windows using the ASUS Armoury Crate to= ol. + * + * Copyright(C) 2024 Luke Jones + */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include +#include +#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_uint_store() - Send an uint to wmi method, checks if within min/ma= x 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 `uint` 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"); + default: + return -ENODEV; + } +} + +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 -EBUSY; + } + } + + 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, "%u\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 -EBUSY; + } + } + + 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 err; + } + 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--) { + 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; + + 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; + + return asus_fw_attr_add(); +} + +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..61675e7b5a60 --- /dev/null +++ b/drivers/platform/x86/asus-armoury.h @@ -0,0 +1,164 @@ +/* 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 38ab5306e05a..0d0c84a37ad8 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -55,8 +56,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 +104,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-leds-ids.h b/include/= linux/platform_data/x86/asus-wmi-leds-ids.h new file mode 100644 index 000000000000..281b98ba0ca7 --- /dev/null +++ b/include/linux/platform_data/x86/asus-wmi-leds-ids.h @@ -0,0 +1,50 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __PLATFORM_DATA_X86_ASUS_WMI_LEDS_IDS_H +#define __PLATFORM_DATA_X86_ASUS_WMI_LEDS_IDS_H + +#include +#include + +/* To be used by both hid-asus and asus-wmi to determine which controls kb= d_brightness */ +#if IS_REACHABLE(CONFIG_ASUS_WMI) || IS_REACHABLE(CONFIG_HID_ASUS) +static const struct dmi_system_id asus_use_hid_led_dmi_ids[] =3D { + { + .matches =3D { + DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Zephyrus"), + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Strix"), + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Flow"), + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_PRODUCT_FAMILY, "ProArt P16"), + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "GA403U"), + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "GU605M"), + }, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_NAME, "RC71L"), + }, + }, + { }, +}; +#endif + +#endif /* __PLATFORM_DATA_X86_ASUS_WMI_LEDS_IDS_H */ diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/pla= tform_data/x86/asus-wmi.h index dbd44d9fbb6f..71c68425b3b9 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 */ @@ -191,44 +194,4 @@ static inline int asus_wmi_evaluate_method(u32 method_= id, u32 arg0, u32 arg1, } #endif =20 -/* To be used by both hid-asus and asus-wmi to determine which controls kb= d_brightness */ -static const struct dmi_system_id asus_use_hid_led_dmi_ids[] =3D { - { - .matches =3D { - DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Zephyrus"), - }, - }, - { - .matches =3D { - DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Strix"), - }, - }, - { - .matches =3D { - DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Flow"), - }, - }, - { - .matches =3D { - DMI_MATCH(DMI_PRODUCT_FAMILY, "ProArt P16"), - }, - }, - { - .matches =3D { - DMI_MATCH(DMI_BOARD_NAME, "GA403U"), - }, - }, - { - .matches =3D { - DMI_MATCH(DMI_BOARD_NAME, "GU605M"), - }, - }, - { - .matches =3D { - DMI_MATCH(DMI_BOARD_NAME, "RC71L"), - }, - }, - { }, -}; - #endif /* __PLATFORM_DATA_X86_ASUS_WMI_H */ --=20 2.51.0 From nobody Fri Dec 19 15:48:13 2025 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 16FB02D0C95 for ; Mon, 13 Oct 2025 18:06:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760378764; cv=none; b=MOBPAclMheAonUtAiw/PHF4Ac4ap5tOMY3dgE0RAsB4FbCjqBo97+r5eMiPkLXUAtABBhkyLlHWk10U2QXWP/90wlixDh8M/dy4iCW8ZEoup7veXfIinXVY/Gej/NNUzz9Mp5ZGYW0QZe2LzMM0Ui78VW/Jx6li8l9hnl7U98ew= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760378764; c=relaxed/simple; bh=JCk7VqzZDm0N9em80Jlh9Edcp6PBHzBN9/7plUWcVDc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=AAMfiJw7z/OoWITpGvCwYQ1hmpHQHooVDeM12CacAjW4HUidv2T1NK2/lIE4R/62VfzckSpLgfj0W5DpZVZj3MNUZ2HiNXkeb4rvcVyxkSimlvACUETmh8h/fQvMKLq5woC+/eV5sWECbtD0Ne4rgQCfRGvnc0IF4u7RTMpkRGc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=NexCQi08; arc=none smtp.client-ip=209.85.221.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NexCQi08" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-4257aafab98so3831401f8f.3 for ; Mon, 13 Oct 2025 11:06:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760378761; x=1760983561; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5Fxy/cL1NOLAJha530jz1vfM7F1ZmkTYxBgTPvWr6HI=; b=NexCQi08x/FZYSZa/mtyE2svonHF5EeSUFD9AF5lvHTXmv7fLjwRyKyuMMA0wTYvwR qVfEr5lc+6485J4k+RQocrwiB5Rb0GfKVNZknA57u1yZTJlP7SDMygvmbxDfFI8F11BZ 4Mgh0P+I5rX1Wdg18ACHtbjwyArmJRgqNgQDC3hGOhV0Nb/tIfKUagnbs5rmCkXnf0rL EKFJH+wsO/usu46IvKv9DH7MSXt2N3GuxBc3wM0CllhzYP0GcyGoeG7Fe+SPUzja5U9f GThbZsG3BR5OptyfU1nq0zYJGrpKMcby3qLiwsjxL6od8f8n3GtNiLO+aqDkiNiamD81 TBVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760378761; x=1760983561; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5Fxy/cL1NOLAJha530jz1vfM7F1ZmkTYxBgTPvWr6HI=; b=XPFdjT5ogzgP5vEJqNvFhSekNMjIFvAiD22/XOjzJ2q5wBZuYYkWLbw+AfDjjWIKrs H1GxekVzYxzjL8q3gimVuSBzqk2qIirTB7pZ/Y61OMz3F1i3U0N3bac6Tv21QPuYwl9P kwCUyYqKVYGJG1SF3h2zvII4PPChVlS9odfIvt/5S2wKxsI87EzyAyt4mAHfQujnUeJU jrNsxrAWKAxu7CaTAN2+04lTEwdMPEO5Z/XDjJyqCMGAsZSnQPgR+OJ6iMGoeGt2XXpy 86GqCBae5Dw0r3kLnYDLn0CrMwUKgTUQh7ECHwTOmVY56OKg7s2wLON0g7vRbOKGe5PF jmyg== X-Gm-Message-State: AOJu0YzkJdhCdUQli5LNZOdBjEP4s6pS1VMZR/YmDeI6p5WD4a4gn46C H7qNQe1t4tKQ8OrnCNwnooVMYnFhiTTH2fz8E+SH0I/d+1UsVKgYuIC7N/JluQ== X-Gm-Gg: ASbGncuG3Wj66wuV7ep6lrL1MLGIPhbU9he1OU/44TyWBKrqWA4vpBSG4djKzl1Y+Qn x+j4qlaPpYpaUlU/Oa1/NBObXKPsocWwi7CvZ4dTAYTScZv1okBAXsIu5Ep+O16UBwhOJT8Bx3G rtChAivjp+GkdftR8FlE1a+EVmkS33NTzcrRHaA47/9f+ILLMzDkn9BS66Y38Xq5m+dGfDBJoGn Wn83bivq4DDmJWpHmTi6MA4JvguzwxQ7+dnzzQQ8CBK5Gv4pSJ63lGkqgODzoCKOhScjP3QihKA DxhcW0aqbDpEHcBQScTuQOh7lwCiC9gPY7EM78qrmQI4pyMyJN5qqmAzqUGxydW4idbQUZdGrVO GDFviBlgbg0D9yzcVsOjMsLbwaFlL1oxdSr9yUkKfj1itpjWfvDEWTOE79ZnCSkhQYUc= X-Google-Smtp-Source: AGHT+IE/Piq4iUI2yyiBoQ2SKW8waFEfQdsOU8j81sEVmDknFR04+8+MVQjit1d6dVH4bXCYkY18vA== X-Received: by 2002:a05:6000:603:b0:407:77f9:949e with SMTP id ffacd0b85a97d-42666ac7026mr13525477f8f.21.1760378761225; Mon, 13 Oct 2025 11:06:01 -0700 (PDT) Received: from denis-pc ([176.206.100.218]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce589b3dsm19933428f8f.24.2025.10.13.11.06.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Oct 2025 11:06:00 -0700 (PDT) From: Denis Benato To: linux-kernel@vger.kernel.org Cc: platform-driver-x86@vger.kernel.org, "Hans de Goede" , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , "Limonciello, Mario" , "Luke D . Jones" , "Alok Tiwari" , "Derek John Clark" , "Mateusz Schyboll" , porfet828@gmail.com Subject: [PATCH v13 3/8] platform/x86: asus-armoury: add panel_hd_mode attribute Date: Mon, 13 Oct 2025 20:05:29 +0200 Message-ID: <20251013180534.1222432-4-benato.denis96@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013180534.1222432-1-benato.denis96@gmail.com> References: <20251013180534.1222432-1-benato.denis96@gmail.com> 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" 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 Reviewed-by: Ilpo J=C3=A4rvinen --- 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 57ed9449ec5f..68ce2c159ae1 100644 --- a/drivers/platform/x86/asus-armoury.c +++ b/drivers/platform/x86/asus-armoury.c @@ -92,7 +92,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) @@ -403,6 +404,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 @@ -416,6 +419,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 71c68425b3b9..10acd5d52e38 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.51.0 From nobody Fri Dec 19 15:48:13 2025 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2A0152D12F5 for ; Mon, 13 Oct 2025 18:06:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760378766; cv=none; b=fwod6WpBYh/Zl3m0YZ9s1FdDi0gacHe+XwOoqfXZ7LIdTNDiubce05fc8avCz/FYwBCe8vl8WBeC3P3aghZG0W1Hdx1fzAuHV0zJjKuev8QHJp8JruXpF0Y4qOGGq+0h1peK7NsCNSBlkycZHURwEKZDP5gN1AZgFrAUc9Ea9Gw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760378766; c=relaxed/simple; bh=q/EU7lSWeXS/l60j+bgP/a6Vbvr7aGyHaBwtx3X4MxU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gA0YnXhiSXeGkaFvPWeojgZWpNLMdk5cF5xzH7L/1ssC3WEBCkOzTVvyfzsopoPWDl53Gk1w9L5dzIOtrsCdzwkVYHjCEt6yTpvT2oWwPwQAHYg3vy2InRvJLrPgIWYWfGmo7JwhjGFp0G8eD+B7LLn8Vq7NjJ0EabBWA6cubZ0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=J6cu5Els; arc=none smtp.client-ip=209.85.221.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="J6cu5Els" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-3f99ac9acc4so3765724f8f.3 for ; Mon, 13 Oct 2025 11:06:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760378762; x=1760983562; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4ADb/Xn7/h9pdMbRXBw0B+VvtgUC71nJ/4n9TIxqgDg=; b=J6cu5Els1PGmHtaulzN+m3UGbigTvyxPKCTPkGWd/iRZykBf13q+jJWLwdw6oL8vdD BMWnRXZxxhuIuk0a7DU6e7kH8bTnyGSPRlO0ztv8tumfe/PoNLQMPMGIR/vXiDVJnQ9C yqYKUKUoYR2wTHZV6POYDETUS4bpxaL5G/+lNXk5HfZRBBmMcP0JPs7lxaf58U1f9sSo VggvI8EWBjodbbtVYZ4oMH2LE8iYV+0X26eiyT3goBnNMLLkt1HonftZ383CL2932Lea fvbxPoZl2HvSDgrBQbxAo76nLwW08KvocJxLdxGj2rm1DRPlU1fU+/iAL80hmooQJs5O c+YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760378762; x=1760983562; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4ADb/Xn7/h9pdMbRXBw0B+VvtgUC71nJ/4n9TIxqgDg=; b=HBHIyxhPbc+IRUi4L6lf0sxVOPUMqbv3YHmL+BDi6rqqOL0pPK7KGQIgtJB8rvwXMo KC62/nb/Z3/vB3hTOqerZodMRDoO41DoXQV+W8Gzta7PEcmVfQJJ4CgBPXv7wjWvS9Rd JkunC9dHMZbV8fiPQcL/IpD7GMpA9NHzgm2oPpG+UVQHGkLkqMTwFOM2SB5VgFzvOlUw rJo+FpnfgSdqfN3EAmLuwkX5WIQ1JXh+u3Kb3TgqjawgQnC+0iADtMvd5R+RtTOFlqpQ mzn8FVP7BxP4oWoF7jOdObbbFX1q7HHvUCKF15ULTVHZdBuPnr2nQLTI1z7EvaG9D8jA iXUQ== X-Gm-Message-State: AOJu0Yz3rZOEXBf+gyJUdS4ZTZmGNi1Ir8AK0gCTKQk6flPM5a+XquaB i0Yo9HHo3v6onhbPRt808ku11O3HxCsGJs7GpJmUJ2zUxU82E74hYdPQ3dbkiQ== X-Gm-Gg: ASbGncuYypwwtZj8diIuJfm56Oh/D5w+I30Nfk1M5XADdntm1oM8tHsx8KvfHwmh8C/ FVENC8zow0kHReDsdDYCznWUnbeVbtmIc2tjNa028scVAM/sbikooVZXALlMUnzwXdVoYQnm4nI AO+CZxBkvSjPEVcpwd8BuOqQ3aeyE4CtgaIGpxrgGYjpz8r36iNh7f8OI36kLij6Lj9b3Qe/S5X BL1vY/uFtQ9OeOaVTJ2pteo6O8QuGyJZ8QkwSa8ONpay+vMMz0aDYI9+NxuR6FMNZOYdUhYi4SR EfkucV+cSfZcwIcszhcOd9amPD/UIeB1AzSJ0jjRb8/rmRle6xoIL7a1yG9voz6RSOzsykmBKQB D6EyDPPaz+GYnQXZTVhsAnWLznSknEH8PJaX8SPq2WpO3zfutE5SA5Eq3 X-Google-Smtp-Source: AGHT+IEKmPlcTvYER448tFCZNUAmAkBTquXTa+SftxeAMIbr1QS03sKoftqWg6i6tEKdqiam1GZO9w== X-Received: by 2002:a05:6000:24ca:b0:3f3:3c88:505e with SMTP id ffacd0b85a97d-4266e7dfcb8mr14275571f8f.29.1760378762190; Mon, 13 Oct 2025 11:06:02 -0700 (PDT) Received: from denis-pc ([176.206.100.218]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce589b3dsm19933428f8f.24.2025.10.13.11.06.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Oct 2025 11:06:01 -0700 (PDT) From: Denis Benato To: linux-kernel@vger.kernel.org Cc: platform-driver-x86@vger.kernel.org, "Hans de Goede" , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , "Limonciello, Mario" , "Luke D . Jones" , "Alok Tiwari" , "Derek John Clark" , "Mateusz Schyboll" , porfet828@gmail.com, Denis Benato Subject: [PATCH v13 4/8] platform/x86: asus-armoury: add apu-mem control support Date: Mon, 13 Oct 2025 20:05:30 +0200 Message-ID: <20251013180534.1222432-5-benato.denis96@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013180534.1222432-1-benato.denis96@gmail.com> References: <20251013180534.1222432-1-benato.denis96@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Denis Benato --- drivers/platform/x86/asus-armoury.c | 81 ++++++++++++++++++++++ include/linux/platform_data/x86/asus-wmi.h | 2 + 2 files changed, 83 insertions(+) diff --git a/drivers/platform/x86/asus-armoury.c b/drivers/platform/x86/asu= s-armoury.c index 68ce2c159ae1..3b49a27e397d 100644 --- a/drivers/platform/x86/asus-armoury.c +++ b/drivers/platform/x86/asus-armoury.c @@ -394,6 +394,86 @@ 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 */ + +/* Values map for APU memory: some looks out of order but are actually cor= rect */ +static u32 apu_mem_map[] =3D { + [0] =3D 0x000, /* called "AUTO" on the BIOS, is the minimum available */ + [1] =3D 0x102, + [2] =3D 0x103, + [3] =3D 0x104, + [4] =3D 0x105, + [5] =3D 0x107, + [6] =3D 0x108, + [7] =3D 0x109, + [8] =3D 0x106, +}; + +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; + + if ((mem & ASUS_WMI_DSTS_PRESENCE_BIT) =3D=3D 0) + return -ENODEV; + + mem &=3D ~ASUS_WMI_DSTS_PRESENCE_BIT; + + /* After 0x000 is set, a read will return 0x100 */ + if (mem =3D=3D 0x100) + return sysfs_emit(buf, "0\n"); + + for (unsigned int i =3D 0; i < ARRAY_SIZE(apu_mem_map); i++) { + if (apu_mem_map[i] =3D=3D mem) + return sysfs_emit(buf, "%u\n", i); + } + + pr_warn("Unrecognised value for APU mem 0x%08x\n", mem); + 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; + + if (requested >=3D ARRAY_SIZE(apu_mem_map)) + return -EINVAL; + + mem =3D apu_mem_map[requested]; + + 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+1); + 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) +{ + BUILD_BUG_ON(ARRAY_SIZE(apu_mem_map) !=3D 9); + 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"); @@ -414,6 +494,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 10acd5d52e38..a4f6bab93a6f 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.51.0 From nobody Fri Dec 19 15:48:13 2025 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D00B92D193B for ; Mon, 13 Oct 2025 18:06:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760378766; cv=none; b=esNYxjAh9DjyzBp0/exOjfKEUwDz7lguyYoOejfuyjHHXcb2IbbArOGxJQlKeQaFoHKBV1LLSBWuT/ng+n1C4x5DAtte11CcsG9GwgiLSPDYeVOwUayQyAR7owgyQEn0h72AIwB60Izl4wN/kdxmSJp3qYLsODhP43meD7jFRWk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760378766; c=relaxed/simple; bh=Xyh2PtOtJ7shw45L8bxBXJvoyvGbJzYU76aAFEHPIcU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TG+8yDIz+848JqrH5Yc3us13Pija1M+0tfFpvuNkRqx3CGEvHNYGHqXBJXR99q019Idb+CSgXoPCRHJPIj3Zabn0sY0yyjzWxhBHOj+/NQyxFE1oBrWW/vBM35i3rS+U29bMrsRpcdN44G4NiVUtR4H8tNaDIIap99snHyAVTPk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=b080encx; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="b080encx" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-3f2cf786abeso3880147f8f.3 for ; Mon, 13 Oct 2025 11:06:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760378763; x=1760983563; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xh8xLpOXM3G32RBhCfX/Zae30+25W9kyaoHJO9zyZnI=; b=b080encxO0GRzlERBa0JY3T9PmqbUc44wM+xpgyARo9yCOYWdHnTO8fL7J+A9flMnG CAKdGuiYORRB1hwCOuLMRwNZso5Jd6J9eEXGAYsPxlX8HiDHyQyKSl4X2FHkQRJBPL+r +TbVbd7oPdWtfzgZvBHC+5CPg9WIMWfA6re/6ibErOWTLmYAPF+J3jtE6suEe/hDHf4Q gQazSQaMNoafUL7ex4BoktB826TKCmLr/mlNqLB7XY16ipd6n7oum48hiDVCsBijvmB0 VW7OFJxQiOZUdKGENVN4hkDjmy5OeEiRkLHVCzUCIzBVZMNeGvcXKNRU9bL1eRIWsZsc P8dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760378763; x=1760983563; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xh8xLpOXM3G32RBhCfX/Zae30+25W9kyaoHJO9zyZnI=; b=g9z2RCMyBPUeUDMuHqcC4aNXt9iDlHrcqeKMBXUGP0wgYR2sWvsA56wCAO0H1rUQVg nrJx5e13Eh/qEiLVV3BpdqlQzfSzBS1Dw2uQAtnuDJVaQnoT+IQjP4ZS3nUjTUddF8Ew 2DWfzByfg5ub23MOpFAkCFemZG8F3rdpNp58Uez/opYfHoT5mkBu0Kbtu3Lpa0pPJ13S 9ssxgEPtJNNN3oC5Ab7YAAkAv8uQbTOOJRFEXpVvtVL21H9YLUpl/2K4fR1sMnaBB/3v WVno+BwrEzvZ7VFC0Hk68rQzK3iDSN7wXK/6I+IOtWWW/72Max92cFrUB+njfB9nCB9x Irhg== X-Gm-Message-State: AOJu0Ywxzy/Oxa+xQl05arknsRjLw71H+IZ7SGrqhuXCMn4ppLU+wqAQ Ji10lAhQEn5JRftrtkv4NpS9GIh7ub0NRTh2Vejb71LQIORQJ/M5w7y8AbGVeg== X-Gm-Gg: ASbGncv8tmuwLXS6vZB3z43MQ1FqEcoMitHatCnILWQ5truS1NcIA1i45DQtnqkfgpg kgT3yH8KwvuIHyE2pSFg/ChKKSHtWtMKOenZKAdTOmV5OJfg9IZ0tnAlZ9mmXRYku/3Nb8b6Jmj MBhS3mcc1FcoT8MlHsuhJDXwuNCdZvwd1G7MjXjTfm/d0zXHHaigqX6ecZocDMEQ5HCSKN6ihBP h9wzlInnrRxTriu+63hCDTwExf1e4Ht1pIiJdnML+PPZCSPE4exwl2FipuGp+HBh0/WdBPUMns7 kEq5uAfOI3lQjH+nqFk1ZYn9pr7c2J8EPHRmIBa4mztK+9BX0tgwZCLXfKIsw9XcK29jIxB+ne0 OrMQYO3Qm0oQvjL5MT5qxQ/QfNHWr/lk7m67oO3MkEzB+xI3ArGn6TAJkMxw36JMGXq0= X-Google-Smtp-Source: AGHT+IF8pWJXIusnPnZPClGGnGTDkHh7XT+pO9rTjrp9YsPK86SqG3AY1ZCeXVnk/HcfLQb6V9s8Ww== X-Received: by 2002:a05:6000:40c9:b0:426:d619:cac7 with SMTP id ffacd0b85a97d-426d619cd64mr5963922f8f.36.1760378763011; Mon, 13 Oct 2025 11:06:03 -0700 (PDT) Received: from denis-pc ([176.206.100.218]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce589b3dsm19933428f8f.24.2025.10.13.11.06.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Oct 2025 11:06:02 -0700 (PDT) From: Denis Benato To: linux-kernel@vger.kernel.org Cc: platform-driver-x86@vger.kernel.org, "Hans de Goede" , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , "Limonciello, Mario" , "Luke D . Jones" , "Alok Tiwari" , "Derek John Clark" , "Mateusz Schyboll" , porfet828@gmail.com, Denis Benato Subject: [PATCH v13 5/8] platform/x86: asus-armoury: add core count control Date: Mon, 13 Oct 2025 20:05:31 +0200 Message-ID: <20251013180534.1222432-6-benato.denis96@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013180534.1222432-1-benato.denis96@gmail.com> References: <20251013180534.1222432-1-benato.denis96@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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: Denis Benato Signed-off-by: Luke D. Jones --- 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, 290 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/asus-armoury.c b/drivers/platform/x86/asu= s-armoury.c index 3b49a27e397d..3d963025d84e 100644 --- a/drivers/platform/x86/asus-armoury.c +++ b/drivers/platform/x86/asus-armoury.c @@ -45,13 +45,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; @@ -93,6 +129,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 @@ -171,6 +209,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) @@ -474,6 +518,207 @@ 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; + + asus_armoury.cpu_cores =3D kzalloc(sizeof(struct cpu_cores), GFP_KERNEL); + if (!asus_armoury.cpu_cores) + return -ENOMEM; + + err =3D asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_CORES_MAX, &cores); + if (err) + return err; + + if ((cores & ASUS_WMI_DSTS_PRESENCE_BIT) =3D=3D 0) { + pr_err("ACPI does not support CPU core count control\n"); + err =3D -ENODEV; + goto init_max_cpu_cores_err; + } + + 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\n", err); + goto init_max_cpu_cores_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; + +init_max_cpu_cores_err: + kfree(asus_armoury.cpu_cores); + return err; +} + +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, "%u\n", + asus_armoury.cpu_cores->max_perf_cores); + else + return sysfs_emit(buf, "%u\n", + asus_armoury.cpu_cores->max_power_cores); + case CPU_CORE_MIN: + if (core_type =3D=3D CPU_CORE_PERF) + return sysfs_emit(buf, "%u\n", + asus_armoury.cpu_cores->min_perf_cores); + else + return sysfs_emit(buf, "%u\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, "%u\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; + + scoped_guard(mutex, &asus_armoury.cpu_core_mutex) { + if (core_type =3D=3D CPU_CORE_PERF) { + perf_cores =3D new_cores; + power_cores =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 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) + return -EINVAL; + + out_val =3D FIELD_PREP(ASUS_PERF_CORE_MASK, perf_cores) | + 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); + return err; + } + + if (result > 1) { + pr_warn("Failed to set CPU core count (result): 0x%x\n", result); + return -EIO; + } + } + + pr_info("CPU core count changed, reboot required\n"); + + 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"); @@ -495,6 +740,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 }, @@ -598,6 +845,7 @@ static int asus_fw_attr_add(void) static int __init asus_fw_init(void) { char *wmi_uid; + int err; =20 wmi_uid =3D wmi_get_acpi_device_uid(ASUS_WMI_MGMT_GUID); if (!wmi_uid) @@ -610,6 +858,14 @@ 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)) { + err =3D init_max_cpu_cores(); + if (err) { + pr_err("Could not initialise CPU core control %d\n", err); + return err; + } + } + return asus_fw_attr_add(); } =20 diff --git a/drivers/platform/x86/asus-armoury.h b/drivers/platform/x86/asu= s-armoury.h index 61675e7b5a60..a6c4caefdef9 100644 --- a/drivers/platform/x86/asus-armoury.h +++ b/drivers/platform/x86/asus-armoury.h @@ -161,4 +161,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 a4f6bab93a6f..9a79dae97adf 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.51.0 From nobody Fri Dec 19 15:48:13 2025 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A55782D248E for ; Mon, 13 Oct 2025 18:06:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760378767; cv=none; b=lQB/n0gITPlNp3N+2CD+6bhRPJLaTzZM4gaclvH23s7E6ECWVmshK6HRZT1OemWalTPySzTVujS1BHQHVKflPvfiZIJnewxS8whZvndGYVI5wA9AeAbAR2ztopdRnOqOeR7pvUddUJe4Zg0XJ1fEcTjWXAnBdS872qhnOXyX+C0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760378767; c=relaxed/simple; bh=TbswgXQwCCTmzsX3hGAnNwHOzR/5QSN6bjAPmQkfsmw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VK8QkxqplBKXCAcwChRwW3q0YcHdd1EuD+/arm0Uiel5cl1MmyeGPbXRALxLzWTnyvT/CQX3BrUvL2u71MAlIbVus+slWDIImwYb/iM+wRS10YnAyALDXOaZjYZvFtkyoxGS80nwfalgFp4RtJbq2WzTFTEbIwq6kujqbv4DDO0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FSjS5rCj; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FSjS5rCj" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-3ee1221ceaaso3590727f8f.3 for ; Mon, 13 Oct 2025 11:06:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760378764; x=1760983564; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=txV+xh/18MrOzYRQN9sCc73WlopP1Drxah2geRIuTgY=; b=FSjS5rCj33mirLI3LPJg+ZZIXs4puMXe0d4x48SQmr/A1+FRYRTe5JdziokqUTuEth Rkx04uYg0AH60ZGFQetO0CQDijs1c85aQvG5pNASTkYkR8HjR5S3orNK2/pXavtiyUel ezy8CZhmK8VXPJS4XeCpw7PM1Bd2lRpQcnuVagcDh/cJAPb00G1WvCxH7n9vBtgtqJ3q xdLKH9wjJ1BxUeBxPrZ+79hwnZqwQqXlX+BwtQXKQFz2YA5/cy6sS1orkCmhQku6B095 ayGUW6TJPUeX/+F0eYlsQtONuvvCxnR78B4bS6zN8md9MbYnVO529b+Wbtx0glUPP+Ll 0MMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760378764; x=1760983564; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=txV+xh/18MrOzYRQN9sCc73WlopP1Drxah2geRIuTgY=; b=rsElcinqjhe5qwGQ6HrzVs+h51z18wc/l/sVY75Dc6FYbBYukP5mFl0TZ+N+ZEmHxY OemuPRXnj04GD7j5KVC+/3SsE41dPvR3pPGwKfeOS/zlSEN7wVW43GRo8VbenVd4Y/Qh wiPV7GI4j0abAtlw/V3UiA8Js+mdI0LCVfEWnhFHQqOabie66aOY0NJY+CMdz38bwjMD rCrsKnTH1EZmnuktFhCAJO4lQq6FTsutPxMhYYSL9HwuHj2PjaWLwA/Du4ADJavh0sbe 5bxyihE+rxTxYdQEL+C2bkVqQySFbrY7Treg077D0yc+h2gHDQqAv2wgK5PgAtlUdC+r Nb9w== X-Gm-Message-State: AOJu0YzlAGK6r8fUdmA4tvfqZzb1O2EBvw139qluTJuzHBQZL0miWH2z uf8pIRPFWV8+A1gyvD264E/i23/zCEEeODR4NEo4aUbD8G+0tuUvVo22kxvc4A== X-Gm-Gg: ASbGncsv+gTB07Qa3JMpFrHJ2O9uRGAYKahYZZEaxoNzA0hmKXDFNyPRN75TGf10/Fg x/qnS96S9Dde1XLhFbPDRydmmdoYsxwA4/bprBL7mKmy1G8HlJXHMjjI86eARwfshUy429K2EoN HxxwFjrgLkI93gXEGA+/8pClQEtdIgyYS40z/1q/NfyfwZNwTcSVYMvEY5+R2Y9tUYLF2gF9wTO LR18TkwySUSv92TgR4WWN6c+uI5Igvcw5e52QqxTaL/ICnfm2Hko1MQLMFIMsaZU5svJisFv8nN bCk5sw53aVAXSp7Cz+doFhbVjZktB9RrXf6cfdxdWJ4pQWuOsifBO//Ja7xoNhJKY59N2mcceiM WO46l9XwjelMPIkIiRgWMHIqFO4FH/n8N8USBxvve0CN14A== X-Google-Smtp-Source: AGHT+IE2I9xORwtrK2Nu7nQ1GfoRfwgnIUo+IlSIPD1ojVpvyKYovXwUWxmEbOvJzHN2uTTqI/lKzg== X-Received: by 2002:a05:6000:250a:b0:402:a740:1edd with SMTP id ffacd0b85a97d-4266e7dfeb4mr15484754f8f.39.1760378763722; Mon, 13 Oct 2025 11:06:03 -0700 (PDT) Received: from denis-pc ([176.206.100.218]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce589b3dsm19933428f8f.24.2025.10.13.11.06.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Oct 2025 11:06:03 -0700 (PDT) From: Denis Benato To: linux-kernel@vger.kernel.org Cc: platform-driver-x86@vger.kernel.org, "Hans de Goede" , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , "Limonciello, Mario" , "Luke D . Jones" , "Alok Tiwari" , "Derek John Clark" , "Mateusz Schyboll" , porfet828@gmail.com Subject: [PATCH v13 6/8] platform/x86: asus-armoury: add screen auto-brightness toggle Date: Mon, 13 Oct 2025 20:05:32 +0200 Message-ID: <20251013180534.1222432-7-benato.denis96@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013180534.1222432-1-benato.denis96@gmail.com> References: <20251013180534.1222432-1-benato.denis96@gmail.com> 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" Add screen_auto_brightness toggle supported on some laptops. Signed-off-by: Luke D. Jones Reviewed-by: Mario Limonciello Reviewed-by: Ilpo J=C3=A4rvinen --- drivers/platform/x86/asus-armoury.c | 4 ++++ include/linux/platform_data/x86/asus-wmi.h | 1 + 2 files changed, 5 insertions(+) diff --git a/drivers/platform/x86/asus-armoury.c b/drivers/platform/x86/asu= s-armoury.c index 3d963025d84e..e27f964aebf8 100644 --- a/drivers/platform/x86/asus-armoury.c +++ b/drivers/platform/x86/asus-armoury.c @@ -731,6 +731,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 @@ -748,6 +751,7 @@ static const struct asus_attr_group armoury_attr_groups= [] =3D { { &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 }, + { &screen_auto_brightness_attr_group, ASUS_WMI_DEVID_SCREEN_AUTO_BRIGHTNE= SS }, }; =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 9a79dae97adf..260796fee301 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.51.0 From nobody Fri Dec 19 15:48:13 2025 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A18FF2D24B9 for ; Mon, 13 Oct 2025 18:06:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760378770; cv=none; b=I5yuz11mg/9PVzaFz7Txy33dwSi9vVOd4YnOmEq2lHga70MAopogfyRiBAC6f9wqhayEoOhRWOOowmVoJKJ6KqUiB/wrLMDJppgoc/mjTffDPNqNAxlHysN77Vpv0pnB6DLJKvi+90gkbsHqb2dWH0+WX9rs/kt4QzoTzFXJ7+o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760378770; c=relaxed/simple; bh=GyWBieqOpNQx4C9/uouPbNFLuLpeAqScnaI+LIyBArs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UYLIueg+F4KXFxWOgUXGuP/eOJUdEyZWl+goDZ1MOSedg/bBLc4416wIpjdxg61xMVj8CHPQ21TQUqbny9z84HBiPAsG3B2mAM92D+s8adcYygY8VZqXi4K8eHQYj2895ufjcHsev0M1gML3X3LBjeblOS5owM+js0HxIF5KDEU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=TtxZA8mo; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TtxZA8mo" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-46faa5b0372so27576855e9.1 for ; Mon, 13 Oct 2025 11:06:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760378765; x=1760983565; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=44elWf58uA7a6D1idZy+4qNA5dFw0YrXB40J5my2QSQ=; b=TtxZA8mopqpACOSalLUDsjbTe7dGKOmOtnU8dosUm1nVbfGIpwHKOyS/VhapEeXF/e dP7B6eMJ4QLBJsQIAmu9O3qsGscX21GaRStY7E70sezk30K2ZzNnUqz6EI4fsvdfVLvq uiQpdWaTkJJz4q8wMLu4X/vDSRnoIogxnlyhWCBd8DesTMWqbVeUUH4G/soYjNuNfSUA 1GbthPH1TmQVh79mnXH+fQdbIPuSrv4PmPaUi1BmWpOb8eCGCI9E+qOl5EpChHWckGnG K9igLvt2hyWrkKsrxFJzamMRwHhCvGq5f+EuL7Bl4dQ7iehaiRHT14GuTLD9GpfdibD1 +sMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760378765; x=1760983565; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=44elWf58uA7a6D1idZy+4qNA5dFw0YrXB40J5my2QSQ=; b=MEN+0a25GcqtBk5v01NF0eXRCcN5c2XfMlGCUT4+F3SG3Rlc6oRIC6E6RhJqnESwO1 SU3qxZVo88AFO4AagNaN3c6vIv2EggpjT5I8HrMaWFht/h8NozYMccIz80CuPQXiaXhp 0EE1wU5p5G7JGcoyYSNbP/CH6EpdUfXZ7N+WfOKFKdQG1RThUXM3d0ZppBrt5nZZpvhV E8SDaCw3q4z4/qDYExuOX2ZouoiDcDjZApOpt2OL/q3VkOdZpiuKHeEL7FCvNkLWgYjC LoGkKRL4NPZV6yUPJYbOPlT4ERvyfEZwxbampMhke6yZPSUy9bniNg80poy/YEUce62Y MdKg== X-Gm-Message-State: AOJu0YyQ+HJxovz6k4cWsuZsBD9O4nF++Gb8areInONJp+GOuqGIHwN8 nTm18eKOAu/sQAsXgkRT8qvtYQZZsuNMrdQnExfvtf1wChCMz59H7VXXxYWl6w== X-Gm-Gg: ASbGncuQJZlk1Nlaiu1nNEpzttzW3I9VdAI90SVlFEIpeL3VxHuFj53KytaWHF/watP yeZ8+/Oiw946uhQxb7EpbUlLkH7oFw77Vs8bHMolLdPTqHteAVoXvp+tvNjwDGiICpUpks+HZWC 2uGCaM3hSSFAYNNjDV8s7SANs8xL9nVoBwPpFTuQ5FWp4UCkeLrwVNaAgj4WHlUGDHkHitZ8dLu tLkSG/O8GzLkEqKMAk5y6SkYhAJRAYvWeSikBZMf3SQx/Xj+CF/AjXQYDB0fQ+FjVcAGbbsoq3f syST+NSiaqeetu/avsODvv9dE63rsx6VKSa+s+UYIseVOl6krjjLKmA63kvzcm5C7JrcsSaHFVi PCcSsMq/+xHz7X8BkP/cIIlL9o+rZeae21+Y6Dc6AFgQlXr5VWPZ49QCy X-Google-Smtp-Source: AGHT+IEpWRuu4QZVB1CnRIpr0X/SraO6kcXKghrNanzybODQ0YigvZ+NuYTifzPdCLa+kA8Osstztg== X-Received: by 2002:a05:600c:820a:b0:46c:e3df:529e with SMTP id 5b1f17b1804b1-46fa9af9019mr157590455e9.19.1760378764740; Mon, 13 Oct 2025 11:06:04 -0700 (PDT) Received: from denis-pc ([176.206.100.218]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce589b3dsm19933428f8f.24.2025.10.13.11.06.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Oct 2025 11:06:04 -0700 (PDT) From: Denis Benato To: linux-kernel@vger.kernel.org Cc: platform-driver-x86@vger.kernel.org, "Hans de Goede" , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , "Limonciello, Mario" , "Luke D . Jones" , "Alok Tiwari" , "Derek John Clark" , "Mateusz Schyboll" , porfet828@gmail.com, Denis Benato Subject: [PATCH v13 7/8] platform/x86: asus-wmi: deprecate bios features Date: Mon, 13 Oct 2025 20:05:33 +0200 Message-ID: <20251013180534.1222432-8-benato.denis96@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013180534.1222432-1-benato.denis96@gmail.com> References: <20251013180534.1222432-1-benato.denis96@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Tested-by: Denis Benato --- .../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 8b827680754c..a17288401746 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -296,6 +296,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 0d0c84a37ad8..3727ae00133d 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -337,6 +337,13 @@ struct asus_wmi { /* Global to allow setting externally without requiring driver data */ static enum asus_ally_mcu_hack use_ally_mcu_hack =3D ASUS_WMI_ALLY_MCU_HAC= K_INIT; =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, @@ -723,6 +730,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) { @@ -733,12 +741,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) { @@ -749,6 +761,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 @@ -802,8 +816,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) { @@ -814,6 +830,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 @@ -870,8 +888,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) { @@ -882,12 +902,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) { @@ -898,6 +922,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 @@ -956,6 +982,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, @@ -1079,6 +1106,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) @@ -1117,6 +1145,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); @@ -1159,6 +1189,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); @@ -1202,6 +1234,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); @@ -1245,6 +1279,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); @@ -1288,6 +1324,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); @@ -1331,6 +1369,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); @@ -1374,9 +1414,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 @@ -1417,6 +1460,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) { @@ -1427,6 +1471,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 @@ -1462,6 +1508,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 @@ -2335,6 +2382,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) { @@ -2345,6 +2393,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 @@ -2381,9 +2431,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) { @@ -2394,6 +2445,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 @@ -2429,8 +2482,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) { @@ -2461,6 +2516,8 @@ static ssize_t mini_led_mode_show(struct device *dev, } } =20 + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%d\n", value); } =20 @@ -2531,10 +2588,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 @@ -3822,6 +3882,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) { @@ -3865,6 +3926,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, @@ -4466,27 +4528,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 @@ -4508,7 +4572,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; @@ -4546,6 +4614,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; @@ -4823,17 +4893,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.51.0 From nobody Fri Dec 19 15:48:13 2025 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8BF312D323D for ; Mon, 13 Oct 2025 18:06:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760378771; cv=none; b=n72aU+9iaWJK+YXS7YcpnvG7c12Bp1gNTqQBaRNdDAUuNcfsgG787iUYlgMgnFZP9sw2UMI/BZ+sEQyPRZgRuJpuZlmtBRDdvMKBxfBXR6w8S5tXKb3fInPQGXZU2cDgCl0Nj46AqCR8F8Dz12MjdqJjI/z1xkBHb9idlANjINg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760378771; c=relaxed/simple; bh=dPy14mKBo3mbOci3KJPqT47bZt70eKEdSuyyymlqEgo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GEZ7fiPGXNsOvMnJxIwRX9DmDFrYr/52dNMzI7dnUYt9MM37cb7rGOlexppIyewBS/yqDlTHAtgB76Zx4JZlIRdeTu4lXiLqayaLHP9MLh5inlWyCNWlY447KCdqipxKdcivq6/tuaqLHlMVUSbWQW/Dk1sIUMlX2Hhy7zrl9ZY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WWUDdS4W; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WWUDdS4W" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-46e4f2696bdso46385095e9.0 for ; Mon, 13 Oct 2025 11:06:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760378766; x=1760983566; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rft3SoLPXMCdd5TkqdVGxpQPkg2mr3FHgzwit4x2oQs=; b=WWUDdS4WCIqx0Xry3NqUX8InSaeGzmUAI91EWUIhX+5ENgDCXpDv10fUh36gEl6rGd pSXKE82sy3EZgKvLTnXy0KPyhDge0NQFFSvm/GJ2S10tUIIiMBkYTnJjx2abwFNqobVC CU1+D7kH3tHEl9Wv0Zigf2IHtoIWj+WYtZGj0S4FPi2sCApexvgQEQ7MZivUGwTkctll 7lveypWIQT87mE4I9vrz9hwAyAdQ4BrbJNBzVqlVmeZeIxNik5lw5y2Ug43PuSZw3eT8 3guNtWNZUHbZFBoPwt7cmNd8c3zAaYdco3w0IszVuabOMWPSI1rE+Nm/6ks3BG1WJhms Rm7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760378766; x=1760983566; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rft3SoLPXMCdd5TkqdVGxpQPkg2mr3FHgzwit4x2oQs=; b=BoVNTGgzrawNVn85L/HacDgLfLttEkAiUCMe8+Y8bv8RGeJleKBPJ2Ka4dFV9nNcFZ ClhMIy8pkfHmlZzEY/zXqON/2pTRhiyXirvd6Nuuzd5vWpXiqUzlfbNfRMTIOk0rxhPG LSls89PtKkqxq2xAAjFQpmYfhYzmPkGpDexKjJq3ik9zikt63DRRkowFYQbe9YUCBuxX raM1i8vzr2fjVGlDXNCsUOWcQYD0yvVyghrBAjSJ3X/8LMP0l7aNKjjG/QM9xm9UDJgC oC9sNAWKTy7Y+K0EWjXz8P+PwuRXouay75mJUF35kRzij6OpJzvk9mVUsxy9EFxNxChO cvvg== X-Gm-Message-State: AOJu0Yyl7o20GiippvpLoT8p62OtTp26km/RRCIkbWcfTyWJbiUfpEW0 +twQnTF4rCxb4E5tcTg165GRr+87wqmzT8JxTM0BmSy6TcdGSDet7GkdW9CpEA== X-Gm-Gg: ASbGncv5J/iuDb+tcAOlXz46S/1SygxxeuNEt6R8E6suUyU9deo4sYVI5xrIrDLS3LU sJfLL42zGfHKalkRc90vOkwv0ANdxkooJI0RIbQ6a1YVPgRXto4ZesFqUfPvnoLQWjCPt4JNMIA kZhcMsxU4r3bkx1/amCHvusyVdSpbjToRkZa/ISCO1Mz3/WmP8w8RAoAeQUjRlqJiw9+HvlQ5gd IglYnqAcYhl3wdscf98HkEQihWaq/+4GVoK2JzypboxC/I/MysaHXl47NLYdpXss/AJzsYQAS0X zBWqx6cCxHz6t0b68Qoqkx/v2C4zaDbSkysra2zVrqSfa+jd9T89ILbWflo7ss7xJPzU4Fr0pqL ph4PTAEnjeH81HZfiGDflc/pWerhZajaxcjDsQgySqFh/XMnwR+m3MLNblERwZ3JN1uY= X-Google-Smtp-Source: AGHT+IEDuM5dLXocAXJLS/HomLem7o76oyy93aNO33bSKpzNGNo1eDOfRbwl3Vgp2iNJoJCRVZhfKA== X-Received: by 2002:a05:600c:1394:b0:45d:d1a3:ba6a with SMTP id 5b1f17b1804b1-46fa9b1706amr158430435e9.33.1760378765595; Mon, 13 Oct 2025 11:06:05 -0700 (PDT) Received: from denis-pc ([176.206.100.218]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce589b3dsm19933428f8f.24.2025.10.13.11.06.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Oct 2025 11:06:05 -0700 (PDT) From: Denis Benato To: linux-kernel@vger.kernel.org Cc: platform-driver-x86@vger.kernel.org, "Hans de Goede" , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , "Limonciello, Mario" , "Luke D . Jones" , "Alok Tiwari" , "Derek John Clark" , "Mateusz Schyboll" , porfet828@gmail.com, Denis Benato Subject: [PATCH v13 8/8] platform/x86: asus-armoury: add ppt_* and nv_* tuning knobs Date: Mon, 13 Oct 2025 20:05:34 +0200 Message-ID: <20251013180534.1222432-9-benato.denis96@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013180534.1222432-1-benato.denis96@gmail.com> References: <20251013180534.1222432-1-benato.denis96@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 It is assumed that at least AC settings are available so that the firmware attributes will be created - if no DC table is available and power is on DC, then reading the attributes is -ENODEV. Signed-off-by: Denis Benato Signed-off-by: Luke D. Jones Reviewed-by: Mario Limonciello Tested-by: Mateusz Schyboll Tested-by: Porfet Lillian --- drivers/platform/x86/asus-armoury.c | 296 ++++- drivers/platform/x86/asus-armoury.h | 1210 ++++++++++++++++++++ include/linux/platform_data/x86/asus-wmi.h | 3 + 3 files changed, 1503 insertions(+), 6 deletions(-) diff --git a/drivers/platform/x86/asus-armoury.c b/drivers/platform/x86/asu= s-armoury.c index e27f964aebf8..918aea6fba1e 100644 --- a/drivers/platform/x86/asus-armoury.c +++ b/drivers/platform/x86/asus-armoury.c @@ -27,6 +27,7 @@ #include #include #include +#include #include =20 #include "asus-armoury.h" @@ -45,6 +46,17 @@ #define ASUS_MINI_LED_2024_STRONG 0x01 #define ASUS_MINI_LED_2024_OFF 0x02 =20 +/* Power tunable attribute name defines */ +#define ATTR_PPT_PL1_SPL "ppt_pl1_spl" +#define ATTR_PPT_PL2_SPPT "ppt_pl2_sppt" +#define ATTR_PPT_PL3_FPPT "ppt_pl3_fppt" +#define ATTR_PPT_APU_SPPT "ppt_apu_sppt" +#define ATTR_PPT_PLATFORM_SPPT "ppt_platform_sppt" +#define ATTR_NV_DYNAMIC_BOOST "nv_dynamic_boost" +#define ATTR_NV_TEMP_TARGET "nv_temp_target" +#define ATTR_NV_BASE_TGP "nv_base_tgp" +#define ATTR_NV_TGP "nv_tgp" + #define ASUS_POWER_CORE_MASK GENMASK(15, 8) #define ASUS_PERF_CORE_MASK GENMASK(7, 0) =20 @@ -73,11 +85,26 @@ struct cpu_cores { u32 max_power_cores; }; =20 +struct rog_tunables { + const struct power_limits *power_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; + /* Index 0 for DC, 1 for AC */ + struct rog_tunables *rog_tunables[2]; u32 mini_led_dev_id; u32 gpu_mux_dev_id; /* @@ -719,7 +746,34 @@ static ssize_t cores_efficiency_current_value_store(st= ruct kobject *kobj, ATTR_GROUP_CORES_RW(cores_efficiency, "cores_efficiency", "Set the max available efficiency cores"); =20 +/* Define helper to access the current power mode tunable values */ +static inline struct rog_tunables *get_current_tunables(void) +{ + return asus_armoury + .rog_tunables[power_supply_is_system_supplied() ? 1 : 0]; +} + /* Simple attribute creation */ +ATTR_GROUP_ROG_TUNABLE(ppt_pl1_spl, ATTR_PPT_PL1_SPL, ASUS_WMI_DEVID_PPT_P= L1_SPL, + "Set the CPU slow package limit"); +ATTR_GROUP_ROG_TUNABLE(ppt_pl2_sppt, ATTR_PPT_PL2_SPPT, ASUS_WMI_DEVID_PPT= _PL2_SPPT, + "Set the CPU fast package limit"); +ATTR_GROUP_ROG_TUNABLE(ppt_pl3_fppt, ATTR_PPT_PL3_FPPT, ASUS_WMI_DEVID_PPT= _FPPT, + "Set the CPU fastest package limit"); +ATTR_GROUP_ROG_TUNABLE(ppt_apu_sppt, ATTR_PPT_APU_SPPT, ASUS_WMI_DEVID_PPT= _APU_SPPT, + "Set the APU package limit"); +ATTR_GROUP_ROG_TUNABLE(ppt_platform_sppt, ATTR_PPT_PLATFORM_SPPT, ASUS_WMI= _DEVID_PPT_PLAT_SPPT, + "Set the platform package limit"); +ATTR_GROUP_ROG_TUNABLE(nv_dynamic_boost, ATTR_NV_DYNAMIC_BOOST, ASUS_WMI_D= EVID_NV_DYN_BOOST, + "Set the Nvidia dynamic boost limit"); +ATTR_GROUP_ROG_TUNABLE(nv_temp_target, ATTR_NV_TEMP_TARGET, ASUS_WMI_DEVID= _NV_THERM_TARGET, + "Set the Nvidia max thermal limit"); +ATTR_GROUP_ROG_TUNABLE(nv_tgp, "nv_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, ATTR_NV_BASE_TGP, ASUS_WMI_DEVID= _DGPU_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 @@ -746,6 +800,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 }, @@ -754,8 +818,75 @@ static const struct asus_attr_group armoury_attr_group= s[] =3D { { &screen_auto_brightness_attr_group, ASUS_WMI_DEVID_SCREEN_AUTO_BRIGHTNE= SS }, }; =20 +/** + * is_power_tunable_attr - Determines if an attribute is a power-related t= unable + * @name: The name of the attribute to check + * + * This function checks if the given attribute name is related to power tu= ning. + * + * Return: true if the attribute is a power-related tunable, false otherwi= se + */ +static bool is_power_tunable_attr(const char *name) +{ + static const char * const power_tunable_attrs[] =3D { + ATTR_PPT_PL1_SPL, ATTR_PPT_PL2_SPPT, + ATTR_PPT_PL3_FPPT, ATTR_PPT_APU_SPPT, + ATTR_PPT_PLATFORM_SPPT, ATTR_NV_DYNAMIC_BOOST, + ATTR_NV_TEMP_TARGET, ATTR_NV_BASE_TGP, + ATTR_NV_TGP + }; + + for (unsigned int i =3D 0; i < ARRAY_SIZE(power_tunable_attrs); i++) { + if (!strcmp(name, power_tunable_attrs[i])) + return true; + } + + return false; +} + +/** + * has_valid_limit - Checks if a power-related attribute has a valid limit= value + * @name: The name of the attribute to check + * @limits: Pointer to the power_limits structure containing limit values + * + * This function checks if a power-related attribute has a valid limit val= ue. + * It returns false if limits is NULL or if the corresponding limit value = is zero. + * + * Return: true if the attribute has a valid limit value, false otherwise + */ +static bool has_valid_limit(const char *name, const struct power_limits *l= imits) +{ + u32 limit_value =3D 0; + + if (!limits) + return false; + + if (!strcmp(name, ATTR_PPT_PL1_SPL)) + limit_value =3D limits->ppt_pl1_spl_max; + else if (!strcmp(name, ATTR_PPT_PL2_SPPT)) + limit_value =3D limits->ppt_pl2_sppt_max; + else if (!strcmp(name, ATTR_PPT_PL3_FPPT)) + limit_value =3D limits->ppt_pl3_fppt_max; + else if (!strcmp(name, ATTR_PPT_APU_SPPT)) + limit_value =3D limits->ppt_apu_sppt_max; + else if (!strcmp(name, ATTR_PPT_PLATFORM_SPPT)) + limit_value =3D limits->ppt_platform_sppt_max; + else if (!strcmp(name, ATTR_NV_DYNAMIC_BOOST)) + limit_value =3D limits->nv_dynamic_boost_max; + else if (!strcmp(name, ATTR_NV_TEMP_TARGET)) + limit_value =3D limits->nv_temp_target_max; + else if (!strcmp(name, ATTR_NV_BASE_TGP) || + !strcmp(name, ATTR_NV_TGP)) + limit_value =3D limits->nv_tgp_max; + + return limit_value > 0; +} + 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), @@ -812,12 +943,30 @@ 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[1] && asus_armoury.rog_tunables[1]->power_= limits && + is_power_tunable_attr(name)) { + limits =3D asus_armoury.rog_tunables[1]->power_limits; + /* Check only AC, if DC is not present then AC won't be either */ + should_create =3D has_valid_limit(name, limits); + if (!should_create) { + pr_debug("Missing max value on %s for tunable: %s\n", + dmi_get_system_info(DMI_BOARD_NAME), name); + } + } + + 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 @@ -846,6 +995,135 @@ static int asus_fw_attr_add(void) =20 /* Init / exit ***********************************************************= *****/ =20 +/* Set up the min/max and defaults for ROG tunables */ +static void init_rog_tunables(void) +{ + const struct power_limits *ac_limits, *dc_limits; + const struct power_data *power_data; + const struct dmi_system_id *dmi_id; + bool ac_initialized =3D false, dc_initialized =3D false; + + /* 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"); + return; + } + + /* 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; + } + + /* Initialize AC power tunables */ + ac_limits =3D power_data->ac_data; + if (ac_limits) { + asus_armoury.rog_tunables[1] =3D + kzalloc(sizeof(*asus_armoury.rog_tunables[1]), GFP_KERNEL); + if (!asus_armoury.rog_tunables[1]) + goto err_nomem; + + asus_armoury.rog_tunables[1]->power_limits =3D ac_limits; + + /* Set initial AC values */ + asus_armoury.rog_tunables[1]->ppt_pl1_spl =3D + ac_limits->ppt_pl1_spl_def ? + ac_limits->ppt_pl1_spl_def : + ac_limits->ppt_pl1_spl_max; + + asus_armoury.rog_tunables[1]->ppt_pl2_sppt =3D + ac_limits->ppt_pl2_sppt_def ? + ac_limits->ppt_pl2_sppt_def : + ac_limits->ppt_pl2_sppt_max; + + asus_armoury.rog_tunables[1]->ppt_pl3_fppt =3D + ac_limits->ppt_pl3_fppt_def ? + ac_limits->ppt_pl3_fppt_def : + ac_limits->ppt_pl3_fppt_max; + + asus_armoury.rog_tunables[1]->ppt_apu_sppt =3D + ac_limits->ppt_apu_sppt_def ? + ac_limits->ppt_apu_sppt_def : + ac_limits->ppt_apu_sppt_max; + + asus_armoury.rog_tunables[1]->ppt_platform_sppt =3D + ac_limits->ppt_platform_sppt_def ? + ac_limits->ppt_platform_sppt_def : + ac_limits->ppt_platform_sppt_max; + + asus_armoury.rog_tunables[1]->nv_dynamic_boost =3D + ac_limits->nv_dynamic_boost_max; + asus_armoury.rog_tunables[1]->nv_temp_target =3D + ac_limits->nv_temp_target_max; + asus_armoury.rog_tunables[1]->nv_tgp =3D ac_limits->nv_tgp_max; + + ac_initialized =3D true; + pr_debug("AC power limits initialized for %s\n", dmi_id->matches[0].subs= tr); + } + + /* Initialize DC power tunables */ + dc_limits =3D power_data->dc_data; + if (dc_limits) { + asus_armoury.rog_tunables[0] =3D + kzalloc(sizeof(*asus_armoury.rog_tunables[0]), GFP_KERNEL); + if (!asus_armoury.rog_tunables[0]) { + if (ac_initialized) + kfree(asus_armoury.rog_tunables[1]); + goto err_nomem; + } + + asus_armoury.rog_tunables[0]->power_limits =3D dc_limits; + + /* Set initial DC values */ + asus_armoury.rog_tunables[0]->ppt_pl1_spl =3D + dc_limits->ppt_pl1_spl_def ? + dc_limits->ppt_pl1_spl_def : + dc_limits->ppt_pl1_spl_max; + + asus_armoury.rog_tunables[0]->ppt_pl2_sppt =3D + dc_limits->ppt_pl2_sppt_def ? + dc_limits->ppt_pl2_sppt_def : + dc_limits->ppt_pl2_sppt_max; + + asus_armoury.rog_tunables[0]->ppt_pl3_fppt =3D + dc_limits->ppt_pl3_fppt_def ? + dc_limits->ppt_pl3_fppt_def : + dc_limits->ppt_pl3_fppt_max; + + asus_armoury.rog_tunables[0]->ppt_apu_sppt =3D + dc_limits->ppt_apu_sppt_def ? + dc_limits->ppt_apu_sppt_def : + dc_limits->ppt_apu_sppt_max; + + asus_armoury.rog_tunables[0]->ppt_platform_sppt =3D + dc_limits->ppt_platform_sppt_def ? + dc_limits->ppt_platform_sppt_def : + dc_limits->ppt_platform_sppt_max; + + asus_armoury.rog_tunables[0]->nv_dynamic_boost =3D + dc_limits->nv_dynamic_boost_max; + asus_armoury.rog_tunables[0]->nv_temp_target =3D + dc_limits->nv_temp_target_max; + asus_armoury.rog_tunables[0]->nv_tgp =3D dc_limits->nv_tgp_max; + + dc_initialized =3D true; + pr_debug("DC power limits initialized for %s\n", dmi_id->matches[0].subs= tr); + } + + if (!ac_initialized) + pr_debug("No AC PPT limits defined\n"); + + if (!dc_initialized) + pr_debug("No DC PPT limits defined\n"); + + return; + +err_nomem: + pr_err("Failed to allocate memory for tunables\n"); +} + static int __init asus_fw_init(void) { char *wmi_uid; @@ -870,6 +1148,9 @@ static int __init asus_fw_init(void) } } =20 + init_rog_tunables(); + + /* Must always be last step to ensure data is available */ return asus_fw_attr_add(); } =20 @@ -878,6 +1159,9 @@ 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)); + + kfree(asus_armoury.rog_tunables[0]); + kfree(asus_armoury.rog_tunables[1]); } =20 module_init(asus_fw_init); diff --git a/drivers/platform/x86/asus-armoury.h b/drivers/platform/x86/asu= s-armoury.h index a6c4caefdef9..d99db5f5f6a0 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 @@ -189,4 +190,1213 @@ .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) \ + { \ + struct rog_tunables *tunables =3D get_current_tunables(); \ + \ + if (!tunables || !tunables->power_limits) \ + return -ENODEV; \ + \ + return sysfs_emit(buf, "%d\n", tunables->power_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) \ + { \ + struct rog_tunables *tunables =3D get_current_tunables(); \ + \ + if (!tunables || !tunables->power_limits) \ + return -ENODEV; \ + \ + return sysfs_emit( \ + buf, "%d\n", \ + tunables->power_limits->_attrname##_def ? \ + tunables->power_limits->_attrname##_def : \ + tunables->power_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) \ + { \ + struct rog_tunables *tunables =3D get_current_tunables(); \ + \ + if (!tunables || !tunables->power_limits) \ + return -ENODEV; \ + \ + return attr_uint_store(kobj, attr, buf, count, \ + tunables->power_limits->_attr##_min, \ + tunables->power_limits->_attr##_max, \ + &tunables->_attr, _wmi); \ + } \ + static ssize_t _attr##_current_value_show( \ + struct kobject *kobj, struct kobj_attribute *attr, char *buf) \ + { \ + struct rog_tunables *tunables =3D get_current_tunables(); \ + \ + if (!tunables) \ + return -ENODEV; \ + \ + return sysfs_emit(buf, "%u\n", 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 available 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, "FA608WI"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 15, + .ppt_pl1_spl_def =3D 90, + .ppt_pl1_spl_max =3D 90, + .ppt_pl2_sppt_min =3D 35, + .ppt_pl2_sppt_def =3D 90, + .ppt_pl2_sppt_max =3D 90, + .ppt_pl3_fppt_min =3D 35, + .ppt_pl3_fppt_def =3D 90, + .ppt_pl3_fppt_max =3D 90, + .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 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_def =3D 65, + .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, "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, "FX507VI"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 28, + .ppt_pl1_spl_max =3D 135, + .ppt_pl2_sppt_min =3D 28, + .ppt_pl2_sppt_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 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, + }, + .requires_fan_curve =3D true, + }, + }, + { + .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, "GU605CW"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 45, + .ppt_pl1_spl_max =3D 85, + .ppt_pl2_sppt_min =3D 56, + .ppt_pl2_sppt_max =3D 110, + .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 80, + .nv_tgp_def =3D 90, + .nv_tgp_max =3D 110, + }, + .dc_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 25, + .ppt_pl1_spl_max =3D 85, + .ppt_pl2_sppt_min =3D 32, + .ppt_pl2_sppt_max =3D 110, + .nv_temp_target_min =3D 75, + .nv_temp_target_max =3D 87, + }, + .requires_fan_curve =3D true, + }, + }, + { + .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_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, "G713PV"), + }, + .driver_data =3D &(struct power_data) { + .ac_data =3D &(struct power_limits) { + .ppt_pl1_spl_min =3D 30, + .ppt_pl1_spl_def =3D 120, + .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, "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 260796fee301..480596317c7a 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.51.0