From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fout-a7-smtp.messagingengine.com (fout-a7-smtp.messagingengine.com [103.168.172.150]) (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 4DB121A0BE2; Thu, 26 Sep 2024 22:39:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.150 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727390378; cv=none; b=M3UCdjrbk+Xo7daEYHYnNtlWt5lbrF5xuY53YQS7OG+vSkVgc+MQ1ERZ5Hw3dVU78DiP5YRhqdU7Ml3XkCKtEjCkHWsCe/BRlTg3Q2tcyQg7DpuM/q1AYg4jyS4Fb/9OSHBE5w/BiU6cWeyLLwykYGNxyP3UNJpAblhpO9//Abg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727390378; c=relaxed/simple; bh=+ykljCSHW3QRscByGsrWZJpqUKpWjYpC3xONgmw1L9s=; h=MIME-Version:Date:From:To:Cc:Message-Id:In-Reply-To:References: Subject:Content-Type; b=s7bnnjBSZZi+nEaBPcOG54bJOaZgRT7enTVglPLQ9vujh4ypoQGeGwI6lDWx4Sqiem2o94U8tiNGhaLN3Gc7eCzmHc52p7NtrGhwV1C/eTY7Vc+zmaXdnzwW5KQl6GAQNjniUHjEl9WzgOw3rISP1ufZqyCUtDrqJhJ4l99dri4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev; spf=none smtp.mailfrom=ljones.dev; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b=h2Omsi2t; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=ODrL20hf; arc=none smtp.client-ip=103.168.172.150 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=ljones.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b="h2Omsi2t"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="ODrL20hf" Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfout.phl.internal (Postfix) with ESMTP id 550D913803A0; Thu, 26 Sep 2024 18:39:35 -0400 (EDT) Received: from phl-imap-01 ([10.202.2.91]) by phl-compute-08.internal (MEProxy); Thu, 26 Sep 2024 18:39:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ljones.dev; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1727390375; x=1727476775; bh=FA6MM9CLwwJA8p8kGipY96flEDt//OAsMQsZ7b08xpQ=; b= h2Omsi2tCO+nAJbTe4oa92Jui6Ua+F4+ACkxfIIUHvNkQJRNaoMpHDh42X5YvpFI SI2iCDHUXDT2VWTSg6q3K3polJ0uwx0xmfrHqhnBipADGfPcTluXDImJ1hL2/M68 yVLePOdJaGlHMYkqwMCk7iJ+XalSxhaSKAaSg4T5oF7UGMNrZAjvFNmwinmD9+1w 7EpWI/LZV3oXTvg9ZJlqBETkQ1CxqpC288r+I8QjLc0M162oiyjSW2W6kmLWpeMG DCK/qP5BA8liU5dMMFXdOmMPDt+m5M6BaJqToeRj+SyP8yqwhu1uFydfOmDWs/JK h6HGGcTrgyb+H82ODJUXqQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1727390375; x= 1727476775; bh=FA6MM9CLwwJA8p8kGipY96flEDt//OAsMQsZ7b08xpQ=; b=O DrL20hfnQD8RqfKUZnrDszxnClBgBfNOn/PCAB4hN63PnRzRwfaJ+6oldV+w3f0E XAu2oVy0vD99Yupkyw1LKrJrblZL8FO51ZOhNh/dRt2D6VDKrq4GEd44OzTb0FrT jQQv6xUs7nLzmhbB6G8aixJP6ILp4oHqCnELecQGfE5re6xFSxNRyWzkPD+913LX 9yBIUY2KLM1rKiISVgloRq3pUyp6rVTFOTRKxz16H2XVinq2BupEmypk+wlxKWco pvkvP6fpBt6tpaK3XV/8ZXpkJm+kTZVYbtmwUsDcQeYVPapFJSNpaC5GQ2TiZIc+ Dvcw1OFJshs9Dn/nGGV+w== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvddtkedgudduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhepofggfffhvfevkfgjfhfutgfgsehtjeertdertddt necuhfhrohhmpedfnfhukhgvucflohhnvghsfdcuoehluhhkvgeslhhjohhnvghsrdguvg hvqeenucggtffrrghtthgvrhhnpefgieffhedtgffhtedtiedutdefkedvjefgveehhfff vedthfejleegfeffkedvveenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehluhhkvgeslhhjohhnvghsrdguvghvpdhnsggprhgtphhtthhopeel pdhmohguvgepshhmthhpohhuthdprhgtphhtthhopegtohhrvghnthhinhdrtghhrghrhi esghhmrghilhdrtghomhdprhgtphhtthhopegsvghnthhishhssehkvghrnhgvlhdrohhr ghdprhgtphhtthhopehjihhkohhssehkvghrnhgvlhdrohhrghdprhgtphhtthhopehsuh hpvghrmhdusehkvghrnhgvlhdrohhrghdprhgtphhtthhopehilhhpohdrjhgrrhhvihhn vghnsehlihhnuhigrdhinhhtvghlrdgtohhmpdhrtghpthhtohephhguvghgohgvuggvse hrvgguhhgrthdrtghomhdprhgtphhtthhopehlihhnuhigqdhinhhpuhhtsehvghgvrhdr khgvrhhnvghlrdhorhhgpdhrtghpthhtoheplhhinhhugidqkhgvrhhnvghlsehvghgvrh drkhgvrhhnvghlrdhorhhgpdhrtghpthhtohepphhlrghtfhhorhhmqdgurhhivhgvrhdq giekieesvhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i5ec1447f:Fastmail Received: by mailuser.phl.internal (Postfix, from userid 501) id 124463360077; Thu, 26 Sep 2024 18:39:35 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Fri, 27 Sep 2024 10:39:14 +1200 From: "Luke Jones" To: "Mario Limonciello" , linux-kernel@vger.kernel.org Cc: linux-input@vger.kernel.org, "Benjamin Tissoires" , "Jiri Kosina" , platform-driver-x86@vger.kernel.org, =?UTF-8?Q?Ilpo_J=C3=A4rvinen?= , "Hans de Goede" , corentin.chary@gmail.com Message-Id: In-Reply-To: <787e6bf6-6a42-4d21-8a0d-f8d1c1ae47c7@kernel.org> References: <20240926092952.1284435-1-luke@ljones.dev> <20240926092952.1284435-6-luke@ljones.dev> <787e6bf6-6a42-4d21-8a0d-f8d1c1ae47c7@kernel.org> Subject: Re: [PATCH v4 5/9] platform/x86: asus-armoury: add the ppt_* and nv_* tuning knobs Content-Type: text/plain Content-Transfer-Encoding: 7bit On Fri, 27 Sep 2024, at 3:22 AM, Mario Limonciello wrote: > On 9/26/2024 04:29, Luke D. Jones wrote: > > Adds the ppt_* and nv_* tuning knobs that are available via WMI methods > > and adds proper min/max levels plus defaults. > > > > Signed-off-by: Luke D. Jones > > --- > > drivers/platform/x86/asus-armoury.c | 130 ++++++++++++++++++++++++++++ > > drivers/platform/x86/asus-armoury.h | 65 ++++++++++++++ > > 2 files changed, 195 insertions(+) > > > > diff --git a/drivers/platform/x86/asus-armoury.c b/drivers/platform/x86/asus-armoury.c > > index 15eab4d45b81..766f944d0233 100644 > > --- a/drivers/platform/x86/asus-armoury.c > > +++ b/drivers/platform/x86/asus-armoury.c > > @@ -52,12 +52,40 @@ > > #define NVIDIA_TEMP_MIN 75 > > #define NVIDIA_TEMP_MAX 87 > > > > +/* Tunables provided by ASUS for gaming laptops */ > > +struct rog_tunables { > > + u32 cpu_default; > > + u32 cpu_min; > > + u32 cpu_max; > > + > > + u32 platform_default; > > + u32 platform_min; > > + u32 platform_max; > > + > > + u32 ppt_pl1_spl; // cpu > > + u32 ppt_pl2_sppt; // cpu > > + u32 ppt_apu_sppt; // plat > > + u32 ppt_platform_sppt; // plat > > + u32 ppt_fppt; // cpu > > + > > + u32 nv_boost_default; > > + u32 nv_boost_min; > > + u32 nv_boost_max; > > + u32 nv_dynamic_boost; > > + > > + u32 nv_temp_default; > > + u32 nv_temp_min; > > + u32 nv_temp_max; > > + u32 nv_temp_target; > > +}; > > + > > static const struct class *fw_attr_class; > > > > struct asus_armoury_priv { > > struct device *fw_attr_dev; > > struct kset *fw_attr_kset; > > > > + struct rog_tunables *rog_tunables; > > u32 mini_led_dev_id; > > u32 gpu_mux_dev_id; > > > > @@ -421,6 +449,25 @@ 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_ROG_TUNABLE(ppt_pl1_spl, "ppt_pl1_spl", ASUS_WMI_DEVID_PPT_PL1_SPL, cpu_default, > > + cpu_min, cpu_max, 1, "Set the CPU slow package limit"); > > +ATTR_GROUP_ROG_TUNABLE(ppt_pl2_sppt, "ppt_pl2_sppt", ASUS_WMI_DEVID_PPT_PL2_SPPT, cpu_default, > > + cpu_min, cpu_max, 1, "Set the CPU fast package limit"); > > +ATTR_GROUP_ROG_TUNABLE(ppt_apu_sppt, "ppt_apu_sppt", ASUS_WMI_DEVID_PPT_APU_SPPT, > > + platform_default, platform_min, platform_max, 1, > > + "Set the CPU slow package limit"); > > +ATTR_GROUP_ROG_TUNABLE(ppt_platform_sppt, "ppt_platform_sppt", ASUS_WMI_DEVID_PPT_PLAT_SPPT, > > + platform_default, platform_min, platform_max, 1, > > + "Set the CPU slow package limit"); > > +ATTR_GROUP_ROG_TUNABLE(ppt_fppt, "ppt_fppt", ASUS_WMI_DEVID_PPT_FPPT, cpu_default, cpu_min, > > + cpu_max, 1, "Set the CPU slow package limit"); > > +ATTR_GROUP_ROG_TUNABLE(nv_dynamic_boost, "nv_dynamic_boost", ASUS_WMI_DEVID_NV_DYN_BOOST, > > + nv_boost_default, nv_boost_min, nv_boost_max, 1, > > + "Set the Nvidia dynamic boost limit"); > > +ATTR_GROUP_ROG_TUNABLE(nv_temp_target, "nv_temp_target", ASUS_WMI_DEVID_NV_THERM_TARGET, > > + nv_temp_default, nv_boost_min, nv_temp_max, 1, > > + "Set the Nvidia max thermal limit"); > > + > > ATTR_GROUP_ENUM_INT_RO(charge_mode, "charge_mode", ASUS_WMI_DEVID_CHARGE_MODE, "0;1;2", > > "Show the current mode of charging"); > > > > @@ -441,6 +488,14 @@ static const struct asus_attr_group armoury_attr_groups[] = { > > { &egpu_enable_attr_group, ASUS_WMI_DEVID_EGPU }, > > { &dgpu_disable_attr_group, ASUS_WMI_DEVID_DGPU }, > > > > + { &ppt_pl1_spl_attr_group, ASUS_WMI_DEVID_PPT_PL1_SPL }, > > + { &ppt_pl2_sppt_attr_group, ASUS_WMI_DEVID_PPT_PL2_SPPT }, > > + { &ppt_apu_sppt_attr_group, ASUS_WMI_DEVID_PPT_APU_SPPT }, > > + { &ppt_platform_sppt_attr_group, ASUS_WMI_DEVID_PPT_PLAT_SPPT }, > > + { &ppt_fppt_attr_group, ASUS_WMI_DEVID_PPT_FPPT }, > > + { &nv_dynamic_boost_attr_group, ASUS_WMI_DEVID_NV_DYN_BOOST }, > > + { &nv_temp_target_attr_group, ASUS_WMI_DEVID_NV_THERM_TARGET }, > > + > > { &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 }, > > @@ -532,12 +587,87 @@ static int asus_fw_attr_add(void) > > > > /* Init / exit ****************************************************************/ > > > > +/* Set up the min/max and defaults for ROG tunables */ > > +static void init_rog_tunables(struct rog_tunables *rog) > > +{ > > + const char *product; > > + u32 max_boost = NVIDIA_BOOST_MAX; > > + u32 cpu_default = PPT_CPU_LIMIT_DEFAULT; > > + u32 cpu_max = PPT_CPU_LIMIT_MAX; > > + u32 platform_default = PPT_PLATFORM_DEFAULT; > > + u32 platform_max = PPT_PLATFORM_MAX; > > Reverse xmas tree here. Facepalm. Thanks. > > + > > + /* > > + * ASUS product_name contains everything required, e.g, > > + * "ROG Flow X16 GV601VV_GV601VV_00185149B" > > + */ > > + product = dmi_get_system_info(DMI_PRODUCT_NAME); Regarding the below, I think the above will always return somthing. I've never seen a blank product name. Unless this somehow errors? > > It's really too bad there isn't somewhere to programatically get the > correct upper bounds in their API. > > I'm wondering if you want something "like" this: > > if (!product) > pr_notice("Unknown hardware found. Setting safe limits, please report > to get limits corrected\n"); >From actual experience I've seen that if I max *all* of these variables out there are no ill effects. It looked like the internal limits took precedence. But yes I wish there was a way to get the limits out of acpi. ASUS is normally good with this sort of thing but here it seems a bit shortsighted. I will add some logging at least for some parts so there is awareness. > > + > > + if (strstr(product, "GA402R")) { > > + cpu_default = 125; > > + } else if (strstr(product, "13QY")) { > > + cpu_max = 250; > > + } else if (strstr(product, "X13")) { > > + cpu_max = 75; > > + cpu_default = 50; > > + } else if (strstr(product, "RC71") || strstr(product, "RC72")) { > > + cpu_max = 50; > > + cpu_default = 30; > > + } else if (strstr(product, "G814") || strstr(product, "G614") || > > + strstr(product, "G834") || strstr(product, "G634")) { > > + cpu_max = 175; > > + } else if (strstr(product, "GA402X") || strstr(product, "GA403") || > > + strstr(product, "FA507N") || strstr(product, "FA507X") || > > + strstr(product, "FA707N") || strstr(product, "FA707X")) { > > + cpu_max = 90; > > + } Maybe: else { pr_notice("Using default CPU limits. Please report if these are not correct.\n"); } ?? For the below GPU boost limit, I wouldn't bother with similar, as far as I can tell it's not possible to go *over* the internal limit. > > + > > + if (strstr(product, "GZ301ZE")) > > + max_boost = 5; > > + else if (strstr(product, "FX507ZC4")) > > + max_boost = 15; > > + else if (strstr(product, "GU605")) > > + max_boost = 20; > > + > > + /* ensure defaults for tunables */ > > + rog->cpu_default = cpu_default; > > + rog->cpu_min = PPT_CPU_LIMIT_MIN; > > + rog->cpu_max = cpu_max; > > + > > + rog->platform_default = platform_default; > > + rog->platform_max = PPT_PLATFORM_MIN; > > + rog->platform_max = platform_max; > > + > > + rog->ppt_pl1_spl = cpu_default; > > + rog->ppt_pl2_sppt = cpu_default; > > + rog->ppt_apu_sppt = cpu_default; > > + > > + rog->ppt_platform_sppt = platform_default; > > + rog->ppt_fppt = cpu_default; > > + > > + rog->nv_boost_default = NVIDIA_BOOST_MAX; > > + rog->nv_boost_max = NVIDIA_BOOST_MIN; > > + rog->nv_boost_max = max_boost; > > + rog->nv_dynamic_boost = NVIDIA_BOOST_MIN; > > + > > + rog->nv_temp_default = NVIDIA_TEMP_MAX; > > + rog->nv_temp_max = NVIDIA_TEMP_MIN; > > + rog->nv_temp_max = NVIDIA_TEMP_MAX; > > + rog->nv_temp_target = NVIDIA_TEMP_MIN; > > +} > > + > > static int __init asus_fw_init(void) > > { > > int err; > > > > fw_attrs.pending_reboot = false; > > > > + asus_armoury.rog_tunables = kzalloc(sizeof(struct rog_tunables), GFP_KERNEL); > > + if (!asus_armoury.rog_tunables) > > + return -ENOMEM; > > + > > + init_rog_tunables(asus_armoury.rog_tunables); > > + > > err = asus_fw_attr_add(); > > if (err) > > return err; > > diff --git a/drivers/platform/x86/asus-armoury.h b/drivers/platform/x86/asus-armoury.h > > index b99fd136abf1..9e63ea0d9d44 100644 > > --- a/drivers/platform/x86/asus-armoury.h > > +++ b/drivers/platform/x86/asus-armoury.h > > @@ -17,6 +17,12 @@ static ssize_t attr_int_store(struct kobject *kobj, struct kobj_attribute *attr, > > const char *buf, size_t count, u32 min, u32 max, > > u32 *store_value, u32 wmi_dev); > > > > +static ssize_t int_type_show(struct kobject *kobj, struct kobj_attribute *attr, > > + char *buf) > > +{ > > + return sysfs_emit(buf, "integer\n"); > > +} > > + > > static ssize_t enum_type_show(struct kobject *kobj, struct kobj_attribute *attr, > > char *buf) > > { > > @@ -143,4 +149,63 @@ static ssize_t enum_type_show(struct kobject *kobj, struct kobj_attribute *attr, > > .name = _fsname, .attrs = _attrname##_attrs \ > > } > > > > +/* > > + * ROG PPT attributes need a little different in setup as they > > + * require rog_tunables members. > > + */ > > + > > +#define __ROG_TUNABLE_RW(_attr, _min, _max, _wmi) \ > > + static ssize_t _attr##_current_value_store( \ > > + struct kobject *kobj, struct kobj_attribute *attr, \ > > + const char *buf, size_t count) \ > > + { \ > > + return attr_int_store(kobj, attr, buf, count, \ > > + asus_armoury.rog_tunables->_min, \ > > + asus_armoury.rog_tunables->_max, \ > > + &asus_armoury.rog_tunables->_attr, \ > > + _wmi); \ > > + } \ > > + static ssize_t _attr##_current_value_show( \ > > + struct kobject *kobj, struct kobj_attribute *attr, char *buf) \ > > + { \ > > + return sysfs_emit(buf, "%u\n", \ > > + asus_armoury.rog_tunables->_attr); \ > > + } \ > > + static struct kobj_attribute attr_##_attr##_current_value = \ > > + __ASUS_ATTR_RW(_attr, current_value) > > + > > +#define __ROG_TUNABLE_SHOW(_prop, _attrname, _val) \ > > + static ssize_t _attrname##_##_prop##_show( \ > > + struct kobject *kobj, struct kobj_attribute *attr, char *buf) \ > > + { \ > > + return sysfs_emit(buf, "%d\n", \ > > + asus_armoury.rog_tunables->_val); \ > > + } \ > > + static struct kobj_attribute attr_##_attrname##_##_prop = \ > > + __ASUS_ATTR_RO(_attrname, _prop) > > + > > +#define ATTR_GROUP_ROG_TUNABLE(_attrname, _fsname, _wmi, _default, _min, _max, \ > > + _incstep, _dispname) \ > > + __ROG_TUNABLE_SHOW(default_value, _attrname, _default); \ > > + __ROG_TUNABLE_RW(_attrname, _min, _max, _wmi); \ > > + __ROG_TUNABLE_SHOW(min_value, _attrname, _min); \ > > + __ROG_TUNABLE_SHOW(max_value, _attrname, _max); \ > > + __ATTR_SHOW_FMT(scalar_increment, _attrname, "%d\n", _incstep); \ > > + __ATTR_SHOW_FMT(display_name, _attrname, "%s\n", _dispname); \ > > + static struct kobj_attribute attr_##_attrname##_type = \ > > + __ASUS_ATTR_RO_AS(type, int_type_show); \ > > + static struct attribute *_attrname##_attrs[] = { \ > > + &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 = { \ > > + .name = _fsname, .attrs = _attrname##_attrs \ > > + } > > + > > #endif /* _ASUS_BIOSCFG_H_ */ > >