From nobody Sun Feb 8 23:35:12 2026 Received: from wfout8-smtp.messagingengine.com (wfout8-smtp.messagingengine.com [64.147.123.151]) (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 8B802101E6; Thu, 4 Apr 2024 00:17:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.123.151 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712189848; cv=none; b=cEugow8SJC2LlxcT3sXfuosvpP0dEWyJQrFQoJIgoyjeZ7u61etj95aeWzd5rEFLEqneXtijedNnT4xb0hfzai3+RNVkfm4oXi5IkKrSV+p1LhJv4/BL6c4LKR/Dr26R0m3hQCA1H9OgqEc59yEeL83bdFZC9XKvQmIAaWYDFh4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712189848; c=relaxed/simple; bh=OQWkqujwX4pOe4VnxpdfkQ9g7HrkqxvsVGTNxLtlr0k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=WaGS8JrS29u+LTaEhIiJ9StdcRoBgkVoiqNp+NbVecarKXRb9QVXyzILDGyF0Hu9YpNvL4AvMO9ax0Bjf49yO8iD4feBGG27gbLwIXp3sbAj51RNVr06GgLyO8G3QZlwqkLr439Jni/lUlEa8pJifaqwBIBT7s5vc4L8E52WuKY= 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=LChQDO9Q; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=EMcy/Z9H; arc=none smtp.client-ip=64.147.123.151 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="LChQDO9Q"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="EMcy/Z9H" Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfout.west.internal (Postfix) with ESMTP id 5B8951C000F7; Wed, 3 Apr 2024 20:17:25 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 03 Apr 2024 20:17:25 -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=1712189844; x=1712276244; bh=om3PZj90czUo2IGp6ZEyNddKXfQRlcnve/71xynAn2Q=; b= LChQDO9QnpmrHXXiV7bkU1KuBhSgMdeoMcnAFSGS5gknn7k6QxsDEmZOGUyQPcwO T9lX+vnxGW8DNd4ofDF6qZ+68MroIlblvKJIXWWqJX0q5L9BZtIyIJl2CC7J2/vm e0ZK+t4MpmZZ+zOpI7LV+IRKwfcHMMsjKoLATonfSI1UM+zDKhyY6q7qzJnmcv9O ddHPw+4ily0Ednnv5q2ezoqbkaURtzbiKv5IMK85suENvYehlfWnV/oQ8YK3q0o+ CNnZQOFLkiOSQG0BVCOAZ7PuXOSInXA1t4hBVfQR73qEr8sdr5pszfEmXBbv2NbL joxWCg71yNvdlFr+TESJzA== 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=1712189844; x= 1712276244; bh=om3PZj90czUo2IGp6ZEyNddKXfQRlcnve/71xynAn2Q=; b=E Mcy/Z9HK++eic3gJc7Mkm8ovKPO177k3LcHNj83pe8FQ8uNFTovp7tPzpSoPIwHV vOr0aO9+R8oAJAMXpQv9WjOpCIA5IN712c//AKCcn+teJeZuwdeOkQYFckhr3mth K3MJAfRSaTZMjRFsgg61JGN0Wr/9LctJVCesSKT6T7PAiWoJQ7l7nkvTMoPAM41S jskQsmCbDhDDS2lMsiENHvBMeyX4qUqTlCyl5XTPo7KB8KoNV0x8ihoIpAK8Dm07 859JPdZETjN482K/9wFoG6Hs4ZoJehDOjp6XdhIkziT/3EKdSZcLLzLe6UnIyiKa Qkv76+Z/PUeUkzubIUMgA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrudefjedgfeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomhepfdfnuhhkvgcuffdrucflohhnvghsfdcuoehluhhkvges lhhjohhnvghsrdguvghvqeenucggtffrrghtthgvrhhnpeduudetudehiedvvdevveelhf egkeefffdvfeetuefgveefgffgffeiffeitdelieenucevlhhushhtvghrufhiiigvpedv necurfgrrhgrmhepmhgrihhlfhhrohhmpehluhhkvgeslhhjohhnvghsrdguvghv X-ME-Proxy: Feedback-ID: i5ec1447f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 3 Apr 2024 20:17:22 -0400 (EDT) From: "Luke D. Jones" 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" Subject: [PATCH v4 5/9] platform/x86: asus-wmi: store a min default for ppt options Date: Thu, 4 Apr 2024 13:16:48 +1300 Message-ID: <20240404001652.86207-6-luke@ljones.dev> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240404001652.86207-1-luke@ljones.dev> References: <20240404001652.86207-1-luke@ljones.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Laptops with any of the ppt or nv tunables default to the minimum setting on boot so we can safely assume a stored value is correct. This patch adds storing of those values in the local struct, and enables reading of those values back. To prevent creating a series of byte holes in the struct the "_available" bool is removed and `asus_sysfs_is_visible()` uses the `ASUS_WMI_DEVID_` directly. Reviewed-by: Ilpo J=C3=A4rvinen Signed-off-by: Luke D. Jones --- drivers/platform/x86/asus-wmi.c | 127 +++++++++++++++++++++++++------- 1 file changed, 99 insertions(+), 28 deletions(-) diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wm= i.c index 6c353b8e8da9..f13606fc62e6 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -273,13 +273,13 @@ struct asus_wmi { u32 gpu_mux_dev; =20 /* Tunables provided by ASUS for gaming laptops */ - bool ppt_pl2_sppt_available; - bool ppt_pl1_spl_available; - bool ppt_apu_sppt_available; - bool ppt_plat_sppt_available; - bool ppt_fppt_available; - bool nv_dyn_boost_available; - bool nv_temp_tgt_available; + u32 ppt_pl2_sppt; + u32 ppt_pl1_spl; + u32 ppt_apu_sppt; + u32 ppt_platform_sppt; + u32 ppt_fppt; + u32 nv_dynamic_boost; + u32 nv_temp_target; =20 u32 kbd_rgb_dev; bool kbd_rgb_state_available; @@ -1031,11 +1031,21 @@ static ssize_t ppt_pl2_sppt_store(struct device *de= v, return -EIO; } =20 + asus->ppt_pl2_sppt =3D value; sysfs_notify(&asus->platform_device->dev.kobj, NULL, "ppt_pl2_sppt"); =20 return count; } -static DEVICE_ATTR_WO(ppt_pl2_sppt); + +static ssize_t ppt_pl2_sppt_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct asus_wmi *asus =3D dev_get_drvdata(dev); + + return sysfs_emit(buf, "%u\n", asus->ppt_pl2_sppt); +} +static DEVICE_ATTR_RW(ppt_pl2_sppt); =20 /* Tunable: PPT, Intel=3DPL1, AMD=3DSPL **********************************= ********/ static ssize_t ppt_pl1_spl_store(struct device *dev, @@ -1065,11 +1075,20 @@ static ssize_t ppt_pl1_spl_store(struct device *dev, return -EIO; } =20 + asus->ppt_pl1_spl =3D value; sysfs_notify(&asus->platform_device->dev.kobj, NULL, "ppt_pl1_spl"); =20 return count; } -static DEVICE_ATTR_WO(ppt_pl1_spl); +static ssize_t ppt_pl1_spl_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct asus_wmi *asus =3D dev_get_drvdata(dev); + + return sysfs_emit(buf, "%u\n", asus->ppt_pl1_spl); +} +static DEVICE_ATTR_RW(ppt_pl1_spl); =20 /* Tunable: PPT APU FPPT *************************************************= *****/ static ssize_t ppt_fppt_store(struct device *dev, @@ -1099,11 +1118,21 @@ static ssize_t ppt_fppt_store(struct device *dev, return -EIO; } =20 + asus->ppt_fppt =3D value; sysfs_notify(&asus->platform_device->dev.kobj, NULL, "ppt_fpu_sppt"); =20 return count; } -static DEVICE_ATTR_WO(ppt_fppt); + +static ssize_t ppt_fppt_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct asus_wmi *asus =3D dev_get_drvdata(dev); + + return sysfs_emit(buf, "%u\n", asus->ppt_fppt); +} +static DEVICE_ATTR_RW(ppt_fppt); =20 /* Tunable: PPT APU SPPT *************************************************= ****/ static ssize_t ppt_apu_sppt_store(struct device *dev, @@ -1133,11 +1162,21 @@ static ssize_t ppt_apu_sppt_store(struct device *de= v, return -EIO; } =20 + asus->ppt_apu_sppt =3D value; sysfs_notify(&asus->platform_device->dev.kobj, NULL, "ppt_apu_sppt"); =20 return count; } -static DEVICE_ATTR_WO(ppt_apu_sppt); + +static ssize_t ppt_apu_sppt_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct asus_wmi *asus =3D dev_get_drvdata(dev); + + return sysfs_emit(buf, "%u\n", asus->ppt_apu_sppt); +} +static DEVICE_ATTR_RW(ppt_apu_sppt); =20 /* Tunable: PPT platform SPPT ********************************************= ****/ static ssize_t ppt_platform_sppt_store(struct device *dev, @@ -1167,11 +1206,21 @@ static ssize_t ppt_platform_sppt_store(struct devic= e *dev, return -EIO; } =20 + asus->ppt_platform_sppt =3D value; sysfs_notify(&asus->platform_device->dev.kobj, NULL, "ppt_platform_sppt"); =20 return count; } -static DEVICE_ATTR_WO(ppt_platform_sppt); + +static ssize_t ppt_platform_sppt_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct asus_wmi *asus =3D dev_get_drvdata(dev); + + return sysfs_emit(buf, "%u\n", asus->ppt_platform_sppt); +} +static DEVICE_ATTR_RW(ppt_platform_sppt); =20 /* Tunable: NVIDIA dynamic boost *****************************************= ****/ static ssize_t nv_dynamic_boost_store(struct device *dev, @@ -1201,11 +1250,21 @@ static ssize_t nv_dynamic_boost_store(struct device= *dev, return -EIO; } =20 + asus->nv_dynamic_boost =3D value; sysfs_notify(&asus->platform_device->dev.kobj, NULL, "nv_dynamic_boost"); =20 return count; } -static DEVICE_ATTR_WO(nv_dynamic_boost); + +static ssize_t nv_dynamic_boost_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct asus_wmi *asus =3D dev_get_drvdata(dev); + + return sysfs_emit(buf, "%u\n", asus->nv_dynamic_boost); +} +static DEVICE_ATTR_RW(nv_dynamic_boost); =20 /* Tunable: NVIDIA temperature target ************************************= ****/ static ssize_t nv_temp_target_store(struct device *dev, @@ -1235,11 +1294,21 @@ static ssize_t nv_temp_target_store(struct device *= dev, return -EIO; } =20 + asus->nv_temp_target =3D value; sysfs_notify(&asus->platform_device->dev.kobj, NULL, "nv_temp_target"); =20 return count; } -static DEVICE_ATTR_WO(nv_temp_target); + +static ssize_t nv_temp_target_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct asus_wmi *asus =3D dev_get_drvdata(dev); + + return sysfs_emit(buf, "%u\n", asus->nv_temp_target); +} +static DEVICE_ATTR_RW(nv_temp_target); =20 /* Battery ***************************************************************= *****/ =20 @@ -4295,19 +4364,19 @@ static umode_t asus_sysfs_is_visible(struct kobject= *kobj, else if (attr =3D=3D &dev_attr_throttle_thermal_policy.attr) ok =3D asus->throttle_thermal_policy_available; else if (attr =3D=3D &dev_attr_ppt_pl2_sppt.attr) - ok =3D asus->ppt_pl2_sppt_available; + devid =3D ASUS_WMI_DEVID_PPT_PL2_SPPT; else if (attr =3D=3D &dev_attr_ppt_pl1_spl.attr) - ok =3D asus->ppt_pl1_spl_available; + devid =3D ASUS_WMI_DEVID_PPT_PL1_SPL; else if (attr =3D=3D &dev_attr_ppt_fppt.attr) - ok =3D asus->ppt_fppt_available; + devid =3D ASUS_WMI_DEVID_PPT_FPPT; else if (attr =3D=3D &dev_attr_ppt_apu_sppt.attr) - ok =3D asus->ppt_apu_sppt_available; + devid =3D ASUS_WMI_DEVID_PPT_APU_SPPT; else if (attr =3D=3D &dev_attr_ppt_platform_sppt.attr) - ok =3D asus->ppt_plat_sppt_available; + devid =3D ASUS_WMI_DEVID_PPT_PLAT_SPPT; else if (attr =3D=3D &dev_attr_nv_dynamic_boost.attr) - ok =3D asus->nv_dyn_boost_available; + devid =3D ASUS_WMI_DEVID_NV_DYN_BOOST; else if (attr =3D=3D &dev_attr_nv_temp_target.attr) - ok =3D asus->nv_temp_tgt_available; + devid =3D ASUS_WMI_DEVID_NV_THERM_TARGET; else if (attr =3D=3D &dev_attr_boot_sound.attr) devid =3D ASUS_WMI_DEVID_BOOT_SOUND; else if (attr =3D=3D &dev_attr_panel_od.attr) @@ -4553,18 +4622,20 @@ static int asus_wmi_add(struct platform_device *pde= v) if (err) goto fail_platform; =20 + /* ensure defaults for tunables */ + asus->ppt_pl2_sppt =3D 5; + asus->ppt_pl1_spl =3D 5; + asus->ppt_apu_sppt =3D 5; + asus->ppt_platform_sppt =3D 5; + asus->ppt_fppt =3D 5; + asus->nv_dynamic_boost =3D 5; + asus->nv_temp_target =3D 75; + asus->charge_mode_available =3D asus_wmi_dev_is_present(asus, ASUS_WMI_DE= VID_CHARGE_MODE); asus->egpu_enable_available =3D asus_wmi_dev_is_present(asus, ASUS_WMI_DE= VID_EGPU); asus->egpu_connect_available =3D asus_wmi_dev_is_present(asus, ASUS_WMI_D= EVID_EGPU_CONNECTED); asus->dgpu_disable_available =3D asus_wmi_dev_is_present(asus, ASUS_WMI_D= EVID_DGPU); asus->kbd_rgb_state_available =3D asus_wmi_dev_is_present(asus, ASUS_WMI_= DEVID_TUF_RGB_STATE); - asus->ppt_pl2_sppt_available =3D asus_wmi_dev_is_present(asus, ASUS_WMI_D= EVID_PPT_PL2_SPPT); - asus->ppt_pl1_spl_available =3D asus_wmi_dev_is_present(asus, ASUS_WMI_DE= VID_PPT_PL1_SPL); - asus->ppt_fppt_available =3D asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID= _PPT_FPPT); - asus->ppt_apu_sppt_available =3D asus_wmi_dev_is_present(asus, ASUS_WMI_D= EVID_PPT_APU_SPPT); - asus->ppt_plat_sppt_available =3D asus_wmi_dev_is_present(asus, ASUS_WMI_= DEVID_PPT_PLAT_SPPT); - asus->nv_dyn_boost_available =3D asus_wmi_dev_is_present(asus, ASUS_WMI_D= EVID_NV_DYN_BOOST); - asus->nv_temp_tgt_available =3D asus_wmi_dev_is_present(asus, ASUS_WMI_DE= VID_NV_THERM_TARGET); asus->panel_overdrive_available =3D asus_wmi_dev_is_present(asus, ASUS_WM= I_DEVID_PANEL_OD); asus->ally_mcu_usb_switch =3D acpi_has_method(NULL, ASUS_USB0_PWR_EC0_CSE= E) && dmi_match(DMI_BOARD_NAME, "RC71L"); --=20 2.44.0