| Message ID | 20240926092952.1284435-10-luke@ljones.dev (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | platform/x86: introduce asus-armoury driver | expand |
On 9/26/2024 04:29, Luke D. Jones wrote: > With the existence of the asus-bioscfg 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 <luke@ljones.dev> I have some very minor nits below. With them fixed: Reviewed-by: Mario Limonciello <mario.limonciello@amd.com> > --- > .../ABI/testing/sysfs-platform-asus-wmi | 17 +++ > drivers/platform/x86/Kconfig | 9 ++ > drivers/platform/x86/asus-wmi.c | 134 ++++++++++++++---- > 3 files changed, 130 insertions(+), 30 deletions(-) > > diff --git a/Documentation/ABI/testing/sysfs-platform-asus-wmi b/Documentation/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" <luke@ljones.dev> > 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" <luke@ljones.dev> > 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" <luke@ljones.dev> > 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: > > @@ -95,6 +98,7 @@ Date: Aug 2022 > KernelVersion: 5.17 > Contact: "Luke Jones" <luke@ljones.dev> > 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" <luke@ljones.dev> > 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" <luke@ljones.dev> > 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" <luke@ljones.dev> > 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" <luke@ljones.dev> > Description: > + DEPRECATED, WILL BE REMOVED SOON > List the available mini-led modes. > > What: /sys/devices/platform/<platform>/ppt_pl1_spl > @@ -140,6 +148,7 @@ Date: Jun 2023 > KernelVersion: 6.5 > Contact: "Luke Jones" <luke@ljones.dev> > 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: > > @@ -150,6 +159,7 @@ Date: Jun 2023 > KernelVersion: 6.5 > Contact: "Luke Jones" <luke@ljones.dev> > 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: > > @@ -160,6 +170,7 @@ Date: Jun 2023 > KernelVersion: 6.5 > Contact: "Luke Jones" <luke@ljones.dev> > Description: > + DEPRECATED, WILL BE REMOVED SOON > Set the Fast Package Power Tracking Limit of CPU. AMD+Nvidia only: > * min=5, max=250 > > @@ -168,6 +179,7 @@ Date: Jun 2023 > KernelVersion: 6.5 > Contact: "Luke Jones" <luke@ljones.dev> > Description: > + DEPRECATED, WILL BE REMOVED SOON > Set the APU SPPT limit. Shown on full AMD systems only: > * min=5, max=130 > > @@ -176,6 +188,7 @@ Date: Jun 2023 > KernelVersion: 6.5 > Contact: "Luke Jones" <luke@ljones.dev> > Description: > + DEPRECATED, WILL BE REMOVED SOON > Set the platform SPPT limit. Shown on full AMD systems only: > * min=5, max=130 > > @@ -184,6 +197,7 @@ Date: Jun 2023 > KernelVersion: 6.5 > Contact: "Luke Jones" <luke@ljones.dev> > Description: > + DEPRECATED, WILL BE REMOVED SOON > Set the dynamic boost limit of the Nvidia dGPU: > * min=5, max=25 > > @@ -192,6 +206,7 @@ Date: Jun 2023 > KernelVersion: 6.5 > Contact: "Luke Jones" <luke@ljones.dev> > Description: > + DEPRECATED, WILL BE REMOVED SOON > Set the target temperature limit of the Nvidia dGPU: > * min=75, max=87 > > @@ -200,6 +215,7 @@ Date: Apr 2024 > KernelVersion: 6.10 > Contact: "Luke Jones" <luke@ljones.dev> > 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" <luke@ljones.dev> > 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 dedf66e0d099..baa36413f6ed 100644 > --- a/drivers/platform/x86/Kconfig > +++ b/drivers/platform/x86/Kconfig > @@ -300,6 +300,15 @@ config ASUS_WMI > To compile this driver as a module, choose M here: the module will > be called asus-wmi. > > +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 new asus-armoury driver which Don't use the word "new" in a description. > + hasthe same attributes, but more, and better features. has the > + > 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-wmi.c > index 0a5221d65130..f553c0b33da7 100644 > --- a/drivers/platform/x86/asus-wmi.c > +++ b/drivers/platform/x86/asus-wmi.c > @@ -289,11 +289,12 @@ struct asus_wmi { > u8 fan_boost_mode_mask; > u8 fan_boost_mode; > > + > + /* Tunables provided by ASUS for gaming laptops */ > + #if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) Typically I would avoid indending the #if and #else. > bool egpu_enable_available; > bool dgpu_disable_available; > u32 gpu_mux_dev; > - > - /* Tunables provided by ASUS for gaming laptops */ > u32 ppt_pl2_sppt; > u32 ppt_pl1_spl; > u32 ppt_apu_sppt; > @@ -301,6 +302,9 @@ struct asus_wmi { > u32 ppt_fppt; > u32 nv_dynamic_boost; > u32 nv_temp_target; > + bool panel_overdrive_available; > + u32 mini_led_dev_id; > + #endif Typically I would avoid indending the #if and #else. > > u32 kbd_rgb_dev; > bool kbd_rgb_state_available; > @@ -319,9 +323,6 @@ struct asus_wmi { > // The RSOC controls the maximum charging percentage. > bool battery_rsoc_available; > > - bool panel_overdrive_available; > - u32 mini_led_dev_id; > - > struct hotplug_slot hotplug_slot; > struct mutex hotplug_lock; > struct mutex wmi_lock; > @@ -335,6 +336,15 @@ struct asus_wmi { > struct asus_wmi_driver *driver; > }; > > +#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 " > + "is deprecated and will be removed in a future release. Please " > + "switch over to /sys/class/firmware_attributes.\n"); > +} > +#endif > + > /* WMI ************************************************************************/ > > static int asus_wmi_evaluate_method3(u32 method_id, > @@ -732,6 +742,7 @@ static void asus_wmi_tablet_mode_get_state(struct asus_wmi *asus) > } > > /* Charging mode, 1=Barrel, 2=USB ******************************************/ > +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) > static ssize_t charge_mode_show(struct device *dev, > struct device_attribute *attr, char *buf) > { > @@ -742,12 +753,16 @@ static ssize_t charge_mode_show(struct device *dev, > if (result < 0) > return result; > > + asus_wmi_show_deprecated(); > + > return sysfs_emit(buf, "%d\n", value & 0xff); > } > > static DEVICE_ATTR_RO(charge_mode); > +#endif > > /* dGPU ********************************************************************/ > +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) > static ssize_t dgpu_disable_show(struct device *dev, > struct device_attribute *attr, char *buf) > { > @@ -758,6 +773,8 @@ static ssize_t dgpu_disable_show(struct device *dev, > if (result < 0) > return result; > > + asus_wmi_show_deprecated(); > + > return sysfs_emit(buf, "%d\n", result); > } > > @@ -811,8 +828,10 @@ static ssize_t dgpu_disable_store(struct device *dev, > return count; > } > static DEVICE_ATTR_RW(dgpu_disable); > +#endif > > /* eGPU ********************************************************************/ > +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) > static ssize_t egpu_enable_show(struct device *dev, > struct device_attribute *attr, char *buf) > { > @@ -823,6 +842,8 @@ static ssize_t egpu_enable_show(struct device *dev, > if (result < 0) > return result; > > + asus_wmi_show_deprecated(); > + > return sysfs_emit(buf, "%d\n", result); > } > > @@ -879,8 +900,10 @@ static ssize_t egpu_enable_store(struct device *dev, > return count; > } > static DEVICE_ATTR_RW(egpu_enable); > +#endif > > /* 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) > { > @@ -891,12 +914,16 @@ static ssize_t egpu_connected_show(struct device *dev, > if (result < 0) > return result; > > + asus_wmi_show_deprecated(); > + > return sysfs_emit(buf, "%d\n", result); > } > > static DEVICE_ATTR_RO(egpu_connected); > +#endif > > /* 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) > { > @@ -907,6 +934,8 @@ static ssize_t gpu_mux_mode_show(struct device *dev, > if (result < 0) > return result; > > + asus_wmi_show_deprecated(); > + > return sysfs_emit(buf, "%d\n", result); > } > > @@ -965,6 +994,7 @@ static ssize_t gpu_mux_mode_store(struct device *dev, > return count; > } > static DEVICE_ATTR_RW(gpu_mux_mode); > +#endif > > /* TUF Laptop Keyboard RGB Modes **********************************************/ > static ssize_t kbd_rgb_mode_store(struct device *dev, > @@ -1088,6 +1118,7 @@ static const struct attribute_group *kbd_rgb_mode_groups[] = { > }; > > /* Tunable: PPT: Intel=PL1, AMD=SPPT *****************************************/ > +#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) > @@ -1126,6 +1157,8 @@ static ssize_t ppt_pl2_sppt_show(struct device *dev, > { > struct asus_wmi *asus = dev_get_drvdata(dev); > > + asus_wmi_show_deprecated(); > + > return sysfs_emit(buf, "%u\n", asus->ppt_pl2_sppt); > } > static DEVICE_ATTR_RW(ppt_pl2_sppt); > @@ -1168,6 +1201,8 @@ static ssize_t ppt_pl1_spl_show(struct device *dev, > { > struct asus_wmi *asus = dev_get_drvdata(dev); > > + asus_wmi_show_deprecated(); > + > return sysfs_emit(buf, "%u\n", asus->ppt_pl1_spl); > } > static DEVICE_ATTR_RW(ppt_pl1_spl); > @@ -1211,6 +1246,8 @@ static ssize_t ppt_fppt_show(struct device *dev, > { > struct asus_wmi *asus = dev_get_drvdata(dev); > > + asus_wmi_show_deprecated(); > + > return sysfs_emit(buf, "%u\n", asus->ppt_fppt); > } > static DEVICE_ATTR_RW(ppt_fppt); > @@ -1254,6 +1291,8 @@ static ssize_t ppt_apu_sppt_show(struct device *dev, > { > struct asus_wmi *asus = dev_get_drvdata(dev); > > + asus_wmi_show_deprecated(); > + > return sysfs_emit(buf, "%u\n", asus->ppt_apu_sppt); > } > static DEVICE_ATTR_RW(ppt_apu_sppt); > @@ -1297,6 +1336,8 @@ static ssize_t ppt_platform_sppt_show(struct device *dev, > { > struct asus_wmi *asus = dev_get_drvdata(dev); > > + asus_wmi_show_deprecated(); > + > return sysfs_emit(buf, "%u\n", asus->ppt_platform_sppt); > } > static DEVICE_ATTR_RW(ppt_platform_sppt); > @@ -1340,6 +1381,8 @@ static ssize_t nv_dynamic_boost_show(struct device *dev, > { > struct asus_wmi *asus = dev_get_drvdata(dev); > > + asus_wmi_show_deprecated(); > + > return sysfs_emit(buf, "%u\n", asus->nv_dynamic_boost); > } > static DEVICE_ATTR_RW(nv_dynamic_boost); > @@ -1383,11 +1426,15 @@ static ssize_t nv_temp_target_show(struct device *dev, > { > struct asus_wmi *asus = dev_get_drvdata(dev); > > + asus_wmi_show_deprecated(); > + > return sysfs_emit(buf, "%u\n", asus->nv_temp_target); > } > static DEVICE_ATTR_RW(nv_temp_target); > +#endif > > /* Ally MCU Powersave ********************************************************/ > +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) > static ssize_t mcu_powersave_show(struct device *dev, > struct device_attribute *attr, char *buf) > { > @@ -1398,6 +1445,8 @@ static ssize_t mcu_powersave_show(struct device *dev, > if (result < 0) > return result; > > + asus_wmi_show_deprecated(); > + > return sysfs_emit(buf, "%d\n", result); > } > > @@ -1433,6 +1482,7 @@ static ssize_t mcu_powersave_store(struct device *dev, > return count; > } > static DEVICE_ATTR_RW(mcu_powersave); > +#endif > > /* Battery ********************************************************************/ > > @@ -2306,6 +2356,7 @@ static int asus_wmi_rfkill_init(struct asus_wmi *asus) > } > > /* 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) > { > @@ -2316,6 +2367,8 @@ static ssize_t panel_od_show(struct device *dev, > if (result < 0) > return result; > > + asus_wmi_show_deprecated(); > + > return sysfs_emit(buf, "%d\n", result); > } > > @@ -2352,9 +2405,10 @@ static ssize_t panel_od_store(struct device *dev, > return count; > } > static DEVICE_ATTR_RW(panel_od); > +#endif > > /* 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) > { > @@ -2365,6 +2419,8 @@ static ssize_t boot_sound_show(struct device *dev, > if (result < 0) > return result; > > + asus_wmi_show_deprecated(); > + > return sysfs_emit(buf, "%d\n", result); > } > > @@ -2400,8 +2456,10 @@ static ssize_t boot_sound_store(struct device *dev, > return count; > } > static DEVICE_ATTR_RW(boot_sound); > +#endif > > /* 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) > { > @@ -2432,6 +2490,8 @@ static ssize_t mini_led_mode_show(struct device *dev, > } > } > > + asus_wmi_show_deprecated(); > + > return sysfs_emit(buf, "%d\n", value); > } > > @@ -2502,10 +2562,13 @@ static ssize_t available_mini_led_mode_show(struct device *dev, > return sysfs_emit(buf, "0 1 2\n"); > } > > + asus_wmi_show_deprecated(); > + > return sysfs_emit(buf, "0\n"); > } > > static DEVICE_ATTR_RO(available_mini_led_mode); > +#endif > > /* Quirks *********************************************************************/ > > @@ -3804,6 +3867,7 @@ static int throttle_thermal_policy_switch_next(struct asus_wmi *asus) > return 0; > } > > +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) > static ssize_t throttle_thermal_policy_show(struct device *dev, > struct device_attribute *attr, char *buf) > { > @@ -3847,6 +3911,7 @@ static ssize_t throttle_thermal_policy_store(struct device *dev, > * Throttle thermal policy: 0 - default, 1 - overboost, 2 - silent > */ > static DEVICE_ATTR_RW(throttle_thermal_policy); > +#endif > > /* Platform profile ***********************************************************/ > static int asus_wmi_platform_profile_to_vivo(struct asus_wmi *asus, int mode) > @@ -4474,27 +4539,29 @@ static struct attribute *platform_attributes[] = { > &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 > NULL > }; > > @@ -4516,7 +4583,11 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj, > devid = ASUS_WMI_DEVID_LID_RESUME; > else if (attr == &dev_attr_als_enable.attr) > devid = ASUS_WMI_DEVID_ALS_ENABLE; > - else if (attr == &dev_attr_charge_mode.attr) > + else if (attr == &dev_attr_fan_boost_mode.attr) > + ok = asus->fan_boost_mode_available; > + > + #if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) > + if (attr == &dev_attr_charge_mode.attr) > devid = ASUS_WMI_DEVID_CHARGE_MODE; > else if (attr == &dev_attr_egpu_enable.attr) > ok = asus->egpu_enable_available; > @@ -4554,6 +4625,7 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj, > ok = asus->mini_led_dev_id != 0; > else if (attr == &dev_attr_available_mini_led_mode.attr) > ok = asus->mini_led_dev_id != 0; > + #endif > > if (devid != -1) { > ok = !(asus_wmi_get_devstate_simple(asus, devid) < 0); > @@ -4794,6 +4866,7 @@ static int asus_wmi_add(struct platform_device *pdev) > goto fail_platform; > > /* ensure defaults for tunables */ > + #if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) > asus->ppt_pl2_sppt = 5; > asus->ppt_pl1_spl = 5; > asus->ppt_apu_sppt = 5; > @@ -4818,16 +4891,17 @@ static int asus_wmi_add(struct platform_device *pdev) > else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_GPU_MUX_VIVO)) > asus->gpu_mux_dev = ASUS_WMI_DEVID_GPU_MUX_VIVO; > > - if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE)) > - asus->kbd_rgb_dev = ASUS_WMI_DEVID_TUF_RGB_MODE; > - else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE2)) > - asus->kbd_rgb_dev = ASUS_WMI_DEVID_TUF_RGB_MODE2; > - > + #endif /* CONFIG_ASUS_WMI_DEPRECATED_ATTRS */ > 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; > > + if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE)) > + asus->kbd_rgb_dev = ASUS_WMI_DEVID_TUF_RGB_MODE; > + else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE2)) > + asus->kbd_rgb_dev = ASUS_WMI_DEVID_TUF_RGB_MODE2; > + > err = fan_boost_mode_check_present(asus); > if (err) > goto fail_fan_boost_mode;
On Fri, 27 Sep 2024, at 2:56 AM, Mario Limonciello wrote: > On 9/26/2024 04:29, Luke D. Jones wrote: > > With the existence of the asus-bioscfg 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 Damn I thought I had changed this commit message. Neds to mention `asus-armoury`. > > of removing them fully in the next LTS cycle. > > > > Signed-off-by: Luke D. Jones <luke@ljones.dev> > > I have some very minor nits below. With them fixed: > > Reviewed-by: Mario Limonciello <mario.limonciello@amd.com> Thank you. > > --- > > .../ABI/testing/sysfs-platform-asus-wmi | 17 +++ > > drivers/platform/x86/Kconfig | 9 ++ > > drivers/platform/x86/asus-wmi.c | 134 ++++++++++++++---- > > 3 files changed, 130 insertions(+), 30 deletions(-) > > > > diff --git a/Documentation/ABI/testing/sysfs-platform-asus-wmi b/Documentation/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" <luke@ljones.dev> > > 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" <luke@ljones.dev> > > 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" <luke@ljones.dev> > > 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: > > > > @@ -95,6 +98,7 @@ Date: Aug 2022 > > KernelVersion: 5.17 > > Contact: "Luke Jones" <luke@ljones.dev> > > 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" <luke@ljones.dev> > > 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" <luke@ljones.dev> > > 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" <luke@ljones.dev> > > 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" <luke@ljones.dev> > > Description: > > + DEPRECATED, WILL BE REMOVED SOON > > List the available mini-led modes. > > > > What: /sys/devices/platform/<platform>/ppt_pl1_spl > > @@ -140,6 +148,7 @@ Date: Jun 2023 > > KernelVersion: 6.5 > > Contact: "Luke Jones" <luke@ljones.dev> > > 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: > > > > @@ -150,6 +159,7 @@ Date: Jun 2023 > > KernelVersion: 6.5 > > Contact: "Luke Jones" <luke@ljones.dev> > > 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: > > > > @@ -160,6 +170,7 @@ Date: Jun 2023 > > KernelVersion: 6.5 > > Contact: "Luke Jones" <luke@ljones.dev> > > Description: > > + DEPRECATED, WILL BE REMOVED SOON > > Set the Fast Package Power Tracking Limit of CPU. AMD+Nvidia only: > > * min=5, max=250 > > > > @@ -168,6 +179,7 @@ Date: Jun 2023 > > KernelVersion: 6.5 > > Contact: "Luke Jones" <luke@ljones.dev> > > Description: > > + DEPRECATED, WILL BE REMOVED SOON > > Set the APU SPPT limit. Shown on full AMD systems only: > > * min=5, max=130 > > > > @@ -176,6 +188,7 @@ Date: Jun 2023 > > KernelVersion: 6.5 > > Contact: "Luke Jones" <luke@ljones.dev> > > Description: > > + DEPRECATED, WILL BE REMOVED SOON > > Set the platform SPPT limit. Shown on full AMD systems only: > > * min=5, max=130 > > > > @@ -184,6 +197,7 @@ Date: Jun 2023 > > KernelVersion: 6.5 > > Contact: "Luke Jones" <luke@ljones.dev> > > Description: > > + DEPRECATED, WILL BE REMOVED SOON > > Set the dynamic boost limit of the Nvidia dGPU: > > * min=5, max=25 > > > > @@ -192,6 +206,7 @@ Date: Jun 2023 > > KernelVersion: 6.5 > > Contact: "Luke Jones" <luke@ljones.dev> > > Description: > > + DEPRECATED, WILL BE REMOVED SOON > > Set the target temperature limit of the Nvidia dGPU: > > * min=75, max=87 > > > > @@ -200,6 +215,7 @@ Date: Apr 2024 > > KernelVersion: 6.10 > > Contact: "Luke Jones" <luke@ljones.dev> > > 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" <luke@ljones.dev> > > 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 dedf66e0d099..baa36413f6ed 100644 > > --- a/drivers/platform/x86/Kconfig > > +++ b/drivers/platform/x86/Kconfig > > @@ -300,6 +300,15 @@ config ASUS_WMI > > To compile this driver as a module, choose M here: the module will > > be called asus-wmi. > > > > +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 new asus-armoury driver which > > Don't use the word "new" in a description. > > > + hasthe same attributes, but more, and better features. > > has the > > > + > > 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-wmi.c > > index 0a5221d65130..f553c0b33da7 100644 > > --- a/drivers/platform/x86/asus-wmi.c > > +++ b/drivers/platform/x86/asus-wmi.c > > @@ -289,11 +289,12 @@ struct asus_wmi { > > u8 fan_boost_mode_mask; > > u8 fan_boost_mode; > > > > + > > + /* Tunables provided by ASUS for gaming laptops */ > > + #if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) > > Typically I would avoid indending the #if and #else. Ack, changed. Will add missing match comment on the endif too. > > > bool egpu_enable_available; > > bool dgpu_disable_available; > > u32 gpu_mux_dev; > > - > > - /* Tunables provided by ASUS for gaming laptops */ > > u32 ppt_pl2_sppt; > > u32 ppt_pl1_spl; > > u32 ppt_apu_sppt; > > @@ -301,6 +302,9 @@ struct asus_wmi { > > u32 ppt_fppt; > > u32 nv_dynamic_boost; > > u32 nv_temp_target; > > + bool panel_overdrive_available; > > + u32 mini_led_dev_id; > > + #endif > > Typically I would avoid indending the #if and #else. Ack, same for other locations in source. And added missing match comments to all locations. > > > > u32 kbd_rgb_dev; > > bool kbd_rgb_state_available; > > @@ -319,9 +323,6 @@ struct asus_wmi { > > // The RSOC controls the maximum charging percentage. > > bool battery_rsoc_available; > > > > - bool panel_overdrive_available; > > - u32 mini_led_dev_id; > > - > > struct hotplug_slot hotplug_slot; > > struct mutex hotplug_lock; > > struct mutex wmi_lock; > > @@ -335,6 +336,15 @@ struct asus_wmi { > > struct asus_wmi_driver *driver; > > }; > > > > +#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 " > > + "is deprecated and will be removed in a future release. Please " > > + "switch over to /sys/class/firmware_attributes.\n"); > > +} > > +#endif > > + > > /* WMI ************************************************************************/ > > > > static int asus_wmi_evaluate_method3(u32 method_id, > > @@ -732,6 +742,7 @@ static void asus_wmi_tablet_mode_get_state(struct asus_wmi *asus) > > } > > > > /* Charging mode, 1=Barrel, 2=USB ******************************************/ > > +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) > > static ssize_t charge_mode_show(struct device *dev, > > struct device_attribute *attr, char *buf) > > { > > @@ -742,12 +753,16 @@ static ssize_t charge_mode_show(struct device *dev, > > if (result < 0) > > return result; > > > > + asus_wmi_show_deprecated(); > > + > > return sysfs_emit(buf, "%d\n", value & 0xff); > > } > > > > static DEVICE_ATTR_RO(charge_mode); > > +#endif > > > > /* dGPU ********************************************************************/ > > +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) > > static ssize_t dgpu_disable_show(struct device *dev, > > struct device_attribute *attr, char *buf) > > { > > @@ -758,6 +773,8 @@ static ssize_t dgpu_disable_show(struct device *dev, > > if (result < 0) > > return result; > > > > + asus_wmi_show_deprecated(); > > + > > return sysfs_emit(buf, "%d\n", result); > > } > > > > @@ -811,8 +828,10 @@ static ssize_t dgpu_disable_store(struct device *dev, > > return count; > > } > > static DEVICE_ATTR_RW(dgpu_disable); > > +#endif > > > > /* eGPU ********************************************************************/ > > +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) > > static ssize_t egpu_enable_show(struct device *dev, > > struct device_attribute *attr, char *buf) > > { > > @@ -823,6 +842,8 @@ static ssize_t egpu_enable_show(struct device *dev, > > if (result < 0) > > return result; > > > > + asus_wmi_show_deprecated(); > > + > > return sysfs_emit(buf, "%d\n", result); > > } > > > > @@ -879,8 +900,10 @@ static ssize_t egpu_enable_store(struct device *dev, > > return count; > > } > > static DEVICE_ATTR_RW(egpu_enable); > > +#endif > > > > /* 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) > > { > > @@ -891,12 +914,16 @@ static ssize_t egpu_connected_show(struct device *dev, > > if (result < 0) > > return result; > > > > + asus_wmi_show_deprecated(); > > + > > return sysfs_emit(buf, "%d\n", result); > > } > > > > static DEVICE_ATTR_RO(egpu_connected); > > +#endif > > > > /* 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) > > { > > @@ -907,6 +934,8 @@ static ssize_t gpu_mux_mode_show(struct device *dev, > > if (result < 0) > > return result; > > > > + asus_wmi_show_deprecated(); > > + > > return sysfs_emit(buf, "%d\n", result); > > } > > > > @@ -965,6 +994,7 @@ static ssize_t gpu_mux_mode_store(struct device *dev, > > return count; > > } > > static DEVICE_ATTR_RW(gpu_mux_mode); > > +#endif > > > > /* TUF Laptop Keyboard RGB Modes **********************************************/ > > static ssize_t kbd_rgb_mode_store(struct device *dev, > > @@ -1088,6 +1118,7 @@ static const struct attribute_group *kbd_rgb_mode_groups[] = { > > }; > > > > /* Tunable: PPT: Intel=PL1, AMD=SPPT *****************************************/ > > +#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) > > @@ -1126,6 +1157,8 @@ static ssize_t ppt_pl2_sppt_show(struct device *dev, > > { > > struct asus_wmi *asus = dev_get_drvdata(dev); > > > > + asus_wmi_show_deprecated(); > > + > > return sysfs_emit(buf, "%u\n", asus->ppt_pl2_sppt); > > } > > static DEVICE_ATTR_RW(ppt_pl2_sppt); > > @@ -1168,6 +1201,8 @@ static ssize_t ppt_pl1_spl_show(struct device *dev, > > { > > struct asus_wmi *asus = dev_get_drvdata(dev); > > > > + asus_wmi_show_deprecated(); > > + > > return sysfs_emit(buf, "%u\n", asus->ppt_pl1_spl); > > } > > static DEVICE_ATTR_RW(ppt_pl1_spl); > > @@ -1211,6 +1246,8 @@ static ssize_t ppt_fppt_show(struct device *dev, > > { > > struct asus_wmi *asus = dev_get_drvdata(dev); > > > > + asus_wmi_show_deprecated(); > > + > > return sysfs_emit(buf, "%u\n", asus->ppt_fppt); > > } > > static DEVICE_ATTR_RW(ppt_fppt); > > @@ -1254,6 +1291,8 @@ static ssize_t ppt_apu_sppt_show(struct device *dev, > > { > > struct asus_wmi *asus = dev_get_drvdata(dev); > > > > + asus_wmi_show_deprecated(); > > + > > return sysfs_emit(buf, "%u\n", asus->ppt_apu_sppt); > > } > > static DEVICE_ATTR_RW(ppt_apu_sppt); > > @@ -1297,6 +1336,8 @@ static ssize_t ppt_platform_sppt_show(struct device *dev, > > { > > struct asus_wmi *asus = dev_get_drvdata(dev); > > > > + asus_wmi_show_deprecated(); > > + > > return sysfs_emit(buf, "%u\n", asus->ppt_platform_sppt); > > } > > static DEVICE_ATTR_RW(ppt_platform_sppt); > > @@ -1340,6 +1381,8 @@ static ssize_t nv_dynamic_boost_show(struct device *dev, > > { > > struct asus_wmi *asus = dev_get_drvdata(dev); > > > > + asus_wmi_show_deprecated(); > > + > > return sysfs_emit(buf, "%u\n", asus->nv_dynamic_boost); > > } > > static DEVICE_ATTR_RW(nv_dynamic_boost); > > @@ -1383,11 +1426,15 @@ static ssize_t nv_temp_target_show(struct device *dev, > > { > > struct asus_wmi *asus = dev_get_drvdata(dev); > > > > + asus_wmi_show_deprecated(); > > + > > return sysfs_emit(buf, "%u\n", asus->nv_temp_target); > > } > > static DEVICE_ATTR_RW(nv_temp_target); > > +#endif > > > > /* Ally MCU Powersave ********************************************************/ > > +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) > > static ssize_t mcu_powersave_show(struct device *dev, > > struct device_attribute *attr, char *buf) > > { > > @@ -1398,6 +1445,8 @@ static ssize_t mcu_powersave_show(struct device *dev, > > if (result < 0) > > return result; > > > > + asus_wmi_show_deprecated(); > > + > > return sysfs_emit(buf, "%d\n", result); > > } > > > > @@ -1433,6 +1482,7 @@ static ssize_t mcu_powersave_store(struct device *dev, > > return count; > > } > > static DEVICE_ATTR_RW(mcu_powersave); > > +#endif > > > > /* Battery ********************************************************************/ > > > > @@ -2306,6 +2356,7 @@ static int asus_wmi_rfkill_init(struct asus_wmi *asus) > > } > > > > /* 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) > > { > > @@ -2316,6 +2367,8 @@ static ssize_t panel_od_show(struct device *dev, > > if (result < 0) > > return result; > > > > + asus_wmi_show_deprecated(); > > + > > return sysfs_emit(buf, "%d\n", result); > > } > > > > @@ -2352,9 +2405,10 @@ static ssize_t panel_od_store(struct device *dev, > > return count; > > } > > static DEVICE_ATTR_RW(panel_od); > > +#endif > > > > /* 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) > > { > > @@ -2365,6 +2419,8 @@ static ssize_t boot_sound_show(struct device *dev, > > if (result < 0) > > return result; > > > > + asus_wmi_show_deprecated(); > > + > > return sysfs_emit(buf, "%d\n", result); > > } > > > > @@ -2400,8 +2456,10 @@ static ssize_t boot_sound_store(struct device *dev, > > return count; > > } > > static DEVICE_ATTR_RW(boot_sound); > > +#endif > > > > /* 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) > > { > > @@ -2432,6 +2490,8 @@ static ssize_t mini_led_mode_show(struct device *dev, > > } > > } > > > > + asus_wmi_show_deprecated(); > > + > > return sysfs_emit(buf, "%d\n", value); > > } > > > > @@ -2502,10 +2562,13 @@ static ssize_t available_mini_led_mode_show(struct device *dev, > > return sysfs_emit(buf, "0 1 2\n"); > > } > > > > + asus_wmi_show_deprecated(); > > + > > return sysfs_emit(buf, "0\n"); > > } > > > > static DEVICE_ATTR_RO(available_mini_led_mode); > > +#endif > > > > /* Quirks *********************************************************************/ > > > > @@ -3804,6 +3867,7 @@ static int throttle_thermal_policy_switch_next(struct asus_wmi *asus) > > return 0; > > } > > > > +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) > > static ssize_t throttle_thermal_policy_show(struct device *dev, > > struct device_attribute *attr, char *buf) > > { > > @@ -3847,6 +3911,7 @@ static ssize_t throttle_thermal_policy_store(struct device *dev, > > * Throttle thermal policy: 0 - default, 1 - overboost, 2 - silent > > */ > > static DEVICE_ATTR_RW(throttle_thermal_policy); > > +#endif > > > > /* Platform profile ***********************************************************/ > > static int asus_wmi_platform_profile_to_vivo(struct asus_wmi *asus, int mode) > > @@ -4474,27 +4539,29 @@ static struct attribute *platform_attributes[] = { > > &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 > > NULL > > }; > > > > @@ -4516,7 +4583,11 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj, > > devid = ASUS_WMI_DEVID_LID_RESUME; > > else if (attr == &dev_attr_als_enable.attr) > > devid = ASUS_WMI_DEVID_ALS_ENABLE; > > - else if (attr == &dev_attr_charge_mode.attr) > > + else if (attr == &dev_attr_fan_boost_mode.attr) > > + ok = asus->fan_boost_mode_available; > > + > > + #if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) > > + if (attr == &dev_attr_charge_mode.attr) > > devid = ASUS_WMI_DEVID_CHARGE_MODE; > > else if (attr == &dev_attr_egpu_enable.attr) > > ok = asus->egpu_enable_available; > > @@ -4554,6 +4625,7 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj, > > ok = asus->mini_led_dev_id != 0; > > else if (attr == &dev_attr_available_mini_led_mode.attr) > > ok = asus->mini_led_dev_id != 0; > > + #endif > > > > if (devid != -1) { > > ok = !(asus_wmi_get_devstate_simple(asus, devid) < 0); > > @@ -4794,6 +4866,7 @@ static int asus_wmi_add(struct platform_device *pdev) > > goto fail_platform; > > > > /* ensure defaults for tunables */ > > + #if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) > > asus->ppt_pl2_sppt = 5; > > asus->ppt_pl1_spl = 5; > > asus->ppt_apu_sppt = 5; > > @@ -4818,16 +4891,17 @@ static int asus_wmi_add(struct platform_device *pdev) > > else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_GPU_MUX_VIVO)) > > asus->gpu_mux_dev = ASUS_WMI_DEVID_GPU_MUX_VIVO; > > > > - if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE)) > > - asus->kbd_rgb_dev = ASUS_WMI_DEVID_TUF_RGB_MODE; > > - else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE2)) > > - asus->kbd_rgb_dev = ASUS_WMI_DEVID_TUF_RGB_MODE2; > > - > > + #endif /* CONFIG_ASUS_WMI_DEPRECATED_ATTRS */ > > 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; > > > > + if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE)) > > + asus->kbd_rgb_dev = ASUS_WMI_DEVID_TUF_RGB_MODE; > > + else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE2)) > > + asus->kbd_rgb_dev = ASUS_WMI_DEVID_TUF_RGB_MODE2; > > + > > err = fan_boost_mode_check_present(asus); > > if (err) > > goto fail_fan_boost_mode; > >
diff --git a/Documentation/ABI/testing/sysfs-platform-asus-wmi b/Documentation/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" <luke@ljones.dev> 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" <luke@ljones.dev> 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" <luke@ljones.dev> 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: @@ -95,6 +98,7 @@ Date: Aug 2022 KernelVersion: 5.17 Contact: "Luke Jones" <luke@ljones.dev> 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" <luke@ljones.dev> 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" <luke@ljones.dev> 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" <luke@ljones.dev> 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" <luke@ljones.dev> Description: + DEPRECATED, WILL BE REMOVED SOON List the available mini-led modes. What: /sys/devices/platform/<platform>/ppt_pl1_spl @@ -140,6 +148,7 @@ Date: Jun 2023 KernelVersion: 6.5 Contact: "Luke Jones" <luke@ljones.dev> 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: @@ -150,6 +159,7 @@ Date: Jun 2023 KernelVersion: 6.5 Contact: "Luke Jones" <luke@ljones.dev> 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: @@ -160,6 +170,7 @@ Date: Jun 2023 KernelVersion: 6.5 Contact: "Luke Jones" <luke@ljones.dev> Description: + DEPRECATED, WILL BE REMOVED SOON Set the Fast Package Power Tracking Limit of CPU. AMD+Nvidia only: * min=5, max=250 @@ -168,6 +179,7 @@ Date: Jun 2023 KernelVersion: 6.5 Contact: "Luke Jones" <luke@ljones.dev> Description: + DEPRECATED, WILL BE REMOVED SOON Set the APU SPPT limit. Shown on full AMD systems only: * min=5, max=130 @@ -176,6 +188,7 @@ Date: Jun 2023 KernelVersion: 6.5 Contact: "Luke Jones" <luke@ljones.dev> Description: + DEPRECATED, WILL BE REMOVED SOON Set the platform SPPT limit. Shown on full AMD systems only: * min=5, max=130 @@ -184,6 +197,7 @@ Date: Jun 2023 KernelVersion: 6.5 Contact: "Luke Jones" <luke@ljones.dev> Description: + DEPRECATED, WILL BE REMOVED SOON Set the dynamic boost limit of the Nvidia dGPU: * min=5, max=25 @@ -192,6 +206,7 @@ Date: Jun 2023 KernelVersion: 6.5 Contact: "Luke Jones" <luke@ljones.dev> Description: + DEPRECATED, WILL BE REMOVED SOON Set the target temperature limit of the Nvidia dGPU: * min=75, max=87 @@ -200,6 +215,7 @@ Date: Apr 2024 KernelVersion: 6.10 Contact: "Luke Jones" <luke@ljones.dev> 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" <luke@ljones.dev> 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 dedf66e0d099..baa36413f6ed 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -300,6 +300,15 @@ config ASUS_WMI To compile this driver as a module, choose M here: the module will be called asus-wmi. +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 new asus-armoury driver which + hasthe 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-wmi.c index 0a5221d65130..f553c0b33da7 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -289,11 +289,12 @@ struct asus_wmi { u8 fan_boost_mode_mask; u8 fan_boost_mode; + + /* Tunables provided by ASUS for gaming laptops */ + #if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) bool egpu_enable_available; bool dgpu_disable_available; u32 gpu_mux_dev; - - /* Tunables provided by ASUS for gaming laptops */ u32 ppt_pl2_sppt; u32 ppt_pl1_spl; u32 ppt_apu_sppt; @@ -301,6 +302,9 @@ struct asus_wmi { u32 ppt_fppt; u32 nv_dynamic_boost; u32 nv_temp_target; + bool panel_overdrive_available; + u32 mini_led_dev_id; + #endif u32 kbd_rgb_dev; bool kbd_rgb_state_available; @@ -319,9 +323,6 @@ struct asus_wmi { // The RSOC controls the maximum charging percentage. bool battery_rsoc_available; - bool panel_overdrive_available; - u32 mini_led_dev_id; - struct hotplug_slot hotplug_slot; struct mutex hotplug_lock; struct mutex wmi_lock; @@ -335,6 +336,15 @@ struct asus_wmi { struct asus_wmi_driver *driver; }; +#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 " + "is deprecated and will be removed in a future release. Please " + "switch over to /sys/class/firmware_attributes.\n"); +} +#endif + /* WMI ************************************************************************/ static int asus_wmi_evaluate_method3(u32 method_id, @@ -732,6 +742,7 @@ static void asus_wmi_tablet_mode_get_state(struct asus_wmi *asus) } /* Charging mode, 1=Barrel, 2=USB ******************************************/ +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) static ssize_t charge_mode_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -742,12 +753,16 @@ static ssize_t charge_mode_show(struct device *dev, if (result < 0) return result; + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%d\n", value & 0xff); } static DEVICE_ATTR_RO(charge_mode); +#endif /* dGPU ********************************************************************/ +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) static ssize_t dgpu_disable_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -758,6 +773,8 @@ static ssize_t dgpu_disable_show(struct device *dev, if (result < 0) return result; + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%d\n", result); } @@ -811,8 +828,10 @@ static ssize_t dgpu_disable_store(struct device *dev, return count; } static DEVICE_ATTR_RW(dgpu_disable); +#endif /* eGPU ********************************************************************/ +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) static ssize_t egpu_enable_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -823,6 +842,8 @@ static ssize_t egpu_enable_show(struct device *dev, if (result < 0) return result; + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%d\n", result); } @@ -879,8 +900,10 @@ static ssize_t egpu_enable_store(struct device *dev, return count; } static DEVICE_ATTR_RW(egpu_enable); +#endif /* 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) { @@ -891,12 +914,16 @@ static ssize_t egpu_connected_show(struct device *dev, if (result < 0) return result; + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%d\n", result); } static DEVICE_ATTR_RO(egpu_connected); +#endif /* 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) { @@ -907,6 +934,8 @@ static ssize_t gpu_mux_mode_show(struct device *dev, if (result < 0) return result; + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%d\n", result); } @@ -965,6 +994,7 @@ static ssize_t gpu_mux_mode_store(struct device *dev, return count; } static DEVICE_ATTR_RW(gpu_mux_mode); +#endif /* TUF Laptop Keyboard RGB Modes **********************************************/ static ssize_t kbd_rgb_mode_store(struct device *dev, @@ -1088,6 +1118,7 @@ static const struct attribute_group *kbd_rgb_mode_groups[] = { }; /* Tunable: PPT: Intel=PL1, AMD=SPPT *****************************************/ +#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) @@ -1126,6 +1157,8 @@ static ssize_t ppt_pl2_sppt_show(struct device *dev, { struct asus_wmi *asus = dev_get_drvdata(dev); + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%u\n", asus->ppt_pl2_sppt); } static DEVICE_ATTR_RW(ppt_pl2_sppt); @@ -1168,6 +1201,8 @@ static ssize_t ppt_pl1_spl_show(struct device *dev, { struct asus_wmi *asus = dev_get_drvdata(dev); + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%u\n", asus->ppt_pl1_spl); } static DEVICE_ATTR_RW(ppt_pl1_spl); @@ -1211,6 +1246,8 @@ static ssize_t ppt_fppt_show(struct device *dev, { struct asus_wmi *asus = dev_get_drvdata(dev); + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%u\n", asus->ppt_fppt); } static DEVICE_ATTR_RW(ppt_fppt); @@ -1254,6 +1291,8 @@ static ssize_t ppt_apu_sppt_show(struct device *dev, { struct asus_wmi *asus = dev_get_drvdata(dev); + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%u\n", asus->ppt_apu_sppt); } static DEVICE_ATTR_RW(ppt_apu_sppt); @@ -1297,6 +1336,8 @@ static ssize_t ppt_platform_sppt_show(struct device *dev, { struct asus_wmi *asus = dev_get_drvdata(dev); + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%u\n", asus->ppt_platform_sppt); } static DEVICE_ATTR_RW(ppt_platform_sppt); @@ -1340,6 +1381,8 @@ static ssize_t nv_dynamic_boost_show(struct device *dev, { struct asus_wmi *asus = dev_get_drvdata(dev); + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%u\n", asus->nv_dynamic_boost); } static DEVICE_ATTR_RW(nv_dynamic_boost); @@ -1383,11 +1426,15 @@ static ssize_t nv_temp_target_show(struct device *dev, { struct asus_wmi *asus = dev_get_drvdata(dev); + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%u\n", asus->nv_temp_target); } static DEVICE_ATTR_RW(nv_temp_target); +#endif /* Ally MCU Powersave ********************************************************/ +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) static ssize_t mcu_powersave_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -1398,6 +1445,8 @@ static ssize_t mcu_powersave_show(struct device *dev, if (result < 0) return result; + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%d\n", result); } @@ -1433,6 +1482,7 @@ static ssize_t mcu_powersave_store(struct device *dev, return count; } static DEVICE_ATTR_RW(mcu_powersave); +#endif /* Battery ********************************************************************/ @@ -2306,6 +2356,7 @@ static int asus_wmi_rfkill_init(struct asus_wmi *asus) } /* 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) { @@ -2316,6 +2367,8 @@ static ssize_t panel_od_show(struct device *dev, if (result < 0) return result; + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%d\n", result); } @@ -2352,9 +2405,10 @@ static ssize_t panel_od_store(struct device *dev, return count; } static DEVICE_ATTR_RW(panel_od); +#endif /* 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) { @@ -2365,6 +2419,8 @@ static ssize_t boot_sound_show(struct device *dev, if (result < 0) return result; + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%d\n", result); } @@ -2400,8 +2456,10 @@ static ssize_t boot_sound_store(struct device *dev, return count; } static DEVICE_ATTR_RW(boot_sound); +#endif /* 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) { @@ -2432,6 +2490,8 @@ static ssize_t mini_led_mode_show(struct device *dev, } } + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "%d\n", value); } @@ -2502,10 +2562,13 @@ static ssize_t available_mini_led_mode_show(struct device *dev, return sysfs_emit(buf, "0 1 2\n"); } + asus_wmi_show_deprecated(); + return sysfs_emit(buf, "0\n"); } static DEVICE_ATTR_RO(available_mini_led_mode); +#endif /* Quirks *********************************************************************/ @@ -3804,6 +3867,7 @@ static int throttle_thermal_policy_switch_next(struct asus_wmi *asus) return 0; } +#if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) static ssize_t throttle_thermal_policy_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -3847,6 +3911,7 @@ static ssize_t throttle_thermal_policy_store(struct device *dev, * Throttle thermal policy: 0 - default, 1 - overboost, 2 - silent */ static DEVICE_ATTR_RW(throttle_thermal_policy); +#endif /* Platform profile ***********************************************************/ static int asus_wmi_platform_profile_to_vivo(struct asus_wmi *asus, int mode) @@ -4474,27 +4539,29 @@ static struct attribute *platform_attributes[] = { &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 NULL }; @@ -4516,7 +4583,11 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj, devid = ASUS_WMI_DEVID_LID_RESUME; else if (attr == &dev_attr_als_enable.attr) devid = ASUS_WMI_DEVID_ALS_ENABLE; - else if (attr == &dev_attr_charge_mode.attr) + else if (attr == &dev_attr_fan_boost_mode.attr) + ok = asus->fan_boost_mode_available; + + #if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) + if (attr == &dev_attr_charge_mode.attr) devid = ASUS_WMI_DEVID_CHARGE_MODE; else if (attr == &dev_attr_egpu_enable.attr) ok = asus->egpu_enable_available; @@ -4554,6 +4625,7 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj, ok = asus->mini_led_dev_id != 0; else if (attr == &dev_attr_available_mini_led_mode.attr) ok = asus->mini_led_dev_id != 0; + #endif if (devid != -1) { ok = !(asus_wmi_get_devstate_simple(asus, devid) < 0); @@ -4794,6 +4866,7 @@ static int asus_wmi_add(struct platform_device *pdev) goto fail_platform; /* ensure defaults for tunables */ + #if IS_ENABLED(CONFIG_ASUS_WMI_DEPRECATED_ATTRS) asus->ppt_pl2_sppt = 5; asus->ppt_pl1_spl = 5; asus->ppt_apu_sppt = 5; @@ -4818,16 +4891,17 @@ static int asus_wmi_add(struct platform_device *pdev) else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_GPU_MUX_VIVO)) asus->gpu_mux_dev = ASUS_WMI_DEVID_GPU_MUX_VIVO; - if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE)) - asus->kbd_rgb_dev = ASUS_WMI_DEVID_TUF_RGB_MODE; - else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE2)) - asus->kbd_rgb_dev = ASUS_WMI_DEVID_TUF_RGB_MODE2; - + #endif /* CONFIG_ASUS_WMI_DEPRECATED_ATTRS */ 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; + if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE)) + asus->kbd_rgb_dev = ASUS_WMI_DEVID_TUF_RGB_MODE; + else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE2)) + asus->kbd_rgb_dev = ASUS_WMI_DEVID_TUF_RGB_MODE2; + err = fan_boost_mode_check_present(asus); if (err) goto fail_fan_boost_mode;
With the existence of the asus-bioscfg 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 <luke@ljones.dev> --- .../ABI/testing/sysfs-platform-asus-wmi | 17 +++ drivers/platform/x86/Kconfig | 9 ++ drivers/platform/x86/asus-wmi.c | 134 ++++++++++++++---- 3 files changed, 130 insertions(+), 30 deletions(-)