From patchwork Sun Apr 21 19:43:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mohamed Ghanmi X-Patchwork-Id: 13637528 Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on2107.outbound.protection.outlook.com [40.107.247.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F2E3644C64; Sun, 21 Apr 2024 19:43:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.247.107 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713728634; cv=fail; b=g1msSzfkce5x1MpPscXPa+42xGcL3BwWvXEXHmhYKgFs5V5aEmLooacUT2nfBHIIr0i+JTuyDbL5AlzY/5s/pY9jfW2x+mQZipOdCk6eVw1AGTQwgudwq2rb9vHgVUafV2rYRvFBeGHi9pjk25NzrMzFASxO7+X9vF3w7i8WlPU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713728634; c=relaxed/simple; bh=UDuMk+oG1iuBsanR7vTYEVZSG266bXw1zA5PfhBCJLg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=KwaDYQncYlrSe1EnpO9vpWqY6/yofwjD1NjF9Z6nEJmEuw2sfotf6OXXz4EUydbLsxP1+ffIpB1SFqbjOlk57yyTNQwy6tt6TAdeiWe4uiQrGIBqVeBV90L5gJXlZ/dJ4RTXMu4gE2VRPDRnzhZ22TURstTVWb/pKQUY6Ldvae0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=supcom.tn; spf=pass smtp.mailfrom=supcom.tn; dkim=pass (1024-bit key) header.d=supcom.onmicrosoft.com header.i=@supcom.onmicrosoft.com header.b=Q/BIHHvE; arc=fail smtp.client-ip=40.107.247.107 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=supcom.tn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=supcom.tn Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=supcom.onmicrosoft.com header.i=@supcom.onmicrosoft.com header.b="Q/BIHHvE" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k8RxbnXBbMOj8EzdINKybkBTqfYRVJykR/8C3LeMR8PtpT2De50SB6+mOSwVv6KoFwdF8wr57Y1PB/s+jpu8OBK/RLhnmoQmjr3gWjXSGDZ5VdGY8sHmLUO8pD8dIoBNxuB6Ew3So3SP0iG0iXNqBiowOkVHYQ+OATrvOv9lqmr5L9yiSuQxviejXeW2tvD9D1D07yxwYNXL1MQvglEIlTwUVNrD40H1IoKRctVCi8O6u6IF4STyY0GpXRgRoF2CW9MZtu/gaj4NpGSFYIMqSFKTyQOUnMRWHpgO4gFkCWpuXpz9ovYm71mACLw9NAm9dHPmwcVvuWaruC+g4QvL1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SHwehcA0WdxquWWaVdxmSeiAKbtoTXa8t77pexQiqYk=; b=MiwCRGUtfyUe0blj5vUkOkJIQ/Eg7SrYLisZUJEIViKF5rw7bBuwWwvX70mFNWp7UFS40eADHi0ESw242fLu6cMSuVXzxBixO109v2KZN3+G/zcQUodFMGvm7Gh8sHC+IWM8Om5dqM9c+YYP7Ktaob2KpQxmsVwjOoS18Kwss+y25TqCbRQCvxTiGH3iGjrHRz9FZnKPS5MCFy2y8A9kY8C1I986KDPxzjQdEQ9fywL68u/LNRT2WavpDpLPwikZBnlVISiFqCs4j6YBK0PktVoghJi42wuPuozP/dPlUt351g3LbqjrSp08yzJiwSg+oc/GqwD/QJRwOmeiW5DvqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=supcom.tn; dmarc=pass action=none header.from=supcom.tn; dkim=pass header.d=supcom.tn; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=supcom.onmicrosoft.com; s=selector2-supcom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SHwehcA0WdxquWWaVdxmSeiAKbtoTXa8t77pexQiqYk=; b=Q/BIHHvEnjdU0oh2ur9De2c5gK/xjTkoxX3WWGRNzU2nZp096QqKDfbIKSAgviZ3QVWDR5Vjx9HjIF5XiYnMuPm3HavnaQhXgwj83XnDTEHMTsd5NVzuVnIAPFT6k2/lJ43AwiL8sxSoE/u/IrzAZ9jhWMYN9s1OTaODZ5AJflM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=supcom.tn; Received: from AM0PR0402MB3905.eurprd04.prod.outlook.com (2603:10a6:208:b::23) by PR3PR04MB7372.eurprd04.prod.outlook.com (2603:10a6:102:80::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.44; Sun, 21 Apr 2024 19:43:43 +0000 Received: from AM0PR0402MB3905.eurprd04.prod.outlook.com ([fe80::eb9a:367f:6384:7d62]) by AM0PR0402MB3905.eurprd04.prod.outlook.com ([fe80::eb9a:367f:6384:7d62%4]) with mapi id 15.20.7472.044; Sun, 21 Apr 2024 19:43:43 +0000 From: Mohamed Ghanmi To: hdegoede@redhat.com Cc: corentin.chary@gmail.com, ilpo.jarvinen@linux.intel.com, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, "Luke D . Jones" , Mohamed Ghanmi Subject: [PATCH v3 1/1] platform/x86: asus-wmi: add support for vivobook fan profiles Date: Sun, 21 Apr 2024 20:43:20 +0100 Message-ID: <20240421194320.48258-2-mohamed.ghanmi@supcom.tn> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240421194320.48258-1-mohamed.ghanmi@supcom.tn> References: <20240421194320.48258-1-mohamed.ghanmi@supcom.tn> X-ClientProxiedBy: ZR2P278CA0070.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::13) To AM0PR0402MB3905.eurprd04.prod.outlook.com (2603:10a6:208:b::23) Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR0402MB3905:EE_|PR3PR04MB7372:EE_ X-MS-Office365-Filtering-Correlation-Id: 803a0102-819b-44e9-df3a-08dc623b59e4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?utf-8?q?jdJhB+gGi49mQqzYyiA92jcvglLwOzq?= =?utf-8?q?bQbFg1fzA9JkVKjYIf4olKgUe6081k/kQuC6kyjKrwypP6eyHOG2mC/BKE9mdqO7J?= =?utf-8?q?uYRDF1WwHXMol3k81wRuph5dvfMDvzDJCYDMH59Yd0ijusJXX4hoGsZs7T+4gcbsn?= =?utf-8?q?sA61QI5Pc6MzjiqNYyoAmCZbY5ujFnBPPsEaH457VlB70xHA4mhBbjTZebOZ96rTM?= =?utf-8?q?BEgOykfJ99T8m6LWg1gOzeTo3F6cQTStRiBd1dbaFsKqBhvnKibbuFI1y3tNA/XAw?= =?utf-8?q?dKERd9ymiUT8P2hyrjbpxxmlRb/QC0VRMNd+I+N9l5Ar7tJicpL/7Djz3S7hBslTj?= =?utf-8?q?PeIoxkxYrXvH2IHJIj2kY0HLBSq5Ber49dX21v9otLaC+elj0kmmZqXgZsi0MPZJu?= =?utf-8?q?bM2DvAhZliyGDggvg74+/Df0IQL5gbPs7Gu6tCbQpmY+YNENMLqa61Mw1OM/LGLS9?= =?utf-8?q?P6basJkL6BZ5xhYMuxm1vu9Bw2Ojdr0W1nFcEt+OrZCogf5IXYSoSddOk7XlAGnpm?= =?utf-8?q?B/L0JiG2V3Bh1/7p8MY4aknpSvH/aNEWuKUmu+C5WnHzmAIz103YgR/5UrDnSkQGH?= =?utf-8?q?jc0RVMpFN6EZsTXnfr2uEp0a6KS5X7trirDXWE7X0bIN+YNp2WLWW5vMjxlAapCmX?= =?utf-8?q?SmvzJ4QDZA3gC1W7g4N4iPqdB+FNrYUHkNSbQonk1Wf0pvpsxY5TXeqZqfQZIIeei?= =?utf-8?q?o8Pcbp1PeH8kY/zRAQ60SpqRSM3Yeme53Kj6ehBO9VB/ZpYt7j+l6eE4e4HzuKGNx?= =?utf-8?q?7SLzKw/AGJzmJXn3KHrv2W9dj3GudSJ3xr7tLQFjEHA36rmWZMYUo5bqBUhRZVm0N?= =?utf-8?q?Pub5SCBzVoVWEhvMSSzQ4R9F20CRmHKrzzZsBCuZk+93IODieVZqy+NjNzU/yjPGD?= =?utf-8?q?D9JYXHZPg2ZRPxXYpNK8wSiVuYwAcq3w4aerAGVgzT6fRdipkoX0dHmG7c4xrAwJs?= =?utf-8?q?NKSvsXDBFhe9UBWrcglJ+KJraOIHrnOuDZZCAsH/cc9EjP+Rzi5pbvPk60VQTEzFU?= =?utf-8?q?eV06CEu97rOTsWlAMFUIaFYbb6Mx8o+/lc6xLkANXLuDq/qMajKLdZEUq3bW/fYuy?= =?utf-8?q?lOqhcdqEt+AKNtU+Xhgp6skNfK1Mn3Mi3Ok8rkWZd5EXWSt43V+pgsEv071smkF+I?= =?utf-8?q?lqUylDk1a9Vu2Ai7IBy5DsYEcTcMicxwNtE9TuPcrwQG1Bzfw8lNoJCb+m/4g+wlv?= =?utf-8?q?ko2TXjJkHLMYzEFy3nscWONUaChk9WH5vMVVyue1dTxSMfaunYFdWP6/S0dF3M3F4?= =?utf-8?q?k+TpzwsSv8q8g8rXmzfLyt8GZvBjU9D5Vtw=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR0402MB3905.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366007)(52116005)(41320700004)(376005)(1800799015)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?750qJAlSzLoFjWk4V871NLwL1BgT?= =?utf-8?q?jrlZdMSXFgEp3WyqI5YkBqv7TSwd0/WYEWrZ4R0PFID8NbIjIzVH4jm20GUO/g+zF?= =?utf-8?q?+dqoj802YqQxk9a9HIJezWXH3GkLUTDyP4taDO0pfWetl6S5VaNc7E+Q0CiY1h6l5?= =?utf-8?q?t7OZEOdiripN2R8vELjbuRgbit55x6WV/G0ChKf61n9cuxtZ4Fm6XnZvmggyhUmxs?= =?utf-8?q?kmZ3AO9E6bxZsmCYNRILmkaQOhKx6sSstJt80+o/lrg7WJ7oWQYPW6BRGShHO8FR/?= =?utf-8?q?ogC5zghwrvOabM+dGemzF6HASu5Z6tLu/L5zF2a37P4elm84wW+x/NQIe7G7j+0Uh?= =?utf-8?q?/V31uacMfcsK8s+CxOUeov9ICT30loCS67iphdLJ3XFCyrQi+BoWROHQQ43NmzS6N?= =?utf-8?q?6s5jNh+cgyeFuTABdQ0ZMws0KYHMbpe3I9SDkSJFKj635woinBmCFUwj8Pr58lTgu?= =?utf-8?q?WQuVeZNs29AmbWdyClGpumAxf19z4Y7lL1VptPkGcXs6IUiFixwhnc8h9BqscTl1H?= =?utf-8?q?UGn6fh9+/aF+T+nEu6CumNkcG4RX33hO/nNC34ySPvw4AM0QFJvRnoNq813294VD/?= =?utf-8?q?tv6ciDMuz36R1nLcveLWi0c/PWe5wqNcxN/IEhFQ6qHzQqgrvNh6lfAcqrhFMLDb3?= =?utf-8?q?YDEpDYH/v/lH0JWOyNmDdV+/kgaLYF2REuDY0Z0mxKiFqcoCIA8LsSLWzZ3Aqsoyt?= =?utf-8?q?bHtkvAiBHqNtvYV4ugRCHG8M0495wgcuaxbNJiLQC019laka5G/nc42aG9kmuGz6s?= =?utf-8?q?eQf20kT4JYF3EccPkFjiYbU/Cb0BHe/xhhkIPweYgIp/KihBwC4wOVJbssCmfsx+X?= =?utf-8?q?bSbRzyNVXui8Dw/LcqNV/AO66h9GL/wce4hHKAcXMmeI+rLZw5HUBuNkF2vCifHwF?= =?utf-8?q?pv8rFKZRp1OKRV0QR89q2IMVhkoQNmTqmgSo8hcLWYTT0ngEikV1lyo8JEintjbgK?= =?utf-8?q?6SD16mSka81XAnTjAHNadrnGhAFMghNTJ0jt1SWpsjCJoTlBCww8kK/oLKO9prBEP?= =?utf-8?q?bigv4ZtsHyHK3ZFBF7F+nr3DOEtMvamDXWb5EtpdtegKBIOK97dcq5JMzFm0Z13ED?= =?utf-8?q?I9WBP4Aqv5uMqWD9Tu9NzLZ8lLeHChzYREFjYh+9CT7LGO3QX0cpJjYn12HWOKcOX?= =?utf-8?q?6+stCEIHCKM3OIGZU6yI4jANgQMPG0GhKALdYICORumgOi+SBI/9xb+FexPeuPkfp?= =?utf-8?q?4qPBnCU7I85YW/NpVpz5pjtaV2bALNJeyOv8BRqVN32r2FUNQ+ZNh/52x2e4d/6dw?= =?utf-8?q?6DjPDokAWwNUWrIDbMXNXx+/iRUlNL38f4B6/GcdUV3x8GPOznKrQ1D7wwgdV4l/7?= =?utf-8?q?5se18nRuQ1gYDVUakviJ2TrCXACv8g4Xdy1PjVvQvioaceGSWwbRfla85MLXZFWnU?= =?utf-8?q?NQyODjrzYi4MJf7LBokQpCYH9xMx/O53jYpZVeKWht0srUaj7cR5F18VCBslQAjuq?= =?utf-8?q?HJ72l/A0+jiKctgSNXqHZrBh9WkUebA1t+aDJgECCwiB3UkV6Aki455D6mJxeraB7?= =?utf-8?q?3LXwNagXtxDNRywb9UKA16HczPDwIJNeoA=3D=3D?= X-OriginatorOrg: supcom.tn X-MS-Exchange-CrossTenant-Network-Message-Id: 803a0102-819b-44e9-df3a-08dc623b59e4 X-MS-Exchange-CrossTenant-AuthSource: AM0PR0402MB3905.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Apr 2024 19:43:43.1438 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8f85f528-6195-4e97-8e41-f5a9ad3bed4a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: KtH90vcBQx5UnFD2JgSGUtxL7U85xkGgLuC9xyLA0QXFxDHMzwu4PoSlJ9RMOuw71wMeTq347LJvC5sQFYroIL9CPp1GuOKUOoll/I2VTn0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7372 Add support for vivobook fan profiles wmi call on the ASUS VIVOBOOK to adjust power limits. These fan profiles have a different device id than the ROG series and different order. This reorders the existing modes and adds a new full speed mode available on these laptops. As part of keeping the patch clean the throttle_thermal_policy_available boolean stored in the driver struct is removed and throttle_thermal_policy_dev is used in place (as on init it is zeroed). Signed-off-by: Mohamed Ghanmi Co-developed-by: Luke D. Jones Signed-off-by: Luke D. Jones Reviewed-by: Ilpo Järvinen --- drivers/platform/x86/asus-wmi.c | 93 ++++++++++++---------- include/linux/platform_data/x86/asus-wmi.h | 1 + 2 files changed, 51 insertions(+), 43 deletions(-) diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 3c61d75a3..1f54596ca 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -97,6 +97,11 @@ module_param(fnlock_default, bool, 0444); #define ASUS_THROTTLE_THERMAL_POLICY_OVERBOOST 1 #define ASUS_THROTTLE_THERMAL_POLICY_SILENT 2 +#define ASUS_THROTTLE_THERMAL_POLICY_DEFAULT_VIVO 0 +#define ASUS_THROTTLE_THERMAL_POLICY_SILENT_VIVO 1 +#define ASUS_THROTTLE_THERMAL_POLICY_OVERBOOST_VIVO 2 +#define ASUS_THROTTLE_THERMAL_POLICY_FULLSPEED 3 + #define USB_INTEL_XUSB2PR 0xD0 #define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI 0x9c31 @@ -293,8 +298,8 @@ struct asus_wmi { u32 kbd_rgb_dev; bool kbd_rgb_state_available; - bool throttle_thermal_policy_available; u8 throttle_thermal_policy_mode; + u32 throttle_thermal_policy_dev; bool cpu_fan_curve_available; bool gpu_fan_curve_available; @@ -3152,7 +3157,7 @@ static int fan_curve_get_factory_default(struct asus_wmi *asus, u32 fan_dev) int err, fan_idx; u8 mode = 0; - if (asus->throttle_thermal_policy_available) + if (asus->throttle_thermal_policy_dev) mode = asus->throttle_thermal_policy_mode; /* DEVID_PU_FAN_CURVE is switched for OVERBOOST vs SILENT */ if (mode == 2) @@ -3359,7 +3364,7 @@ static ssize_t fan_curve_enable_store(struct device *dev, * For machines with throttle this is the only way to reset fans * to default mode of operation (does not erase curve data). */ - if (asus->throttle_thermal_policy_available) { + if (asus->throttle_thermal_policy_dev) { err = throttle_thermal_policy_write(asus); if (err) return err; @@ -3576,8 +3581,8 @@ static const struct attribute_group asus_fan_curve_attr_group = { __ATTRIBUTE_GROUPS(asus_fan_curve_attr); /* - * Must be initialised after throttle_thermal_policy_check_present() as - * we check the status of throttle_thermal_policy_available during init. + * Must be initialised after throttle_thermal_policy_dev is set as + * we check the status of throttle_thermal_policy_dev during init. */ static int asus_wmi_custom_fan_curve_init(struct asus_wmi *asus) { @@ -3618,38 +3623,37 @@ static int asus_wmi_custom_fan_curve_init(struct asus_wmi *asus) } /* Throttle thermal policy ****************************************************/ - -static int throttle_thermal_policy_check_present(struct asus_wmi *asus) +static u8 throttle_thermal_policy_max_mode(struct asus_wmi *asus) { - u32 result; - int err; - - asus->throttle_thermal_policy_available = false; - - err = asus_wmi_get_devstate(asus, - ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY, - &result); - if (err) { - if (err == -ENODEV) - return 0; - return err; - } - - if (result & ASUS_WMI_DSTS_PRESENCE_BIT) - asus->throttle_thermal_policy_available = true; - - return 0; + if (asus->throttle_thermal_policy_dev == ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY_VIVO) + return ASUS_THROTTLE_THERMAL_POLICY_FULLSPEED; + else + return ASUS_THROTTLE_THERMAL_POLICY_SILENT; } static int throttle_thermal_policy_write(struct asus_wmi *asus) { - int err; - u8 value; + u8 value = asus->throttle_thermal_policy_mode; u32 retval; + bool vivo; + int err; - value = asus->throttle_thermal_policy_mode; + vivo = asus->throttle_thermal_policy_dev == ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY_VIVO; + if (vivo) { + switch (value) { + case ASUS_THROTTLE_THERMAL_POLICY_DEFAULT: + value = ASUS_THROTTLE_THERMAL_POLICY_DEFAULT_VIVO; + break; + case ASUS_THROTTLE_THERMAL_POLICY_OVERBOOST: + value = ASUS_THROTTLE_THERMAL_POLICY_OVERBOOST_VIVO; + break; + case ASUS_THROTTLE_THERMAL_POLICY_SILENT: + value = ASUS_THROTTLE_THERMAL_POLICY_SILENT_VIVO; + break; + } + } - err = asus_wmi_set_devstate(ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY, + err = asus_wmi_set_devstate(asus->throttle_thermal_policy_dev, value, &retval); sysfs_notify(&asus->platform_device->dev.kobj, NULL, @@ -3679,7 +3683,7 @@ static int throttle_thermal_policy_write(struct asus_wmi *asus) static int throttle_thermal_policy_set_default(struct asus_wmi *asus) { - if (!asus->throttle_thermal_policy_available) + if (!asus->throttle_thermal_policy_dev) return 0; asus->throttle_thermal_policy_mode = ASUS_THROTTLE_THERMAL_POLICY_DEFAULT; @@ -3689,9 +3693,10 @@ static int throttle_thermal_policy_set_default(struct asus_wmi *asus) static int throttle_thermal_policy_switch_next(struct asus_wmi *asus) { u8 new_mode = asus->throttle_thermal_policy_mode + 1; + u8 max_mode = throttle_thermal_policy_max_mode(asus); int err; - if (new_mode > ASUS_THROTTLE_THERMAL_POLICY_SILENT) + if (new_mode > max_mode) new_mode = ASUS_THROTTLE_THERMAL_POLICY_DEFAULT; asus->throttle_thermal_policy_mode = new_mode; @@ -3722,6 +3727,7 @@ static ssize_t throttle_thermal_policy_store(struct device *dev, const char *buf, size_t count) { struct asus_wmi *asus = dev_get_drvdata(dev); + u8 max_mode = throttle_thermal_policy_max_mode(asus); u8 new_mode; int result; int err; @@ -3730,7 +3736,7 @@ static ssize_t throttle_thermal_policy_store(struct device *dev, if (result < 0) return result; - if (new_mode > ASUS_THROTTLE_THERMAL_POLICY_SILENT) + if (new_mode > max_mode) return -EINVAL; asus->throttle_thermal_policy_mode = new_mode; @@ -3747,7 +3753,10 @@ static ssize_t throttle_thermal_policy_store(struct device *dev, return count; } -// Throttle thermal policy: 0 - default, 1 - overboost, 2 - silent +/* + * Throttle thermal policy: 0 - default, 1 - overboost, 2 - silent + * Throttle thermal policy vivobook : 0 - default, 1 - silent, 2 - overboost, 3 - fullspeed + */ static DEVICE_ATTR_RW(throttle_thermal_policy); /* Platform profile ***********************************************************/ @@ -3813,7 +3822,7 @@ static int platform_profile_setup(struct asus_wmi *asus) * Not an error if a component platform_profile relies on is unavailable * so early return, skipping the setup of platform_profile. */ - if (!asus->throttle_thermal_policy_available) + if (!asus->throttle_thermal_policy_dev) return 0; dev_info(dev, "Using throttle_thermal_policy for platform_profile support\n"); @@ -4228,7 +4237,7 @@ static void asus_wmi_handle_event_code(int code, struct asus_wmi *asus) if (code == NOTIFY_KBD_FBM || code == NOTIFY_KBD_TTP) { if (asus->fan_boost_mode_available) fan_boost_mode_switch_next(asus); - if (asus->throttle_thermal_policy_available) + if (asus->throttle_thermal_policy_dev) throttle_thermal_policy_switch_next(asus); return; @@ -4436,7 +4445,7 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj, else if (attr == &dev_attr_fan_boost_mode.attr) ok = asus->fan_boost_mode_available; else if (attr == &dev_attr_throttle_thermal_policy.attr) - ok = asus->throttle_thermal_policy_available; + ok = asus->throttle_thermal_policy_dev != 0; else if (attr == &dev_attr_ppt_pl2_sppt.attr) devid = ASUS_WMI_DEVID_PPT_PL2_SPPT; else if (attr == &dev_attr_ppt_pl1_spl.attr) @@ -4745,16 +4754,15 @@ static int asus_wmi_add(struct platform_device *pdev) else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE2)) asus->kbd_rgb_dev = ASUS_WMI_DEVID_TUF_RGB_MODE2; + if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY)) + asus->throttle_thermal_policy_dev = ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY; + else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY_VIVO)) + asus->throttle_thermal_policy_dev = ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY_VIVO; + err = fan_boost_mode_check_present(asus); if (err) goto fail_fan_boost_mode; - err = throttle_thermal_policy_check_present(asus); - if (err) - goto fail_throttle_thermal_policy; - else - throttle_thermal_policy_set_default(asus); - err = platform_profile_setup(asus); if (err) goto fail_platform_profile_setup; @@ -4849,7 +4857,6 @@ static int asus_wmi_add(struct platform_device *pdev) fail_input: asus_wmi_sysfs_exit(asus->platform_device); fail_sysfs: -fail_throttle_thermal_policy: fail_custom_fan_curve: fail_platform_profile_setup: if (asus->platform_profile_support) diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h index 3eb5cd677..982a63774 100644 --- a/include/linux/platform_data/x86/asus-wmi.h +++ b/include/linux/platform_data/x86/asus-wmi.h @@ -64,6 +64,7 @@ #define ASUS_WMI_DEVID_SCREENPAD_LIGHT 0x00050032 #define ASUS_WMI_DEVID_FAN_BOOST_MODE 0x00110018 #define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY 0x00120075 +#define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY_VIVO 0x00110019 /* Misc */ #define ASUS_WMI_DEVID_PANEL_OD 0x00050019