From patchwork Thu Apr 18 21:47:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mohamed Ghanmi X-Patchwork-Id: 13635467 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2118.outbound.protection.outlook.com [40.107.20.118]) (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 815BD194C95; Thu, 18 Apr 2024 21:47:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.20.118 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713476883; cv=fail; b=plsaLq4i4kiBMZkEwT1OwkaaIo4sn1zkOGckhLw+qeDCY6nIxMk7mBC4VwQRsKf4YLyNlcFtvdxZkYy3LfNL0lGzMRNo6NWqZOlnciTnZbCVynhF/ofYBrYvwD95ZRrO7/2UwMVN/PJdnJ4/P1hY3865qudRLf/+HFOxxKQojI4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713476883; c=relaxed/simple; bh=xFSh2DbDu6yE21sRDsOGdxN9r3MhVlmpZcg8qQh8dzI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=OeMvoBy70SX/XaJVrRrVk+i9ac1q8GoOU/mxH96y9dp0E8T765GZtvPz+D08Xz7Sxg+drRk51NxS51WyNf+MVRLw+JP4WgPDdfZuU5+MtB7KQd85buDe3fTaJUGsl2eE02jsayhJXlsGE1O9eiCPHABc8kXKpauc4Plz4nqjoMY= 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=A+SRjdQ9; arc=fail smtp.client-ip=40.107.20.118 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="A+SRjdQ9" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mr82GjcEThBCQ6EVKhE0vlBphs0cxFdz7QZ1OasFhRXIgzDHH/6SDBeN1clfBQ8lruox11XmjYchQ5AQdgaLNelcgcK5UevPOzpckNgmMJNd4O6BJ3StZ42RvO4F7XT5uhibwV+JQT8/tQCDvJhwZS0LOlqKlqOp5iE+JgPOzbNSmYUpH3DV0LSoDH+9Dnme4DBlz7QDySF8BDNyyHa7rvLWqf5joveQe1r5uPgGcYVD6XDF1iINTLZVSjNpH6u3ERuitQbj3T6ZtWb3r4aRQwnEYRv6AgfYJkwsDB6FE98+VvFxTZqjxqi/bcnxl+Y/nZnBEf03zvtkhDR4MIRe4A== 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=xoIqZuUiB4wQE9VPsDGbRAAwtBPjN4FlMgcnEcfobgw=; b=lS84WoMLKVKOo4Ui94MnvVWF0lNCf7NquauiQ8EeLniRS1Fy1TtKg5NFO7KexOO34houc1KbQQ4JLry7CbduyRevEqS9Q2ZVWXz5VffU5DlXH0r/M2VkOhtyFBmYAqb1llbkhEIWoQBtJVy5kap/Gd2ZkN27bVau3WtYhUim5+l1G7TUs002oUqIL34MSfRR4ZQTAJFWE4v0osBMqA9eliUeB5PPP95mMIQvpFKajQANrx9ZAmiRZIwtPunENv/8/kOArgcFskKDmr7IzEat8KJ6IcyHgHfJIe7ugVg4LJ+WFl/tGTqa0NUqIlqS8qyKs5tQba0hXJhzwg94HEhwsQ== 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=xoIqZuUiB4wQE9VPsDGbRAAwtBPjN4FlMgcnEcfobgw=; b=A+SRjdQ9NTUQAwGw26zWIeK1vEtPfZDV7aFny4HbhFsxGTvd1ljwdOIBMK0mJ7zDB08UFzUkbs00XAuBjRK27Q2H8JyvkK0flQDk6SnAGQ36aZrxUXSQpC8w3dmF7KWVamz0o+88s5qGOjGSoSMYbuTkw86kFw4KP3CnGnsQpOc= 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 AM0PR04MB7092.eurprd04.prod.outlook.com (2603:10a6:208:19c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 21:47:42 +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.7452.049; Thu, 18 Apr 2024 21:47:42 +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 v2 1/1] platform/x86: asus-wmi: add support for vivobook fan profiles Date: Thu, 18 Apr 2024 22:47:25 +0100 Message-ID: <20240418214727.10658-2-mohamed.ghanmi@supcom.tn> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240418214727.10658-1-mohamed.ghanmi@supcom.tn> References: <20240418214727.10658-1-mohamed.ghanmi@supcom.tn> X-ClientProxiedBy: MI2P293CA0005.ITAP293.PROD.OUTLOOK.COM (2603:10a6:290:45::12) 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_|AM0PR04MB7092:EE_ X-MS-Office365-Filtering-Correlation-Id: 4cb6d456-aeac-40e3-cf10-08dc5ff12c9d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eWtgpJWdFkcBRUXqkbKn9eUyZw1fxQcFPWmwhJXlLRPT1qB5pj9Bil0Czv6LMDPFNgGMzRvj3aBpzK8rs8Ih6/wDXEGeRw1E5fcG5kMArIZGDsQbaNmJpjiLEhliROg6H1S2vfi4nvJ7ROh9tthAJKculaDAwBpSa5M4vm1zV573kxiaQpad4Sa816Pd+iqH8jpTWfc8y+XHgC2F60MR8DhmAJTLA5gXEOuTCgWS7i22cdaBSQuOMinNFnUWIfE+TgnKfGPDyVWE9BH62G1qSCw/neTDqcoGu8SLkbh42hq73IuHmcwf+ezfQ1S+LwMK/RMLzfwlFX+RAh7XUtQS8yV/6ym7a8RNmDSj+wsgRI/KENrh3hLVPIsbakDUZLMNwBkYPAGzaSOeuwuyzshPsi0EIr81H63CHKTweavG6oLRnq5WJtQP0gtXIqXxoTOwZZ2JiJjUjbBUJdWCdYt513wqgaxAydLPvC6a4nidvVlUjZf8chRNNyJwSzBjGZzi+LjrDlibQSyjYxGDwIIIarlPVxmofoU9ZI2+oMLVamB1PHzc7WnAT0en5cftQOqVyJUqxClw2Qy3CkfIgeowwb73EoLzsGadu/3mDXAjLCIUp/Ic0KrpRngK/B+PXcwczaP2LDmzyk7PYwYZTAAnqbVhdan7p0RaWKDa1DA4AuJfYS6ENAwp3vuo8e+xw/LCEEKKqGQd6fmavXxDbv0bcg== 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)(1800799015)(41320700004)(376005)(52116005)(366007)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?f78cseih2SuEaZobUn9T6jNgi5Ra?= =?utf-8?q?DtJLIblRhK84WpdYJscJjJVtN39lUgntKEIg1zoCoI5UN5FgyoheNDSurEe7cC5QU?= =?utf-8?q?OOEbsydKP0XB+1g6OKJDPhse+EgkaRmzTS5E/IIoUvwETHdLuxjQdL0idkSfxVyeR?= =?utf-8?q?+lBtEqyjsOpv+CuwtOeze+BmrOE/+IkEXmHd/adgTlZWhvbV54zlgVmhHqExRnEig?= =?utf-8?q?Tfaei+sBdPzqoQc/raGMA142o6R/m9+buiZSMzaHTD7ZmPDD23psmetzxdYPXXXhR?= =?utf-8?q?Wo9cSU27XPhYp1nFRn2yLAy+afzrWiqSFTF6rx/u+kteIn0EVchCmuJWLqE5uVx64?= =?utf-8?q?q5/f+OR1GGiUEq56dBOossw6kesxwpcBLUv5vqSsba20m4P3wlsprqDFbVnTfh2GP?= =?utf-8?q?w5oQNKw5bgzxA/5xEK7IG7vd5c5RnTPL1nG2bIghNYFhDJ05yrKlPRkWzydfbUL9W?= =?utf-8?q?9u0abeRW4rbi2tmArthUt77xPhNj548iJGoKDmFkCKphkPSeFdqz3lDv02puGIGwA?= =?utf-8?q?konMZFjEFQS8VwgkJAJSSUi+sNOuubOOUZYZIXgJYM8wRil6uZ82nd/BdWrcSoRd+?= =?utf-8?q?kBWIHNX03Aa0T8o456GfphYxHV3TF3Q84SKxHcVV8+F6M4tJP9TSdfU6gtx4t2gL0?= =?utf-8?q?Q5BCBMqS1s71XK3A+DrLFbG+nbBUvN6rblGev7pvsxRDPCThZzYOBKZKea9m+y2bf?= =?utf-8?q?90ri/FAVt3P/CS19JyawinwW8l+oahifdKkh4wz2cgwXAPFednRiJdCtMtwSFvtYB?= =?utf-8?q?3B4mQtWrbCiXXzC15utxIMOZc3nMY+E67MHStbSXJq8yC+/MFJf84w/e3if5MzD6Q?= =?utf-8?q?X+BqS10Me+3shcnRq8sT8yIPqxdJeF2eCtymMNSJUd4D3AqeqPsgXr8N3d8OgWKuj?= =?utf-8?q?OI5nJ6tYEDImvXu8fs+n/p59cwSIBLwh3mYaDvBB4xIdYip70aLRTVy9mrmz1cOfi?= =?utf-8?q?Y0R0wsi+1O1q7EvvYbbeSTVpVXmXc2T49FwtxUNjiakFSgO1NPvVDjh1PjmOjQhJW?= =?utf-8?q?qIcslm3EpGUguGQuqJyrh5No8zRZej8hIZC1thBxgNoqr1TWoe45Poxtbf5IknyTo?= =?utf-8?q?GiWDwOcMIBqj//pGVYuh4Pl1Ze7gi7sqAszyuSzzcHa28IDaCHbqroeau0I6vT0ui?= =?utf-8?q?BXA0rahYW6/8rJ40oK/FLaxbvNBZ6svshtBpKelb7b91K/MX5/+1LU8DWnXWDjnu/?= =?utf-8?q?PEw2F31+QZ9S56+AO+oguQNJe+SOjJ1YA05+piWhdxALTVWSmuPnnMslTf6Lb6+Q2?= =?utf-8?q?ketdgrQWR4pDNL31tMXI8R6VF5Tpd+yHPhn5Dhkj+9g2B/IN3GUXdaZ9x5xppSgoJ?= =?utf-8?q?690d3LLIqJurSg2ZDq5ve8+cuFQI1dO6gjBBKnKX953oEUPuiAWgsRWQL2iDCtOy8?= =?utf-8?q?50qEkI+fI1M61wkvT95NmE2rdhn8MAQCfQCk6oZDnfazC8YNDIj9Dg6ICqHtKI2BG?= =?utf-8?q?v/K6AK9FJKk7HoVESi1sNJdnOMMyKyw1oHO3ve+dmCRivNkd+ZqZcWLiUK7EK/V2X?= =?utf-8?q?nLh/JCoJdWmvKeg3sitkHNpKqhMP3yQevw=3D=3D?= X-OriginatorOrg: supcom.tn X-MS-Exchange-CrossTenant-Network-Message-Id: 4cb6d456-aeac-40e3-cf10-08dc5ff12c9d X-MS-Exchange-CrossTenant-AuthSource: AM0PR0402MB3905.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 21:47:42.1561 (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: sYgCM3yJaNezXALknHXGin78XS2I1GCk0THVatigxM2J+IG24AgzRpStNcC+jBmQVd0Bexrz69HGxZhJZZvcCbXKdyKEmkXNP0TmHJhNoQY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB7092 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..ae7b43c5d 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; @@ -3721,6 +3726,7 @@ static ssize_t throttle_thermal_policy_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { + u8 max_mode = throttle_thermal_policy_max_mode(asus); struct asus_wmi *asus = dev_get_drvdata(dev); u8 new_mode; int result; @@ -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