| Message ID | 20240716051612.64842-2-luke@ljones.dev (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | platform/x86: introduce asus-bioscfg | expand |
On Tue, 16 Jul 2024, Luke D. Jones wrote: > The fw_attributes_class provides a much cleaner interface to all of the > attributes introduced to asus-wmi. This patch moves all of these extra > attributes over to fw_attributes_class, and shifts the bulk of these > definitions to a new kernel module to reduce the clutter of asus-wmi > with the intention of deprecating the asus-wmi attributes in future. > > The work applies only to WMI methods which don't have a clearly defined > place within the sysfs and as a result ended up lumped together in > /sys/devices/platform/asus-nb-wmi/ with no standard API. > > Where possible the fw attrs now implement defaults, min, max, scalar, > choices, etc. As en example dgpu_disable becomes: > > /sys/class/firmware-attributes/asus-bioscfg/attributes/dgpu_disable/ > ├── current_value > ├── display_name > ├── possible_values > └── type > > as do other attributes. > > Signed-off-by: Luke D. Jones <luke@ljones.dev> > --- > drivers/platform/x86/Kconfig | 14 + > drivers/platform/x86/Makefile | 1 + > drivers/platform/x86/asus-bioscfg.c | 666 +++++++++++++++++++++ > drivers/platform/x86/asus-bioscfg.h | 243 ++++++++ > drivers/platform/x86/asus-wmi.c | 18 +- > include/linux/platform_data/x86/asus-wmi.h | 11 + > 6 files changed, 952 insertions(+), 1 deletion(-) > create mode 100644 drivers/platform/x86/asus-bioscfg.c > create mode 100644 drivers/platform/x86/asus-bioscfg.h > > diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig > index 665fa9524986..b4a5a5bec7f3 100644 > --- a/drivers/platform/x86/Kconfig > +++ b/drivers/platform/x86/Kconfig > @@ -265,6 +265,18 @@ config ASUS_WIRELESS > If you choose to compile this driver as a module the module will be > called asus-wireless. > > +config ASUS_BIOS > + tristate "ASUS BIOS Driver" > + depends on ACPI_WMI > + depends on ASUS_WMI > + select FW_ATTR_CLASS > + help > + Say Y here if you have a WMI aware Asus laptop and would like to use the > + firmware_attributes API. > + > + To compile this driver as a module, choose M here: the module will > + be called asus-bios. > + > config ASUS_WMI > tristate "ASUS WMI Driver" > depends on ACPI_WMI > @@ -276,6 +288,8 @@ config ASUS_WMI > depends on HOTPLUG_PCI > depends on ACPI_VIDEO || ACPI_VIDEO = n > depends on SERIO_I8042 || SERIO_I8042 = n > + select ASUS_BIOS Selecting user visible configs is not a good idea. Also, there seems to be circular dependency now between ASUS_BIOS & ASUS_WMI ? > + select ASUS_WMI_BIOS > select INPUT_SPARSEKMAP > select LEDS_CLASS > select NEW_LEDS > diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile > index e1b142947067..d9b5b3f3b241 100644 > --- a/drivers/platform/x86/Makefile > +++ b/drivers/platform/x86/Makefile > @@ -32,6 +32,7 @@ obj-$(CONFIG_APPLE_GMUX) += apple-gmux.o > # ASUS > obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o > obj-$(CONFIG_ASUS_WIRELESS) += asus-wireless.o > +obj-$(CONFIG_ASUS_BIOS) += asus-bios.o > obj-$(CONFIG_ASUS_WMI) += asus-wmi.o > obj-$(CONFIG_ASUS_NB_WMI) += asus-nb-wmi.o > obj-$(CONFIG_ASUS_TF103C_DOCK) += asus-tf103c-dock.o > diff --git a/drivers/platform/x86/asus-bioscfg.c b/drivers/platform/x86/asus-bioscfg.c > new file mode 100644 > index 000000000000..0b34e727aab4 > --- /dev/null > +++ b/drivers/platform/x86/asus-bioscfg.c > @@ -0,0 +1,666 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* > + * Asus BIOS attributes driver > + * > + * Copyright(C) 2010 Intel Corporation. > + * Copyright(C) 2024-2024 Luke Jones <luke@ljones.dev> > + */ > + > +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > + > +#include <linux/platform_data/x86/asus-wmi.h> > +#include <linux/errno.h> > +#include <linux/fs.h> > +#include <linux/types.h> > +#include <linux/dmi.h> > +#include <linux/device.h> > +#include <linux/kmod.h> > +#include <linux/kobject.h> > +#include <linux/module.h> > +#include <linux/mutex.h> > +#include <linux/kernel.h> > +#include "asus-bios.h" > +#include "firmware_attributes_class.h" > + > +MODULE_AUTHOR("Luke Jones <luke@ljones.dev>"); > +MODULE_DESCRIPTION("ASUS BIOS Configuration Driver"); > +MODULE_LICENSE("GPL"); The usual place for these is at the end of file > +#define ASUS_NB_WMI_EVENT_GUID "0B3CBB35-E3C2-45ED-91C2-4C5A6D195D1C" > + > +MODULE_ALIAS("wmi:"ASUS_NB_WMI_EVENT_GUID); Ditto. > +#define ASUS_MINI_LED_MODE_MASK 0x03 > +/* Standard modes for devices with only on/off */ > +#define ASUS_MINI_LED_OFF 0x00 > +#define ASUS_MINI_LED_ON 0x01 > +/* New mode on some devices, define here to clarify remapping later */ > +#define ASUS_MINI_LED_STRONG_MODE 0x02 > +/* New modes for devices with 3 mini-led mode types */ > +#define ASUS_MINI_LED_2024_WEAK 0x00 > +#define ASUS_MINI_LED_2024_STRONG 0x01 > +#define ASUS_MINI_LED_2024_OFF 0x02 > + > +/* Default limits for tunables available on ASUS ROG laptops */ > +#define PPT_CPU_LIMIT_MIN 5 > +#define PPT_CPU_LIMIT_MAX 150 > +#define PPT_CPU_LIMIT_DEFAULT 80 > +#define PPT_PLATFORM_MIN 5 > +#define PPT_PLATFORM_MAX 100 > +#define PPT_PLATFORM_DEFAULT 80 > +#define NVIDIA_BOOST_MIN 5 > +#define NVIDIA_BOOST_MAX 25 > +#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_max; > + > + u32 platform_default; > + 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_max; > + u32 nv_dynamic_boost; > + > + u32 nv_temp_default; > + u32 nv_temp_max; > + u32 nv_temp_target; > +}; > + > +static const struct class *fw_attr_class; > + > +struct asus_bios_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; > + bool dgpu_disable_available; > + bool egpu_enable_available; > + > + struct mutex mutex; > +} asus_bioscfg = { > + .mutex = __MUTEX_INITIALIZER(asus_bioscfg.mutex), Don't try to initialize it on the same go like this. You might want static too. > +}; > + > +static struct fw_attrs_group { > + u32 pending_reboot; > +} fw_attrs = { > + .pending_reboot = 0, > +}; Same here. > + > +/* WMI helper methods */ > +static bool asus_wmi_is_present(u32 dev_id) > +{ > + int status = asus_wmi_get_devstate_dsts(dev_id, &retval); > + u32 retval; > + > + pr_debug("%s called (0x%08x), retval: 0x%08x\n", __func__, dev_id, retval); > + > + return status == 0 && (retval & ASUS_WMI_DSTS_PRESENCE_BIT); > +} > + > +static void asus_set_reboot_and_signal_event(void) > +{ > + fw_attrs.pending_reboot = 1; > + kobject_uevent(&asus_bioscfg.fw_attr_dev->kobj, KOBJ_CHANGE); > +} > + > +static ssize_t pending_reboot_show(struct kobject *kobj, > + struct kobj_attribute *attr, > + char *buf) > +{ > + return sysfs_emit(buf, "%d\n", fw_attrs.pending_reboot); %u > +} > + > +static struct kobj_attribute pending_reboot = __ATTR_RO(pending_reboot); > + > +static bool asus_bios_requires_reboot(struct kobj_attribute *attr) > +{ > + return !strcmp(attr->attr.name, "gpu_mux_mode"); > + !strcmp(attr->attr.name, "panel_hd_mode"); ??? Semicolon and && confusion here? > +} > + > +/* > + * Generic store function for use with many ROG tunables > + */ > +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) > +{ > + int result, value; > + > + result = kstrtoint(buf, 10, &value); Is signed value needed, if not, use unsigned variant of kstrto*? > + if (result) > + return result; > + > + if (value < min || value > max) > + return -EINVAL; > + > + asus_wmi_set_devstate(wmi_dev, value, &result); Type confusion, u32 * vs int pointer being passed. > + if (result) { > + pr_err("Failed to set %s: %d\n", attr->attr.name, result); > + return result; > + } > + > + if (result > 1) { What's this supposed to mean given you've the type confusion to begin with and return on the earlier line if result is non-zero? Did you mean to capture the return value of asus_wmi_set_devstate() and test that in the first if ()? If you make a previously internal function such as asus_wmi_set_devstate() EXPORTed, you should document it with kerneldoc so the interface is clear. > + pr_err("Failed to set %s (result): 0x%x\n", attr->attr.name, result); > + return -EIO; > + } > + > + if (store_value != NULL) > + *store_value = value; > + sysfs_notify(kobj, NULL, attr->attr.name); > + > + if (asus_bios_requires_reboot(attr)) > + asus_set_reboot_and_signal_event(); > + > + return count; > +} > + > +/* Mini-LED mode **************************************************************/ > +static ssize_t mini_led_mode_current_value_show(struct kobject *kobj, > + struct kobj_attribute *attr, char *buf) > +{ > + u32 value; > + int err; > + > + err = asus_wmi_get_devstate_dsts(asus_bioscfg.mini_led_dev_id, &value); > + if (err) > + return err; > + > + value = value & ASUS_MINI_LED_MODE_MASK; > + > + /* > + * Remap the mode values to match previous generation mini-led. The last gen > + * WMI 0 == off, while on this version WMI 2 ==off (flipped). > + */ > + if (asus_bioscfg.mini_led_dev_id == ASUS_WMI_DEVID_MINI_LED_MODE2) { > + switch (value) { > + case ASUS_MINI_LED_2024_WEAK: > + value = ASUS_MINI_LED_ON; > + break; > + case ASUS_MINI_LED_2024_STRONG: > + value = ASUS_MINI_LED_STRONG_MODE; > + break; > + case ASUS_MINI_LED_2024_OFF: > + value = ASUS_MINI_LED_OFF; > + break; > + } > + } > + > + return sysfs_emit(buf, "%d\n", value); %u > +} > + > +static ssize_t mini_led_mode_current_value_store(struct kobject *kobj, > + struct kobj_attribute *attr, > + const char *buf, size_t count) > +{ > + int result, err; > + u32 mode; > + > + result = kstrtou32(buf, 10, &mode); > + if (result) > + return result; > + > + if (asus_bioscfg.mini_led_dev_id == ASUS_WMI_DEVID_MINI_LED_MODE && > + mode > ASUS_MINI_LED_ON) > + return -EINVAL; > + if (asus_bioscfg.mini_led_dev_id == ASUS_WMI_DEVID_MINI_LED_MODE2 && > + mode > ASUS_MINI_LED_STRONG_MODE) > + return -EINVAL; > + > + /* > + * Remap the mode values so expected behaviour is the same as the last > + * generation of mini-LED with 0 == off, 1 == on. > + */ > + if (asus_bioscfg.mini_led_dev_id == ASUS_WMI_DEVID_MINI_LED_MODE2) { > + switch (mode) { > + case ASUS_MINI_LED_OFF: > + mode = ASUS_MINI_LED_2024_OFF; > + break; > + case ASUS_MINI_LED_ON: > + mode = ASUS_MINI_LED_2024_WEAK; > + break; > + case ASUS_MINI_LED_STRONG_MODE: > + mode = ASUS_MINI_LED_2024_STRONG; > + break; > + } > + } > + > + err = asus_wmi_set_devstate(asus_bioscfg.mini_led_dev_id, mode, &result); > + if (err) { > + pr_warn("Failed to set mini-LED: %d\n", err); > + return err; > + } > + > + if (result > 1) { > + pr_warn("Failed to set mini-LED mode (result): 0x%x\n", result); > + return -EIO; > + } > + > + sysfs_notify(kobj, NULL, attr->attr.name); > + > + return count; > +} > + > +static ssize_t mini_led_mode_possible_values_show(struct kobject *kobj, > + struct kobj_attribute *attr, char *buf) > +{ > + switch (asus_bioscfg.mini_led_dev_id) { > + case ASUS_WMI_DEVID_MINI_LED_MODE: > + return sysfs_emit(buf, "0;1\n"); > + case ASUS_WMI_DEVID_MINI_LED_MODE2: > + return sysfs_emit(buf, "0;1;2\n"); > + } > + > + return sysfs_emit(buf, "0\n"); > +} > + > +ATTR_GROUP_ENUM_CUSTOM(mini_led_mode, "mini_led_mode", "Set the mini-LED backlight mode"); > + > +static ssize_t gpu_mux_mode_current_value_store(struct kobject *kobj, > + struct kobj_attribute *attr, > + const char *buf, size_t count) > +{ > + int result, err; > + u32 optimus; > + > + err = kstrtou32(buf, 10, &optimus); > + if (err) > + return err; > + > + if (optimus > 1) > + return -EINVAL; > + > + if (asus_bioscfg.dgpu_disable_available) { > + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_DGPU, &result); > + if (err) > + return err; > + if (err && !optimus) { How can err be non-zero at this point??? Did you mean result like below? > + err = -ENODEV; > + pr_warn("Can not switch MUX to dGPU mode when dGPU is disabled: %d\n", err); > + return err; > + } > + } > + > + if (asus_bioscfg.egpu_enable_available) { > + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_EGPU, &result); > + if (err) > + return err; > + if (result && !optimus) { > + err = -ENODEV; > + pr_warn("Can not switch MUX to dGPU mode when eGPU is enabled: %d\n", err); > + return err; > + } > + } > + > + err = asus_wmi_set_devstate(asus_bioscfg.gpu_mux_dev_id, optimus, &result); > + if (err) { > + pr_err("%s Failed to set GPU MUX mode: %d\nn", __func__, err); Never use __func__ for messages shown to normal user. > + return err; > + } > + /* !1 is considered a fail by ASUS */ If the interface is documented with kerneldoc, this is unnecessary comment. Is 0 also a failure (this differs from >1 checks elsewhere)? > + if (result != 1) { > + pr_warn("%s Failed to set GPU MUX mode (result): 0x%x\n", __func__, result); Ditto. > + return -EIO; > + } > + > + sysfs_notify(kobj, NULL, attr->attr.name); > + > + return count; > +} > +WMI_SHOW_INT(gpu_mux_mode_current_value, "%d\n", asus_bioscfg.gpu_mux_dev_id); > +ATTR_GROUP_BOOL_CUSTOM(gpu_mux_mode, "gpu_mux_mode", "Set the GPU display MUX mode"); > + > +/* > + * A user may be required to store the value twice, typcial store first, then > + * rescan PCI bus to activate power, then store a second time to save correctly. > + * The reason for this is that an extra code path in the ACPI is enabled when > + * the device and bus are powered. > + */ > +static ssize_t dgpu_disable_current_value_store(struct kobject *kobj, > + struct kobj_attribute *attr, > + const char *buf, size_t count) > +{ > + int result, err; > + u32 disable; > + > + result = kstrtou32(buf, 10, &disable); > + if (result) > + return result; You're likely shooting yourself into your foot by not having consistency in variable naming. Here you store the return value into "result", whereas you used "err" in the previous function. Try to maintain consistency across the entire driver. > + > + if (disable > 1) > + return -EINVAL; > + > + if (asus_bioscfg.gpu_mux_dev_id) { > + err = asus_wmi_get_devstate_dsts(asus_bioscfg.gpu_mux_dev_id, &result); > + if (err) > + return err; > + if (!result && disable) { > + err = -ENODEV; > + pr_warn("Can not disable dGPU when the MUX is in dGPU mode: %d\n", err); > + return err; > + } > + } > + > + err = asus_wmi_set_devstate(ASUS_WMI_DEVID_DGPU, disable, &result); > + if (err) { > + pr_warn("Failed to set dgpu disable: %d\n", err); > + return err; > + } > + > + if (result > 1) { > + pr_warn("Failed to set dgpu disable (result): 0x%x\n", result); > + return -EIO; > + } > + > + sysfs_notify(kobj, NULL, attr->attr.name); > + > + return count; > +} > +WMI_SHOW_INT(dgpu_disable_current_value, "%d\n", ASUS_WMI_DEVID_DGPU); > +ATTR_GROUP_BOOL_CUSTOM(dgpu_disable, "dgpu_disable", "Disable the dGPU"); > + > +/* The ACPI call to enable the eGPU also disables the internal dGPU */ > +static ssize_t egpu_enable_current_value_store(struct kobject *kobj, > + struct kobj_attribute *attr, > + const char *buf, size_t count) > +{ > + int result, err; > + u32 enable; > + > + err = kstrtou32(buf, 10, &enable); > + if (err) > + return err; > + > + if (enable > 1) > + return -EINVAL; > + > + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_EGPU_CONNECTED, &result); > + if (err) { > + pr_warn("Failed to get egpu connection status: %d\n", err); > + return err; > + } > + > + if (asus_bioscfg.gpu_mux_dev_id) { > + err = asus_wmi_get_devstate_dsts(asus_bioscfg.gpu_mux_dev_id, &result); > + if (err) { > + pr_warn("Failed to get gpu mux status: %d\n", result); > + return result; > + } > + if (!result && enable) { > + err = -ENODEV; > + pr_warn("Can not enable eGPU when the MUX is in dGPU mode: %d\n", err); > + return err; > + } > + } > + > + err = asus_wmi_set_devstate(ASUS_WMI_DEVID_EGPU, enable, &result); > + if (err) { > + pr_warn("Failed to set egpu state: %d\n", err); > + return err; > + } > + > + if (result > 1) { > + pr_warn("Failed to set egpu state (retval): 0x%x\n", result); > + return -EIO; > + } > + > + sysfs_notify(kobj, NULL, attr->attr.name); > + > + return count; > +} > +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_ENUM_INT_RW(thermal_policy, "thermal_policy", ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY, > + 0, 3, "0;1;2", "Set the thermal profile: 0=normal, 1=performance, 2=quiet"); > +ATTR_GROUP_PPT_RW(ppt_pl1_spl, "ppt_pl1_spl", ASUS_WMI_DEVID_PPT_PL1_SPL, > + cpu_default, 5, cpu_max, 1, "Set the CPU slow package limit"); > +ATTR_GROUP_PPT_RW(ppt_pl2_sppt, "ppt_pl2_sppt", ASUS_WMI_DEVID_PPT_PL2_SPPT, > + cpu_default, 5, cpu_max, 1, "Set the CPU fast package limit"); > +ATTR_GROUP_PPT_RW(ppt_apu_sppt, "ppt_apu_sppt", ASUS_WMI_DEVID_PPT_APU_SPPT, > + platform_default, 5, platform_max, 1, "Set the CPU slow package limit"); > +ATTR_GROUP_PPT_RW(ppt_platform_sppt, "ppt_platform_sppt", ASUS_WMI_DEVID_PPT_PLAT_SPPT, > + platform_default, 5, platform_max, 1, "Set the CPU slow package limit"); > +ATTR_GROUP_PPT_RW(ppt_fppt, "ppt_fppt", ASUS_WMI_DEVID_PPT_FPPT, > + cpu_default, 5, cpu_max, 1, "Set the CPU slow package limit"); > + > +ATTR_GROUP_PPT_RW(nv_dynamic_boost, "nv_dynamic_boost", ASUS_WMI_DEVID_NV_DYN_BOOST, > + nv_boost_default, 5, nv_boost_max, 1, "Set the Nvidia dynamic boost limit"); > +ATTR_GROUP_PPT_RW(nv_temp_target, "nv_temp_target", ASUS_WMI_DEVID_NV_THERM_TARGET, > + nv_temp_default, 75, 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"); > +ATTR_GROUP_BOOL_RW(boot_sound, "boot_sound", ASUS_WMI_DEVID_BOOT_SOUND, > + "Set the boot POST sound"); > +ATTR_GROUP_BOOL_RW(mcu_powersave, "mcu_powersave", ASUS_WMI_DEVID_MCU_POWERSAVE, > + "Set MCU powersaving mode"); > +ATTR_GROUP_BOOL_RW(panel_od, "panel_overdrive", ASUS_WMI_DEVID_PANEL_OD, > + "Set the panel refresh overdrive"); > +ATTR_GROUP_BOOL_RW(panel_hd_mode, "panel_hd_mode", ASUS_WMI_DEVID_PANEL_HD, > + "Set the panel HD mode to UHD<0> or FHD<1>"); > +ATTR_GROUP_BOOL_RO(egpu_connected, "egpu_connected", ASUS_WMI_DEVID_EGPU_CONNECTED, > + "Show the eGPU connection status"); > + > +static int asus_fw_attr_add(void) > +{ > + int ret; > + > + ret = fw_attributes_class_get(&fw_attr_class); > + if (ret) > + goto fail_class_created; > + else Unnecessary else since you goto in the if block. > + asus_bioscfg.fw_attr_dev = device_create(fw_attr_class, NULL, > + MKDEV(0, 0), NULL, "%s", DRIVER_NAME); > + > + if (IS_ERR(asus_bioscfg.fw_attr_dev)) { > + ret = PTR_ERR(asus_bioscfg.fw_attr_dev); > + goto fail_class_created; > + } > + > + asus_bioscfg.fw_attr_kset = kset_create_and_add("attributes", NULL, > + &asus_bioscfg.fw_attr_dev->kobj); > + if (!asus_bioscfg.fw_attr_dev) { > + ret = -ENOMEM; > + pr_debug("Failed to create and add attributes\n"); > + goto err_destroy_classdev; > + } > + > + /* Add any firmware_attributes required */ Unnecessary comment. > + ret = sysfs_create_file(&asus_bioscfg.fw_attr_kset->kobj, &pending_reboot.attr); > + if (ret) { > + pr_warn("Failed to create sysfs level attributes\n"); > + goto fail_class_created; > + } > + > + // TODO: logging ?? Logging of what if you intend to keep this message around. > + asus_bioscfg.mini_led_dev_id = 0; > + if (asus_wmi_is_present(ASUS_WMI_DEVID_MINI_LED_MODE)) { > + asus_bioscfg.mini_led_dev_id = ASUS_WMI_DEVID_MINI_LED_MODE; > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &mini_led_mode_attr_group); > + } else if (asus_wmi_is_present(ASUS_WMI_DEVID_MINI_LED_MODE2)) { > + asus_bioscfg.mini_led_dev_id = ASUS_WMI_DEVID_MINI_LED_MODE2; > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &mini_led_mode_attr_group); > + } > + > + if (asus_wmi_is_present(ASUS_WMI_DEVID_GPU_MUX)) { > + asus_bioscfg.gpu_mux_dev_id = ASUS_WMI_DEVID_GPU_MUX; > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &gpu_mux_mode_attr_group); > + } else if (asus_wmi_is_present(ASUS_WMI_DEVID_GPU_MUX_VIVO)) { > + asus_bioscfg.gpu_mux_dev_id = ASUS_WMI_DEVID_GPU_MUX_VIVO; > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &gpu_mux_mode_attr_group); > + } > + > + if (asus_wmi_is_present(ASUS_WMI_DEVID_DGPU)) { > + asus_bioscfg.dgpu_disable_available = true; > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &dgpu_disable_attr_group); > + } > + if (asus_wmi_is_present(ASUS_WMI_DEVID_EGPU)) { > + asus_bioscfg.egpu_enable_available = true; > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &egpu_enable_attr_group); > + } > + if (asus_wmi_is_present(ASUS_WMI_DEVID_EGPU_CONNECTED)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &egpu_connected_attr_group); > + > + if (asus_wmi_is_present(ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &thermal_policy_attr_group); > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_PL1_SPL)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_pl1_spl_attr_group); > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_PL2_SPPT)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_pl2_sppt_attr_group); > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_APU_SPPT)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_apu_sppt_attr_group); > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_PLAT_SPPT)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_platform_sppt_attr_group); > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_FPPT)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_fppt_attr_group); > + > + if (asus_wmi_is_present(ASUS_WMI_DEVID_NV_DYN_BOOST)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &nv_dynamic_boost_attr_group); > + if (asus_wmi_is_present(ASUS_WMI_DEVID_NV_THERM_TARGET)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &nv_temp_target_attr_group); > + > + if (asus_wmi_is_present(ASUS_WMI_DEVID_CHARGE_MODE)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &charge_mode_attr_group); > + if (asus_wmi_is_present(ASUS_WMI_DEVID_BOOT_SOUND)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &boot_sound_attr_group); > + if (asus_wmi_is_present(ASUS_WMI_DEVID_MCU_POWERSAVE)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &mcu_powersave_attr_group); > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PANEL_OD)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &panel_od_attr_group); > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PANEL_HD)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &panel_hd_mode_attr_group); > + > + return 0; > + > +err_destroy_classdev: > + device_destroy(fw_attr_class, MKDEV(0, 0)); > + > +fail_class_created: > + fw_attributes_class_put(); > + return ret; > +} > + > +/* 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; > + > + /* > + * ASUS product_name contains everything required, e.g, > + * "ROG Flow X16 GV601VV_GV601VV_00185149B" > + */ > + product = dmi_get_system_info(DMI_PRODUCT_NAME); > + > + 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")) { > + 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; > + } > + > + 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_max = cpu_max; > + > + rog->platform_default = platform_default; > + 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 = platform_default; > + > + rog->nv_boost_default = NVIDIA_BOOST_MAX; > + 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_MAX; > + rog->nv_temp_target = NVIDIA_TEMP_MIN; > + > +} > + > +static int __init asus_fw_init(void) > +{ > + int err; > + > + mutex_lock(&asus_bioscfg.mutex); > + > + asus_bioscfg.rog_tunables = kzalloc(sizeof(struct rog_tunables), GFP_KERNEL); > + if (!asus_bioscfg.rog_tunables) { > + mutex_unlock(&asus_bioscfg.mutex); > + return -ENOMEM; > + } > + init_rog_tunables(asus_bioscfg.rog_tunables); > + > + err = asus_fw_attr_add(); > + mutex_unlock(&asus_bioscfg.mutex); > + if (err) > + return err; > + > + return 0; > +} > + > +static void __exit asus_fw_exit(void) > +{ > + mutex_lock(&asus_bioscfg.mutex); > + > + sysfs_remove_file(&asus_bioscfg.fw_attr_kset->kobj, &pending_reboot.attr); > + kset_unregister(asus_bioscfg.fw_attr_kset); > + device_destroy(fw_attr_class, MKDEV(0, 0)); > + fw_attributes_class_put(); > + > + mutex_unlock(&asus_bioscfg.mutex); > +} > + > +module_init(asus_fw_init); > +module_exit(asus_fw_exit); > diff --git a/drivers/platform/x86/asus-bioscfg.h b/drivers/platform/x86/asus-bioscfg.h > new file mode 100644 > index 000000000000..403563c25f53 > --- /dev/null > +++ b/drivers/platform/x86/asus-bioscfg.h > @@ -0,0 +1,243 @@ > +/* SPDX-License-Identifier: GPL-2.0 > + * > + * Definitions for kernel modules using asus-bios driver > + * > + * Copyright (c) 2024 Luke Jones <luke@ljones.dev> > + */ > + > +#ifndef _ASUS_BIOSCFG_H_ > +#define _ASUS_BIOSCFG_H_ > + > +#include "firmware_attributes_class.h" > +#include <linux/types.h> > + > +#define DRIVER_NAME "asus-bioscfg" > + > +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) > +{ > + return sysfs_emit(buf, "enumeration\n"); > +} > + > +#define __ASUS_ATTR_RO(_func, _name) { \ > + .attr = { .name = __stringify(_name), .mode = 0444 }, \ > + .show = _func##_##_name##_show, \ > +} > + > +#define __ASUS_ATTR_RO_AS(_name, _show) { \ > + .attr = { .name = __stringify(_name), .mode = 0444 }, \ > + .show = _show, \ > +} > + > +#define __ASUS_ATTR_RW(_func, _name) __ATTR(_name, 0644, \ > + _func##_##_name##_show, _func##_##_name##_store) > + > +#define __WMI_STORE_INT(_attr, _min, _max, _wmi) \ > +static ssize_t _attr##_store(struct kobject *kobj, \ > + struct kobj_attribute *attr, \ > + const char *buf, size_t count) \ > +{ \ > + return attr_int_store(kobj, attr, buf, count, _min, _max, NULL, _wmi); \ > +} > + > +#define WMI_SHOW_INT(_attr, _fmt, _wmi) \ > +static ssize_t _attr##_show(struct kobject *kobj, \ > + struct kobj_attribute *attr, char *buf) \ > +{ \ > + u32 result; \ > + int err; \ > + err = asus_wmi_get_devstate_dsts(_wmi, &result); \ > + if (err) \ > + return err; \ > + return sysfs_emit(buf, _fmt, \ > + result & ~ASUS_WMI_DSTS_PRESENCE_BIT); \ > +} > + > +/* Create functions and attributes for use in other macros or on their own */ > + > +#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, \ > + _min, asus_bioscfg.rog_tunables->_max, \ > + &asus_bioscfg.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_bioscfg.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_bioscfg.rog_tunables->_val);\ > +} \ > +static struct kobj_attribute attr_##_attrname##_##_prop = \ > + __ASUS_ATTR_RO(_attrname, _prop) > + > +#define __ATTR_CURRENT_INT_RO(_attr, _wmi) \ > +WMI_SHOW_INT(_attr##_current_value, "%d\n", _wmi); \ > +static struct kobj_attribute attr_##_attr##_current_value = \ > + __ASUS_ATTR_RO(_attr, current_value) > + > +#define __ATTR_CURRENT_INT_RW(_attr, _minv, _maxv, _wmi) \ > +__WMI_STORE_INT(_attr##_current_value, _minv, _maxv, _wmi); \ > +WMI_SHOW_INT(_attr##_current_value, "%d\n", _wmi); \ > +static struct kobj_attribute attr_##_attr##_current_value = \ > + __ASUS_ATTR_RW(_attr, current_value) > + > +/* Shows a formatted static variable */ > +#define __ATTR_SHOW_FMT(_prop, _attrname, _fmt, _val) \ > +static ssize_t _attrname##_##_prop##_show(struct kobject *kobj, \ > + struct kobj_attribute *attr, char *buf) \ > +{ \ > + return sysfs_emit(buf, _fmt, _val); \ > +} \ > +static struct kobj_attribute attr_##_attrname##_##_prop = \ > + __ASUS_ATTR_RO(_attrname, _prop) > + > +/* Int style min/max range, base macro. Requires current_value show&|store */ > +#define __ATTR_GROUP_INT(_attrname, _fsname, _default, \ > + _min, _max, _incstep, _dispname)\ > +__ATTR_SHOW_FMT(default_value, _attrname, "%d\n", _default); \ > +__ATTR_SHOW_FMT(min_value, _attrname, "%d\n", _min); \ > +__ATTR_SHOW_FMT(max_value, _attrname, "%d\n", _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 \ > +} > + > +/* Boolean style enumeration, base macro. Requires adding show/store */ > +#define __ATTR_GROUP_ENUM(_attrname, _fsname, _possible, _dispname) \ > +__ATTR_SHOW_FMT(display_name, _attrname, "%s\n", _dispname); \ > +__ATTR_SHOW_FMT(possible_values, _attrname, "%s\n", _possible); \ > +static struct kobj_attribute attr_##_attrname##_type = \ > + __ASUS_ATTR_RO_AS(type, enum_type_show); \ > +static struct attribute *_attrname##_attrs[] = { \ > + &attr_##_attrname##_current_value.attr, \ > + &attr_##_attrname##_display_name.attr, \ > + &attr_##_attrname##_possible_values.attr, \ > + &attr_##_attrname##_type.attr, \ > + NULL \ > +}; \ > +static const struct attribute_group _attrname##_attr_group = { \ > + .name = _fsname, \ > + .attrs = _attrname##_attrs \ > +} > + > +#define ATTR_GROUP_BOOL_RO(_attrname, _fsname, _wmi, _dispname) \ > +do { \ > + __ATTR_CURRENT_INT_RO(_attrname, _wmi); \ > + __ATTR_GROUP_ENUM(_attrname, _fsname, "0;1", _dispname);\ > +} while (0) > + > +#define ATTR_GROUP_BOOL_RW(_attrname, _fsname, _wmi, _dispname) \ > +do { \ > + __ATTR_CURRENT_INT_RW(_attrname, 0, 1, _wmi); \ > + __ATTR_GROUP_ENUM(_attrname, _fsname, "0;1", _dispname);\ > +} while (0) > + > +/* > + * Requires <name>_current_value_show(), <name>_current_value_show() > + */ > +#define ATTR_GROUP_BOOL_CUSTOM(_attrname, _fsname, _dispname) \ > +static struct kobj_attribute attr_##_attrname##_current_value = \ > + __ASUS_ATTR_RW(_attrname, current_value); \ > +__ATTR_GROUP_ENUM(_attrname, _fsname, "0;1", _dispname) > + > +#define ATTR_GROUP_ENUM_INT_RO(_attrname, _fsname, _wmi, \ > + _possible, _dispname) \ > +do { \ > + __ATTR_CURRENT_INT_RO(_attrname, _wmi); \ > + __ATTR_GROUP_ENUM(_attrname, _fsname, _possible, _dispname); \ > +} while (0) > + > +#define ATTR_GROUP_ENUM_INT_RW(_attrname, _fsname, _wmi, _min, \ > + _max, _possible, _dispname) \ > +do { \ > + __ATTR_CURRENT_INT_RW(_attrname, _min, _max, _wmi); \ > + __ATTR_GROUP_ENUM(_attrname, _fsname, _possible, _dispname); \ > +} while (0) > + > +/* > + * Requires <name>_current_value_show(), <name>_current_value_show() > + * and <name>_possible_values_show() > + */ > +#define ATTR_GROUP_ENUM_CUSTOM(_attrname, _fsname, _dispname) \ > +__ATTR_SHOW_FMT(display_name, _attrname, "%s\n", _dispname); \ > +static struct kobj_attribute attr_##_attrname##_current_value = \ > + __ASUS_ATTR_RW(_attrname, current_value); \ > +static struct kobj_attribute attr_##_attrname##_possible_values = \ > + __ASUS_ATTR_RO(_attrname, possible_values); \ > +static struct kobj_attribute attr_##_attrname##_type = \ > + __ASUS_ATTR_RO_AS(type, enum_type_show); \ > +static struct attribute *_attrname##_attrs[] = { \ > + &attr_##_attrname##_current_value.attr, \ > + &attr_##_attrname##_display_name.attr, \ > + &attr_##_attrname##_possible_values.attr, \ > + &attr_##_attrname##_type.attr, \ > + NULL \ > +}; \ > +static const struct attribute_group _attrname##_attr_group = { \ > + .name = _fsname, \ > + .attrs = _attrname##_attrs \ > +} > + > +/* ROG PPT attributes need a little different in setup */ > +#define ATTR_GROUP_PPT_RW(_attrname, _fsname, _wmi, _default, \ > + _min, _max, _incstep, _dispname) \ > +__ROG_TUNABLE_RW(_attrname, _min, _max, _wmi); \ > +__ROG_TUNABLE_SHOW(default_value, _attrname, _default); \ > +__ATTR_SHOW_FMT(min_value, _attrname, "%d\n", _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_ */ > diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c > index 2b968003cb9b..3f1998638fea 100644 > --- a/drivers/platform/x86/asus-wmi.c > +++ b/drivers/platform/x86/asus-wmi.c > @@ -529,12 +529,28 @@ static int asus_wmi_get_devstate(struct asus_wmi *asus, u32 dev_id, u32 *retval) > return 0; > } > > -static int asus_wmi_set_devstate(u32 dev_id, u32 ctrl_param, > +int asus_wmi_get_devstate_dsts(u32 dev_id, u32 *retval) > +{ > + int err; > + > + err = asus_wmi_evaluate_method(ASUS_WMI_METHODID_DSTS, dev_id, 0, retval); > + if (err) > + return err; > + > + if (*retval == ~0) > + return -ENODEV; > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(asus_wmi_get_devstate_dsts); > + > +int asus_wmi_set_devstate(u32 dev_id, u32 ctrl_param, > u32 *retval) Should fit to one line just fine. As general feel of the readiness of this code, I suspect there were many more problems which I failed to notice :-(.
Hi Luke, On 7/16/24 7:16 AM, Luke D. Jones wrote: > The fw_attributes_class provides a much cleaner interface to all of the > attributes introduced to asus-wmi. This patch moves all of these extra > attributes over to fw_attributes_class, and shifts the bulk of these > definitions to a new kernel module to reduce the clutter of asus-wmi > with the intention of deprecating the asus-wmi attributes in future. > > The work applies only to WMI methods which don't have a clearly defined > place within the sysfs and as a result ended up lumped together in > /sys/devices/platform/asus-nb-wmi/ with no standard API. > > Where possible the fw attrs now implement defaults, min, max, scalar, > choices, etc. As en example dgpu_disable becomes: > > /sys/class/firmware-attributes/asus-bioscfg/attributes/dgpu_disable/ > ├── current_value > ├── display_name > ├── possible_values > └── type > > as do other attributes. > > Signed-off-by: Luke D. Jones <luke@ljones.dev> Interesting (also see my reply to the cover-letter). Note this is not a full review, just a few small remarks with things which I noticed while taking a quick look. <snip> > +static bool asus_bios_requires_reboot(struct kobj_attribute *attr) > +{ > + return !strcmp(attr->attr.name, "gpu_mux_mode"); > + !strcmp(attr->attr.name, "panel_hd_mode"); > +} The second statement here is never reached, I believe you want a || between the 2 strcmp() calls: static bool asus_bios_requires_reboot(struct kobj_attribute *attr) { return !strcmp(attr->attr.name, "gpu_mux_mode") || !strcmp(attr->attr.name, "panel_hd_mode"); } <snip> > +/* Simple attribute creation */ I think it would be good to do the following for registering these "simple" attributes ... continued below. > +ATTR_GROUP_ENUM_INT_RW(thermal_policy, "thermal_policy", ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY, > + 0, 3, "0;1;2", "Set the thermal profile: 0=normal, 1=performance, 2=quiet"); > +ATTR_GROUP_PPT_RW(ppt_pl2_sppt, "ppt_pl2_sppt", ASUS_WMI_DEVID_PPT_PL2_SPPT, > + cpu_default, 5, cpu_max, 1, "Set the CPU fast package limit"); > +ATTR_GROUP_PPT_RW(ppt_apu_sppt, "ppt_apu_sppt", ASUS_WMI_DEVID_PPT_APU_SPPT, > + platform_default, 5, platform_max, 1, "Set the CPU slow package limit"); > +ATTR_GROUP_PPT_RW(ppt_platform_sppt, "ppt_platform_sppt", ASUS_WMI_DEVID_PPT_PLAT_SPPT, > + platform_default, 5, platform_max, 1, "Set the CPU slow package limit"); > +ATTR_GROUP_PPT_RW(ppt_fppt, "ppt_fppt", ASUS_WMI_DEVID_PPT_FPPT, > + cpu_default, 5, cpu_max, 1, "Set the CPU slow package limit"); > + > +ATTR_GROUP_PPT_RW(nv_dynamic_boost, "nv_dynamic_boost", ASUS_WMI_DEVID_NV_DYN_BOOST, > + nv_boost_default, 5, nv_boost_max, 1, "Set the Nvidia dynamic boost limit"); > +ATTR_GROUP_PPT_RW(nv_temp_target, "nv_temp_target", ASUS_WMI_DEVID_NV_THERM_TARGET, > + nv_temp_default, 75, 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"); > +ATTR_GROUP_BOOL_RW(boot_sound, "boot_sound", ASUS_WMI_DEVID_BOOT_SOUND, > + "Set the boot POST sound"); > +ATTR_GROUP_BOOL_RW(mcu_powersave, "mcu_powersave", ASUS_WMI_DEVID_MCU_POWERSAVE, > + "Set MCU powersaving mode"); > +ATTR_GROUP_BOOL_RW(panel_od, "panel_overdrive", ASUS_WMI_DEVID_PANEL_OD, > + "Set the panel refresh overdrive"); > +ATTR_GROUP_BOOL_RW(panel_hd_mode, "panel_hd_mode", ASUS_WMI_DEVID_PANEL_HD, > + "Set the panel HD mode to UHD<0> or FHD<1>"); > +ATTR_GROUP_BOOL_RO(egpu_connected, "egpu_connected", ASUS_WMI_DEVID_EGPU_CONNECTED, > + "Show the eGPU connection status"); Create an array of simple attribute groups for this entire set of simple attributes: struct asus_attr_group { const struct attribute_group *attr_group; u32 wmi_devid; }; static const struct asus_attr_group simple_attribute_groups[] = { { &thermal_policy_attr_group, ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY }, { &ppt_pl2_sppt_attr_group, ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY }, ... { &egpu_connected_attr_group, ASUS_WMI_DEVID_EGPU_CONNECTED }, }; And then in asus_fw_attr_add() .. continued below: > +static int asus_fw_attr_add(void) > +{ > + int ret; > + > + ret = fw_attributes_class_get(&fw_attr_class); > + if (ret) > + goto fail_class_created; > + else > + asus_bioscfg.fw_attr_dev = device_create(fw_attr_class, NULL, > + MKDEV(0, 0), NULL, "%s", DRIVER_NAME); > + > + if (IS_ERR(asus_bioscfg.fw_attr_dev)) { > + ret = PTR_ERR(asus_bioscfg.fw_attr_dev); > + goto fail_class_created; > + } > + > + asus_bioscfg.fw_attr_kset = kset_create_and_add("attributes", NULL, > + &asus_bioscfg.fw_attr_dev->kobj); > + if (!asus_bioscfg.fw_attr_dev) { > + ret = -ENOMEM; > + pr_debug("Failed to create and add attributes\n"); > + goto err_destroy_classdev; > + } > + > + /* Add any firmware_attributes required */ > + ret = sysfs_create_file(&asus_bioscfg.fw_attr_kset->kobj, &pending_reboot.attr); > + if (ret) { > + pr_warn("Failed to create sysfs level attributes\n"); > + goto fail_class_created; > + } > + > + // TODO: logging > + asus_bioscfg.mini_led_dev_id = 0; > + if (asus_wmi_is_present(ASUS_WMI_DEVID_MINI_LED_MODE)) { > + asus_bioscfg.mini_led_dev_id = ASUS_WMI_DEVID_MINI_LED_MODE; > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &mini_led_mode_attr_group); > + } else if (asus_wmi_is_present(ASUS_WMI_DEVID_MINI_LED_MODE2)) { > + asus_bioscfg.mini_led_dev_id = ASUS_WMI_DEVID_MINI_LED_MODE2; > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &mini_led_mode_attr_group); > + } > + > + if (asus_wmi_is_present(ASUS_WMI_DEVID_GPU_MUX)) { > + asus_bioscfg.gpu_mux_dev_id = ASUS_WMI_DEVID_GPU_MUX; > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &gpu_mux_mode_attr_group); > + } else if (asus_wmi_is_present(ASUS_WMI_DEVID_GPU_MUX_VIVO)) { > + asus_bioscfg.gpu_mux_dev_id = ASUS_WMI_DEVID_GPU_MUX_VIVO; > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &gpu_mux_mode_attr_group); > + } > + > + if (asus_wmi_is_present(ASUS_WMI_DEVID_DGPU)) { > + asus_bioscfg.dgpu_disable_available = true; > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &dgpu_disable_attr_group); > + } > + if (asus_wmi_is_present(ASUS_WMI_DEVID_EGPU)) { > + asus_bioscfg.egpu_enable_available = true; > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &egpu_enable_attr_group); > + } Replace the block starting here and ending ... > + if (asus_wmi_is_present(ASUS_WMI_DEVID_EGPU_CONNECTED)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &egpu_connected_attr_group); > + > + if (asus_wmi_is_present(ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &thermal_policy_attr_group); > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_PL1_SPL)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_pl1_spl_attr_group); > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_PL2_SPPT)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_pl2_sppt_attr_group); > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_APU_SPPT)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_apu_sppt_attr_group); > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_PLAT_SPPT)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_platform_sppt_attr_group); > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_FPPT)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_fppt_attr_group); > + > + if (asus_wmi_is_present(ASUS_WMI_DEVID_NV_DYN_BOOST)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &nv_dynamic_boost_attr_group); > + if (asus_wmi_is_present(ASUS_WMI_DEVID_NV_THERM_TARGET)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &nv_temp_target_attr_group); > + > + if (asus_wmi_is_present(ASUS_WMI_DEVID_CHARGE_MODE)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &charge_mode_attr_group); > + if (asus_wmi_is_present(ASUS_WMI_DEVID_BOOT_SOUND)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &boot_sound_attr_group); > + if (asus_wmi_is_present(ASUS_WMI_DEVID_MCU_POWERSAVE)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &mcu_powersave_attr_group); > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PANEL_OD)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &panel_od_attr_group); > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PANEL_HD)) > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &panel_hd_mode_attr_group); here, with: for (i = 0; i < ARRAY_SIZE(simple_attribute_groups); i++) { if (!asus_wmi_is_present(simple_attribute_groups[i].wmi_devid)) continue; sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, simple_attribute_groups[i].attr_group); pr_dbg("Created sysfs-group for %s\n", simple_attribute_groups[i].attr_group->name); } This will make adding new simple attributes a matter of just: 1. Declaring the new attr using one of the macros 2. Adding it to simple_attribute_groups[] And this also takes care of you logging TODO for simple attributes without needing to add a ton of pr_debug() calls. Regards, Hans
On Tue, 16 Jul 2024, at 9:45 PM, Ilpo Järvinen wrote: > On Tue, 16 Jul 2024, Luke D. Jones wrote: > > > The fw_attributes_class provides a much cleaner interface to all of the > > attributes introduced to asus-wmi. This patch moves all of these extra > > attributes over to fw_attributes_class, and shifts the bulk of these > > definitions to a new kernel module to reduce the clutter of asus-wmi > > with the intention of deprecating the asus-wmi attributes in future. > > > > The work applies only to WMI methods which don't have a clearly defined > > place within the sysfs and as a result ended up lumped together in > > /sys/devices/platform/asus-nb-wmi/ with no standard API. > > > > Where possible the fw attrs now implement defaults, min, max, scalar, > > choices, etc. As en example dgpu_disable becomes: > > > > /sys/class/firmware-attributes/asus-bioscfg/attributes/dgpu_disable/ > > ├── current_value > > ├── display_name > > ├── possible_values > > └── type > > > > as do other attributes. > > > > Signed-off-by: Luke D. Jones <luke@ljones.dev> > > --- > > drivers/platform/x86/Kconfig | 14 + > > drivers/platform/x86/Makefile | 1 + > > drivers/platform/x86/asus-bioscfg.c | 666 +++++++++++++++++++++ > > drivers/platform/x86/asus-bioscfg.h | 243 ++++++++ > > drivers/platform/x86/asus-wmi.c | 18 +- > > include/linux/platform_data/x86/asus-wmi.h | 11 + > > 6 files changed, 952 insertions(+), 1 deletion(-) > > create mode 100644 drivers/platform/x86/asus-bioscfg.c > > create mode 100644 drivers/platform/x86/asus-bioscfg.h > > > > diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig > > index 665fa9524986..b4a5a5bec7f3 100644 > > --- a/drivers/platform/x86/Kconfig > > +++ b/drivers/platform/x86/Kconfig > > @@ -265,6 +265,18 @@ config ASUS_WIRELESS > > If you choose to compile this driver as a module the module will be > > called asus-wireless. > > > > +config ASUS_BIOS > > + tristate "ASUS BIOS Driver" > > + depends on ACPI_WMI > > + depends on ASUS_WMI > > + select FW_ATTR_CLASS > > + help > > + Say Y here if you have a WMI aware Asus laptop and would like to use the > > + firmware_attributes API. > > + > > + To compile this driver as a module, choose M here: the module will > > + be called asus-bios. > > + > > config ASUS_WMI > > tristate "ASUS WMI Driver" > > depends on ACPI_WMI > > @@ -276,6 +288,8 @@ config ASUS_WMI > > depends on HOTPLUG_PCI > > depends on ACPI_VIDEO || ACPI_VIDEO = n > > depends on SERIO_I8042 || SERIO_I8042 = n > > + select ASUS_BIOS > > Selecting user visible configs is not a good idea. Also, there > seems to be circular dependency now between ASUS_BIOS & ASUS_WMI ? Is "selects" the same as "depends"? I did just remove: select ASUS_WMI_BIOS which should not be there at all. ASUS_BIOS does need ASUS_WMI. And I'd like ASUS_BIOS to be selected by defualt, is this not the right way to do that? > > > + select ASUS_WMI_BIOS > > select INPUT_SPARSEKMAP > > select LEDS_CLASS > > select NEW_LEDS > > diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile > > index e1b142947067..d9b5b3f3b241 100644 > > --- a/drivers/platform/x86/Makefile > > +++ b/drivers/platform/x86/Makefile > > @@ -32,6 +32,7 @@ obj-$(CONFIG_APPLE_GMUX) += apple-gmux.o > > # ASUS > > obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o > > obj-$(CONFIG_ASUS_WIRELESS) += asus-wireless.o > > +obj-$(CONFIG_ASUS_BIOS) += asus-bios.o > > obj-$(CONFIG_ASUS_WMI) += asus-wmi.o > > obj-$(CONFIG_ASUS_NB_WMI) += asus-nb-wmi.o > > obj-$(CONFIG_ASUS_TF103C_DOCK) += asus-tf103c-dock.o > > diff --git a/drivers/platform/x86/asus-bioscfg.c b/drivers/platform/x86/asus-bioscfg.c > > new file mode 100644 > > index 000000000000..0b34e727aab4 > > --- /dev/null > > +++ b/drivers/platform/x86/asus-bioscfg.c > > @@ -0,0 +1,666 @@ > > +// SPDX-License-Identifier: GPL-2.0-or-later > > +/* > > + * Asus BIOS attributes driver > > + * > > + * Copyright(C) 2010 Intel Corporation. > > + * Copyright(C) 2024-2024 Luke Jones <luke@ljones.dev> > > + */ > > + > > +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > + > > +#include <linux/platform_data/x86/asus-wmi.h> > > +#include <linux/errno.h> > > +#include <linux/fs.h> > > +#include <linux/types.h> > > +#include <linux/dmi.h> > > +#include <linux/device.h> > > +#include <linux/kmod.h> > > +#include <linux/kobject.h> > > +#include <linux/module.h> > > +#include <linux/mutex.h> > > +#include <linux/kernel.h> > > +#include "asus-bios.h" > > +#include "firmware_attributes_class.h" > > + > > +MODULE_AUTHOR("Luke Jones <luke@ljones.dev>"); > > +MODULE_DESCRIPTION("ASUS BIOS Configuration Driver"); > > +MODULE_LICENSE("GPL"); > > The usual place for these is at the end of file Thanks. There is quite a mix of top/bottom for this. As I was going by other code examples the convention I ended up on is top. I'll move to bottom if that is where they really are supposed to be. > > > +#define ASUS_NB_WMI_EVENT_GUID "0B3CBB35-E3C2-45ED-91C2-4C5A6D195D1C" > > + > > +MODULE_ALIAS("wmi:"ASUS_NB_WMI_EVENT_GUID); > > Ditto. Ack > > > +#define ASUS_MINI_LED_MODE_MASK 0x03 > > +/* Standard modes for devices with only on/off */ > > +#define ASUS_MINI_LED_OFF 0x00 > > +#define ASUS_MINI_LED_ON 0x01 > > +/* New mode on some devices, define here to clarify remapping later */ > > +#define ASUS_MINI_LED_STRONG_MODE 0x02 > > +/* New modes for devices with 3 mini-led mode types */ > > +#define ASUS_MINI_LED_2024_WEAK 0x00 > > +#define ASUS_MINI_LED_2024_STRONG 0x01 > > +#define ASUS_MINI_LED_2024_OFF 0x02 > > + > > +/* Default limits for tunables available on ASUS ROG laptops */ > > +#define PPT_CPU_LIMIT_MIN 5 > > +#define PPT_CPU_LIMIT_MAX 150 > > +#define PPT_CPU_LIMIT_DEFAULT 80 > > +#define PPT_PLATFORM_MIN 5 > > +#define PPT_PLATFORM_MAX 100 > > +#define PPT_PLATFORM_DEFAULT 80 > > +#define NVIDIA_BOOST_MIN 5 > > +#define NVIDIA_BOOST_MAX 25 > > +#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_max; > > + > > + u32 platform_default; > > + 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_max; > > + u32 nv_dynamic_boost; > > + > > + u32 nv_temp_default; > > + u32 nv_temp_max; > > + u32 nv_temp_target; > > +}; > > + > > +static const struct class *fw_attr_class; > > + > > +struct asus_bios_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; > > + bool dgpu_disable_available; > > + bool egpu_enable_available; > > + > > + struct mutex mutex; > > +} asus_bioscfg = { > > + .mutex = __MUTEX_INITIALIZER(asus_bioscfg.mutex), > > Don't try to initialize it on the same go like this. > > You might want static too. Ack both > > > +}; > > + > > +static struct fw_attrs_group { > > + u32 pending_reboot; > > +} fw_attrs = { > > + .pending_reboot = 0, > > +}; > > Same here. It was probably done like this in code I read as a reference. I'll shift to the module init function. > > > + > > +/* WMI helper methods */ > > +static bool asus_wmi_is_present(u32 dev_id) > > +{ > > + int status = asus_wmi_get_devstate_dsts(dev_id, &retval); > > + u32 retval; > > + > > + pr_debug("%s called (0x%08x), retval: 0x%08x\n", __func__, dev_id, retval); > > + > > + return status == 0 && (retval & ASUS_WMI_DSTS_PRESENCE_BIT); > > +} > > + > > +static void asus_set_reboot_and_signal_event(void) > > +{ > > + fw_attrs.pending_reboot = 1; > > + kobject_uevent(&asus_bioscfg.fw_attr_dev->kobj, KOBJ_CHANGE); > > +} > > + > > +static ssize_t pending_reboot_show(struct kobject *kobj, > > + struct kobj_attribute *attr, > > + char *buf) > > +{ > > + return sysfs_emit(buf, "%d\n", fw_attrs.pending_reboot); > > %u Ack > > +} > > + > > +static struct kobj_attribute pending_reboot = __ATTR_RO(pending_reboot); > > + > > +static bool asus_bios_requires_reboot(struct kobj_attribute *attr) > > +{ > > + return !strcmp(attr->attr.name, "gpu_mux_mode"); > > + !strcmp(attr->attr.name, "panel_hd_mode"); > > ??? > > Semicolon and && confusion here? Yeah i know, bad rebase I didn't catch. > > +} > > + > > +/* > > + * Generic store function for use with many ROG tunables > > + */ > > +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) > > +{ > > + int result, value; > > + > > + result = kstrtoint(buf, 10, &value); > > Is signed value needed, if not, use unsigned variant of kstrto*? Since the min,max,default can only ever be u32.. Yeah. I'll change that. > > > + if (result) > > + return result; > > + > > + if (value < min || value > max) > > + return -EINVAL; > > + > > + asus_wmi_set_devstate(wmi_dev, value, &result); > > Type confusion, u32 * vs int pointer being passed. I miss rust... > > > + if (result) { > > + pr_err("Failed to set %s: %d\n", attr->attr.name, result); > > + return result; > > + } > > + > > + if (result > 1) { > > What's this supposed to mean given you've the type confusion to begin > with and return on the earlier line if result is non-zero? > > Did you mean to capture the return value of asus_wmi_set_devstate() and > test that in the first if ()? Yep.. this whole bit is a mess. I've fixed the type mess, and added a comment to clarify the "if (result > 1) {" (WMI methods return 0 = fail, 1 = success, anything else is error) > If you make a previously internal function such as asus_wmi_set_devstate() > EXPORTed, you should document it with kerneldoc so the interface is clear. I'm not sure how to do this, I'll read up. Also didn't know about it so thanks for the pointer. > > + pr_err("Failed to set %s (result): 0x%x\n", attr->attr.name, result); > > + return -EIO; > > + } > > + > > + if (store_value != NULL) > > + *store_value = value; > > + sysfs_notify(kobj, NULL, attr->attr.name); > > + > > + if (asus_bios_requires_reboot(attr)) > > + asus_set_reboot_and_signal_event(); > > + > > + return count; > > +} > > + > > +/* Mini-LED mode **************************************************************/ > > +static ssize_t mini_led_mode_current_value_show(struct kobject *kobj, > > + struct kobj_attribute *attr, char *buf) > > +{ > > + u32 value; > > + int err; > > + > > + err = asus_wmi_get_devstate_dsts(asus_bioscfg.mini_led_dev_id, &value); > > + if (err) > > + return err; > > + > > + value = value & ASUS_MINI_LED_MODE_MASK; > > + > > + /* > > + * Remap the mode values to match previous generation mini-led. The last gen > > + * WMI 0 == off, while on this version WMI 2 ==off (flipped). > > + */ > > + if (asus_bioscfg.mini_led_dev_id == ASUS_WMI_DEVID_MINI_LED_MODE2) { > > + switch (value) { > > + case ASUS_MINI_LED_2024_WEAK: > > + value = ASUS_MINI_LED_ON; > > + break; > > + case ASUS_MINI_LED_2024_STRONG: > > + value = ASUS_MINI_LED_STRONG_MODE; > > + break; > > + case ASUS_MINI_LED_2024_OFF: > > + value = ASUS_MINI_LED_OFF; > > + break; > > + } > > + } > > + > > + return sysfs_emit(buf, "%d\n", value); > > %u Ack > > > +} > > + > > +static ssize_t mini_led_mode_current_value_store(struct kobject *kobj, > > + struct kobj_attribute *attr, > > + const char *buf, size_t count) > > +{ > > + int result, err; > > + u32 mode; > > + > > + result = kstrtou32(buf, 10, &mode); > > + if (result) > > + return result; > > + > > + if (asus_bioscfg.mini_led_dev_id == ASUS_WMI_DEVID_MINI_LED_MODE && > > + mode > ASUS_MINI_LED_ON) > > + return -EINVAL; > > + if (asus_bioscfg.mini_led_dev_id == ASUS_WMI_DEVID_MINI_LED_MODE2 && > > + mode > ASUS_MINI_LED_STRONG_MODE) > > + return -EINVAL; > > + > > + /* > > + * Remap the mode values so expected behaviour is the same as the last > > + * generation of mini-LED with 0 == off, 1 == on. > > + */ > > + if (asus_bioscfg.mini_led_dev_id == ASUS_WMI_DEVID_MINI_LED_MODE2) { > > + switch (mode) { > > + case ASUS_MINI_LED_OFF: > > + mode = ASUS_MINI_LED_2024_OFF; > > + break; > > + case ASUS_MINI_LED_ON: > > + mode = ASUS_MINI_LED_2024_WEAK; > > + break; > > + case ASUS_MINI_LED_STRONG_MODE: > > + mode = ASUS_MINI_LED_2024_STRONG; > > + break; > > + } > > + } > > + > > + err = asus_wmi_set_devstate(asus_bioscfg.mini_led_dev_id, mode, &result); > > + if (err) { > > + pr_warn("Failed to set mini-LED: %d\n", err); > > + return err; > > + } > > + > > + if (result > 1) { > > + pr_warn("Failed to set mini-LED mode (result): 0x%x\n", result); > > + return -EIO; > > + } > > + > > + sysfs_notify(kobj, NULL, attr->attr.name); > > + > > + return count; > > +} > > + > > +static ssize_t mini_led_mode_possible_values_show(struct kobject *kobj, > > + struct kobj_attribute *attr, char *buf) > > +{ > > + switch (asus_bioscfg.mini_led_dev_id) { > > + case ASUS_WMI_DEVID_MINI_LED_MODE: > > + return sysfs_emit(buf, "0;1\n"); > > + case ASUS_WMI_DEVID_MINI_LED_MODE2: > > + return sysfs_emit(buf, "0;1;2\n"); > > + } > > + > > + return sysfs_emit(buf, "0\n"); > > +} > > + > > +ATTR_GROUP_ENUM_CUSTOM(mini_led_mode, "mini_led_mode", "Set the mini-LED backlight mode"); > > + > > +static ssize_t gpu_mux_mode_current_value_store(struct kobject *kobj, > > + struct kobj_attribute *attr, > > + const char *buf, size_t count) > > +{ > > + int result, err; > > + u32 optimus; > > + > > + err = kstrtou32(buf, 10, &optimus); > > + if (err) > > + return err; > > + > > + if (optimus > 1) > > + return -EINVAL; > > + > > + if (asus_bioscfg.dgpu_disable_available) { > > + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_DGPU, &result); > > + if (err) > > + return err; > > + if (err && !optimus) { > > How can err be non-zero at this point??? Did you mean result like below? Yes. Thank you. > > + err = -ENODEV; > > + pr_warn("Can not switch MUX to dGPU mode when dGPU is disabled: %d\n", err); > > + return err; > > + } > > + } > > + > > + if (asus_bioscfg.egpu_enable_available) { > > + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_EGPU, &result); > > + if (err) > > + return err; > > + if (result && !optimus) { > > + err = -ENODEV; > > + pr_warn("Can not switch MUX to dGPU mode when eGPU is enabled: %d\n", err); > > + return err; > > + } > > + } > > + > > + err = asus_wmi_set_devstate(asus_bioscfg.gpu_mux_dev_id, optimus, &result); > > + if (err) { > > + pr_err("%s Failed to set GPU MUX mode: %d\nn", __func__, err); > > Never use __func__ for messages shown to normal user. Must have been a holdover from debug. Also wasn't aware of that rule, thanks. > > + return err; > > + } > > + /* !1 is considered a fail by ASUS */ > > If the interface is documented with kerneldoc, this is unnecessary > comment. Is 0 also a failure (this differs from >1 checks elsewhere)? I've changed the other checks to match. But I'll also try and do a deeper analysis of those particular WMI functions to see if I can find the actual causes for other returns and their significance (0 and 2). 1 is most definitely success though. > > > + if (result != 1) { > > + pr_warn("%s Failed to set GPU MUX mode (result): 0x%x\n", __func__, result); > > Ditto. Ack > > > + return -EIO; > > + } > > + > > + sysfs_notify(kobj, NULL, attr->attr.name); > > + > > + return count; > > +} > > +WMI_SHOW_INT(gpu_mux_mode_current_value, "%d\n", asus_bioscfg.gpu_mux_dev_id); > > +ATTR_GROUP_BOOL_CUSTOM(gpu_mux_mode, "gpu_mux_mode", "Set the GPU display MUX mode"); > > + > > +/* > > + * A user may be required to store the value twice, typcial store first, then > > + * rescan PCI bus to activate power, then store a second time to save correctly. > > + * The reason for this is that an extra code path in the ACPI is enabled when > > + * the device and bus are powered. > > + */ > > +static ssize_t dgpu_disable_current_value_store(struct kobject *kobj, > > + struct kobj_attribute *attr, > > + const char *buf, size_t count) > > +{ > > + int result, err; > > + u32 disable; > > + > > + result = kstrtou32(buf, 10, &disable); > > + if (result) > > + return result; > > You're likely shooting yourself into your foot by not having consistency > in variable naming. Here you store the return value into "result", whereas > you used "err" in the previous function. Try to maintain consistency > across the entire driver. Brain afk. I better read everything when i'm refreshed. > > > + > > + if (disable > 1) > > + return -EINVAL; > > + > > + if (asus_bioscfg.gpu_mux_dev_id) { > > + err = asus_wmi_get_devstate_dsts(asus_bioscfg.gpu_mux_dev_id, &result); > > + if (err) > > + return err; > > + if (!result && disable) { > > + err = -ENODEV; > > + pr_warn("Can not disable dGPU when the MUX is in dGPU mode: %d\n", err); > > + return err; > > + } > > + } > > + > > + err = asus_wmi_set_devstate(ASUS_WMI_DEVID_DGPU, disable, &result); > > + if (err) { > > + pr_warn("Failed to set dgpu disable: %d\n", err); > > + return err; > > + } > > + > > + if (result > 1) { > > + pr_warn("Failed to set dgpu disable (result): 0x%x\n", result); > > + return -EIO; > > + } > > + > > + sysfs_notify(kobj, NULL, attr->attr.name); > > + > > + return count; > > +} > > +WMI_SHOW_INT(dgpu_disable_current_value, "%d\n", ASUS_WMI_DEVID_DGPU); > > +ATTR_GROUP_BOOL_CUSTOM(dgpu_disable, "dgpu_disable", "Disable the dGPU"); > > + > > +/* The ACPI call to enable the eGPU also disables the internal dGPU */ > > +static ssize_t egpu_enable_current_value_store(struct kobject *kobj, > > + struct kobj_attribute *attr, > > + const char *buf, size_t count) > > +{ > > + int result, err; > > + u32 enable; > > + > > + err = kstrtou32(buf, 10, &enable); > > + if (err) > > + return err; > > + > > + if (enable > 1) > > + return -EINVAL; > > + > > + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_EGPU_CONNECTED, &result); > > + if (err) { > > + pr_warn("Failed to get egpu connection status: %d\n", err); > > + return err; > > + } > > + > > + if (asus_bioscfg.gpu_mux_dev_id) { > > + err = asus_wmi_get_devstate_dsts(asus_bioscfg.gpu_mux_dev_id, &result); > > + if (err) { > > + pr_warn("Failed to get gpu mux status: %d\n", result); > > + return result; > > + } > > + if (!result && enable) { > > + err = -ENODEV; > > + pr_warn("Can not enable eGPU when the MUX is in dGPU mode: %d\n", err); > > + return err; > > + } > > + } > > + > > + err = asus_wmi_set_devstate(ASUS_WMI_DEVID_EGPU, enable, &result); > > + if (err) { > > + pr_warn("Failed to set egpu state: %d\n", err); > > + return err; > > + } > > + > > + if (result > 1) { > > + pr_warn("Failed to set egpu state (retval): 0x%x\n", result); > > + return -EIO; > > + } > > + > > + sysfs_notify(kobj, NULL, attr->attr.name); > > + > > + return count; > > +} > > +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_ENUM_INT_RW(thermal_policy, "thermal_policy", ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY, > > + 0, 3, "0;1;2", "Set the thermal profile: 0=normal, 1=performance, 2=quiet"); > > +ATTR_GROUP_PPT_RW(ppt_pl1_spl, "ppt_pl1_spl", ASUS_WMI_DEVID_PPT_PL1_SPL, > > + cpu_default, 5, cpu_max, 1, "Set the CPU slow package limit"); > > +ATTR_GROUP_PPT_RW(ppt_pl2_sppt, "ppt_pl2_sppt", ASUS_WMI_DEVID_PPT_PL2_SPPT, > > + cpu_default, 5, cpu_max, 1, "Set the CPU fast package limit"); > > +ATTR_GROUP_PPT_RW(ppt_apu_sppt, "ppt_apu_sppt", ASUS_WMI_DEVID_PPT_APU_SPPT, > > + platform_default, 5, platform_max, 1, "Set the CPU slow package limit"); > > +ATTR_GROUP_PPT_RW(ppt_platform_sppt, "ppt_platform_sppt", ASUS_WMI_DEVID_PPT_PLAT_SPPT, > > + platform_default, 5, platform_max, 1, "Set the CPU slow package limit"); > > +ATTR_GROUP_PPT_RW(ppt_fppt, "ppt_fppt", ASUS_WMI_DEVID_PPT_FPPT, > > + cpu_default, 5, cpu_max, 1, "Set the CPU slow package limit"); > > + > > +ATTR_GROUP_PPT_RW(nv_dynamic_boost, "nv_dynamic_boost", ASUS_WMI_DEVID_NV_DYN_BOOST, > > + nv_boost_default, 5, nv_boost_max, 1, "Set the Nvidia dynamic boost limit"); > > +ATTR_GROUP_PPT_RW(nv_temp_target, "nv_temp_target", ASUS_WMI_DEVID_NV_THERM_TARGET, > > + nv_temp_default, 75, 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"); > > +ATTR_GROUP_BOOL_RW(boot_sound, "boot_sound", ASUS_WMI_DEVID_BOOT_SOUND, > > + "Set the boot POST sound"); > > +ATTR_GROUP_BOOL_RW(mcu_powersave, "mcu_powersave", ASUS_WMI_DEVID_MCU_POWERSAVE, > > + "Set MCU powersaving mode"); > > +ATTR_GROUP_BOOL_RW(panel_od, "panel_overdrive", ASUS_WMI_DEVID_PANEL_OD, > > + "Set the panel refresh overdrive"); > > +ATTR_GROUP_BOOL_RW(panel_hd_mode, "panel_hd_mode", ASUS_WMI_DEVID_PANEL_HD, > > + "Set the panel HD mode to UHD<0> or FHD<1>"); > > +ATTR_GROUP_BOOL_RO(egpu_connected, "egpu_connected", ASUS_WMI_DEVID_EGPU_CONNECTED, > > + "Show the eGPU connection status"); > > + > > +static int asus_fw_attr_add(void) > > +{ > > + int ret; > > + > > + ret = fw_attributes_class_get(&fw_attr_class); > > + if (ret) > > + goto fail_class_created; > > + else > > Unnecessary else since you goto in the if block. Ack > > > + asus_bioscfg.fw_attr_dev = device_create(fw_attr_class, NULL, > > + MKDEV(0, 0), NULL, "%s", DRIVER_NAME); > > + > > + if (IS_ERR(asus_bioscfg.fw_attr_dev)) { > > + ret = PTR_ERR(asus_bioscfg.fw_attr_dev); > > + goto fail_class_created; > > + } > > + > > + asus_bioscfg.fw_attr_kset = kset_create_and_add("attributes", NULL, > > + &asus_bioscfg.fw_attr_dev->kobj); > > + if (!asus_bioscfg.fw_attr_dev) { > > + ret = -ENOMEM; > > + pr_debug("Failed to create and add attributes\n"); > > + goto err_destroy_classdev; > > + } > > + > > + /* Add any firmware_attributes required */ > > Unnecessary comment. Ack > > > + ret = sysfs_create_file(&asus_bioscfg.fw_attr_kset->kobj, &pending_reboot.attr); > > + if (ret) { > > + pr_warn("Failed to create sysfs level attributes\n"); > > + goto fail_class_created; > > + } > > + > > + // TODO: logging > > ?? Logging of what if you intend to keep this message around. Shouldn't have been there. > > + asus_bioscfg.mini_led_dev_id = 0; > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_MINI_LED_MODE)) { > > + asus_bioscfg.mini_led_dev_id = ASUS_WMI_DEVID_MINI_LED_MODE; > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &mini_led_mode_attr_group); > > + } else if (asus_wmi_is_present(ASUS_WMI_DEVID_MINI_LED_MODE2)) { > > + asus_bioscfg.mini_led_dev_id = ASUS_WMI_DEVID_MINI_LED_MODE2; > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &mini_led_mode_attr_group); > > + } > > + > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_GPU_MUX)) { > > + asus_bioscfg.gpu_mux_dev_id = ASUS_WMI_DEVID_GPU_MUX; > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &gpu_mux_mode_attr_group); > > + } else if (asus_wmi_is_present(ASUS_WMI_DEVID_GPU_MUX_VIVO)) { > > + asus_bioscfg.gpu_mux_dev_id = ASUS_WMI_DEVID_GPU_MUX_VIVO; > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &gpu_mux_mode_attr_group); > > + } > > + > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_DGPU)) { > > + asus_bioscfg.dgpu_disable_available = true; > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &dgpu_disable_attr_group); > > + } > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_EGPU)) { > > + asus_bioscfg.egpu_enable_available = true; > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &egpu_enable_attr_group); > > + } > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_EGPU_CONNECTED)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &egpu_connected_attr_group); > > + > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &thermal_policy_attr_group); > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_PL1_SPL)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_pl1_spl_attr_group); > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_PL2_SPPT)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_pl2_sppt_attr_group); > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_APU_SPPT)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_apu_sppt_attr_group); > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_PLAT_SPPT)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_platform_sppt_attr_group); > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_FPPT)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_fppt_attr_group); > > + > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_NV_DYN_BOOST)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &nv_dynamic_boost_attr_group); > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_NV_THERM_TARGET)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &nv_temp_target_attr_group); > > + > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_CHARGE_MODE)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &charge_mode_attr_group); > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_BOOT_SOUND)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &boot_sound_attr_group); > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_MCU_POWERSAVE)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &mcu_powersave_attr_group); > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PANEL_OD)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &panel_od_attr_group); > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PANEL_HD)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &panel_hd_mode_attr_group); > > + > > + return 0; > > + > > +err_destroy_classdev: > > + device_destroy(fw_attr_class, MKDEV(0, 0)); > > + > > +fail_class_created: > > + fw_attributes_class_put(); > > + return ret; > > +} > > + > > +/* 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; > > + > > + /* > > + * ASUS product_name contains everything required, e.g, > > + * "ROG Flow X16 GV601VV_GV601VV_00185149B" > > + */ > > + product = dmi_get_system_info(DMI_PRODUCT_NAME); > > + > > + 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")) { > > + 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; > > + } > > + > > + 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_max = cpu_max; > > + > > + rog->platform_default = platform_default; > > + 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 = platform_default; > > + > > + rog->nv_boost_default = NVIDIA_BOOST_MAX; > > + 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_MAX; > > + rog->nv_temp_target = NVIDIA_TEMP_MIN; > > + > > +} > > + > > +static int __init asus_fw_init(void) > > +{ > > + int err; > > + > > + mutex_lock(&asus_bioscfg.mutex); > > + > > + asus_bioscfg.rog_tunables = kzalloc(sizeof(struct rog_tunables), GFP_KERNEL); > > + if (!asus_bioscfg.rog_tunables) { > > + mutex_unlock(&asus_bioscfg.mutex); > > + return -ENOMEM; > > + } > > + init_rog_tunables(asus_bioscfg.rog_tunables); > > + > > + err = asus_fw_attr_add(); > > + mutex_unlock(&asus_bioscfg.mutex); > > + if (err) > > + return err; > > + > > + return 0; > > +} > > + > > +static void __exit asus_fw_exit(void) > > +{ > > + mutex_lock(&asus_bioscfg.mutex); > > + > > + sysfs_remove_file(&asus_bioscfg.fw_attr_kset->kobj, &pending_reboot.attr); > > + kset_unregister(asus_bioscfg.fw_attr_kset); > > + device_destroy(fw_attr_class, MKDEV(0, 0)); > > + fw_attributes_class_put(); > > + > > + mutex_unlock(&asus_bioscfg.mutex); > > +} > > + > > +module_init(asus_fw_init); > > +module_exit(asus_fw_exit); > > diff --git a/drivers/platform/x86/asus-bioscfg.h b/drivers/platform/x86/asus-bioscfg.h > > new file mode 100644 > > index 000000000000..403563c25f53 > > --- /dev/null > > +++ b/drivers/platform/x86/asus-bioscfg.h > > @@ -0,0 +1,243 @@ > > +/* SPDX-License-Identifier: GPL-2.0 > > + * > > + * Definitions for kernel modules using asus-bios driver > > + * > > + * Copyright (c) 2024 Luke Jones <luke@ljones.dev> > > + */ > > + > > +#ifndef _ASUS_BIOSCFG_H_ > > +#define _ASUS_BIOSCFG_H_ > > + > > +#include "firmware_attributes_class.h" > > +#include <linux/types.h> > > + > > +#define DRIVER_NAME "asus-bioscfg" > > + > > +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) > > +{ > > + return sysfs_emit(buf, "enumeration\n"); > > +} > > + > > +#define __ASUS_ATTR_RO(_func, _name) { \ > > + .attr = { .name = __stringify(_name), .mode = 0444 }, \ > > + .show = _func##_##_name##_show, \ > > +} > > + > > +#define __ASUS_ATTR_RO_AS(_name, _show) { \ > > + .attr = { .name = __stringify(_name), .mode = 0444 }, \ > > + .show = _show, \ > > +} > > + > > +#define __ASUS_ATTR_RW(_func, _name) __ATTR(_name, 0644, \ > > + _func##_##_name##_show, _func##_##_name##_store) > > + > > +#define __WMI_STORE_INT(_attr, _min, _max, _wmi) \ > > +static ssize_t _attr##_store(struct kobject *kobj, \ > > + struct kobj_attribute *attr, \ > > + const char *buf, size_t count) \ > > +{ \ > > + return attr_int_store(kobj, attr, buf, count, _min, _max, NULL, _wmi); \ > > +} > > + > > +#define WMI_SHOW_INT(_attr, _fmt, _wmi) \ > > +static ssize_t _attr##_show(struct kobject *kobj, \ > > + struct kobj_attribute *attr, char *buf) \ > > +{ \ > > + u32 result; \ > > + int err; \ > > + err = asus_wmi_get_devstate_dsts(_wmi, &result); \ > > + if (err) \ > > + return err; \ > > + return sysfs_emit(buf, _fmt, \ > > + result & ~ASUS_WMI_DSTS_PRESENCE_BIT); \ > > +} > > + > > +/* Create functions and attributes for use in other macros or on their own */ > > + > > +#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, \ > > + _min, asus_bioscfg.rog_tunables->_max, \ > > + &asus_bioscfg.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_bioscfg.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_bioscfg.rog_tunables->_val);\ > > +} \ > > +static struct kobj_attribute attr_##_attrname##_##_prop = \ > > + __ASUS_ATTR_RO(_attrname, _prop) > > + > > +#define __ATTR_CURRENT_INT_RO(_attr, _wmi) \ > > +WMI_SHOW_INT(_attr##_current_value, "%d\n", _wmi); \ > > +static struct kobj_attribute attr_##_attr##_current_value = \ > > + __ASUS_ATTR_RO(_attr, current_value) > > + > > +#define __ATTR_CURRENT_INT_RW(_attr, _minv, _maxv, _wmi) \ > > +__WMI_STORE_INT(_attr##_current_value, _minv, _maxv, _wmi); \ > > +WMI_SHOW_INT(_attr##_current_value, "%d\n", _wmi); \ > > +static struct kobj_attribute attr_##_attr##_current_value = \ > > + __ASUS_ATTR_RW(_attr, current_value) > > + > > +/* Shows a formatted static variable */ > > +#define __ATTR_SHOW_FMT(_prop, _attrname, _fmt, _val) \ > > +static ssize_t _attrname##_##_prop##_show(struct kobject *kobj, \ > > + struct kobj_attribute *attr, char *buf) \ > > +{ \ > > + return sysfs_emit(buf, _fmt, _val); \ > > +} \ > > +static struct kobj_attribute attr_##_attrname##_##_prop = \ > > + __ASUS_ATTR_RO(_attrname, _prop) > > + > > +/* Int style min/max range, base macro. Requires current_value show&|store */ > > +#define __ATTR_GROUP_INT(_attrname, _fsname, _default, \ > > + _min, _max, _incstep, _dispname)\ > > +__ATTR_SHOW_FMT(default_value, _attrname, "%d\n", _default); \ > > +__ATTR_SHOW_FMT(min_value, _attrname, "%d\n", _min); \ > > +__ATTR_SHOW_FMT(max_value, _attrname, "%d\n", _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 \ > > +} > > + > > +/* Boolean style enumeration, base macro. Requires adding show/store */ > > +#define __ATTR_GROUP_ENUM(_attrname, _fsname, _possible, _dispname) \ > > +__ATTR_SHOW_FMT(display_name, _attrname, "%s\n", _dispname); \ > > +__ATTR_SHOW_FMT(possible_values, _attrname, "%s\n", _possible); \ > > +static struct kobj_attribute attr_##_attrname##_type = \ > > + __ASUS_ATTR_RO_AS(type, enum_type_show); \ > > +static struct attribute *_attrname##_attrs[] = { \ > > + &attr_##_attrname##_current_value.attr, \ > > + &attr_##_attrname##_display_name.attr, \ > > + &attr_##_attrname##_possible_values.attr, \ > > + &attr_##_attrname##_type.attr, \ > > + NULL \ > > +}; \ > > +static const struct attribute_group _attrname##_attr_group = { \ > > + .name = _fsname, \ > > + .attrs = _attrname##_attrs \ > > +} > > + > > +#define ATTR_GROUP_BOOL_RO(_attrname, _fsname, _wmi, _dispname) \ > > +do { \ > > + __ATTR_CURRENT_INT_RO(_attrname, _wmi); \ > > + __ATTR_GROUP_ENUM(_attrname, _fsname, "0;1", _dispname);\ > > +} while (0) > > + > > +#define ATTR_GROUP_BOOL_RW(_attrname, _fsname, _wmi, _dispname) \ > > +do { \ > > + __ATTR_CURRENT_INT_RW(_attrname, 0, 1, _wmi); \ > > + __ATTR_GROUP_ENUM(_attrname, _fsname, "0;1", _dispname);\ > > +} while (0) > > + > > +/* > > + * Requires <name>_current_value_show(), <name>_current_value_show() > > + */ > > +#define ATTR_GROUP_BOOL_CUSTOM(_attrname, _fsname, _dispname) \ > > +static struct kobj_attribute attr_##_attrname##_current_value = \ > > + __ASUS_ATTR_RW(_attrname, current_value); \ > > +__ATTR_GROUP_ENUM(_attrname, _fsname, "0;1", _dispname) > > + > > +#define ATTR_GROUP_ENUM_INT_RO(_attrname, _fsname, _wmi, \ > > + _possible, _dispname) \ > > +do { \ > > + __ATTR_CURRENT_INT_RO(_attrname, _wmi); \ > > + __ATTR_GROUP_ENUM(_attrname, _fsname, _possible, _dispname); \ > > +} while (0) > > + > > +#define ATTR_GROUP_ENUM_INT_RW(_attrname, _fsname, _wmi, _min, \ > > + _max, _possible, _dispname) \ > > +do { \ > > + __ATTR_CURRENT_INT_RW(_attrname, _min, _max, _wmi); \ > > + __ATTR_GROUP_ENUM(_attrname, _fsname, _possible, _dispname); \ > > +} while (0) > > + > > +/* > > + * Requires <name>_current_value_show(), <name>_current_value_show() > > + * and <name>_possible_values_show() > > + */ > > +#define ATTR_GROUP_ENUM_CUSTOM(_attrname, _fsname, _dispname) \ > > +__ATTR_SHOW_FMT(display_name, _attrname, "%s\n", _dispname); \ > > +static struct kobj_attribute attr_##_attrname##_current_value = \ > > + __ASUS_ATTR_RW(_attrname, current_value); \ > > +static struct kobj_attribute attr_##_attrname##_possible_values = \ > > + __ASUS_ATTR_RO(_attrname, possible_values); \ > > +static struct kobj_attribute attr_##_attrname##_type = \ > > + __ASUS_ATTR_RO_AS(type, enum_type_show); \ > > +static struct attribute *_attrname##_attrs[] = { \ > > + &attr_##_attrname##_current_value.attr, \ > > + &attr_##_attrname##_display_name.attr, \ > > + &attr_##_attrname##_possible_values.attr, \ > > + &attr_##_attrname##_type.attr, \ > > + NULL \ > > +}; \ > > +static const struct attribute_group _attrname##_attr_group = { \ > > + .name = _fsname, \ > > + .attrs = _attrname##_attrs \ > > +} > > + > > +/* ROG PPT attributes need a little different in setup */ > > +#define ATTR_GROUP_PPT_RW(_attrname, _fsname, _wmi, _default, \ > > + _min, _max, _incstep, _dispname) \ > > +__ROG_TUNABLE_RW(_attrname, _min, _max, _wmi); \ > > +__ROG_TUNABLE_SHOW(default_value, _attrname, _default); \ > > +__ATTR_SHOW_FMT(min_value, _attrname, "%d\n", _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_ */ > > diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c > > index 2b968003cb9b..3f1998638fea 100644 > > --- a/drivers/platform/x86/asus-wmi.c > > +++ b/drivers/platform/x86/asus-wmi.c > > @@ -529,12 +529,28 @@ static int asus_wmi_get_devstate(struct asus_wmi *asus, u32 dev_id, u32 *retval) > > return 0; > > } > > > > -static int asus_wmi_set_devstate(u32 dev_id, u32 ctrl_param, > > +int asus_wmi_get_devstate_dsts(u32 dev_id, u32 *retval) > > +{ > > + int err; > > + > > + err = asus_wmi_evaluate_method(ASUS_WMI_METHODID_DSTS, dev_id, 0, retval); > > + if (err) > > + return err; > > + > > + if (*retval == ~0) > > + return -ENODEV; > > + > > + return 0; > > +} > > +EXPORT_SYMBOL_GPL(asus_wmi_get_devstate_dsts); > > + > > +int asus_wmi_set_devstate(u32 dev_id, u32 ctrl_param, > > u32 *retval) > > Should fit to one line just fine. Not sure why it wasn't. Might have been a longer function name to start with. > As general feel of the readiness of this code, I suspect there were many > more problems which I failed to notice :-(. I'd put money on it (sorry). I definitely should have cleaned up better than I did so you weren't pointing out silly little things, but I was never expecting to get over the line on the first try and desperately needed some insight for the overall patch series to see if what I was doing was actually going to be acceptable or not. As always, thanks so much for your time and review. Regards, Luke. > > -- > i. > > > { > > return asus_wmi_evaluate_method(ASUS_WMI_METHODID_DEVS, dev_id, > > ctrl_param, retval); > > } > > +EXPORT_SYMBOL_GPL(asus_wmi_set_devstate); > > > > /* Helper for special devices with magic return codes */ > > static int asus_wmi_get_devstate_bits(struct asus_wmi *asus, > > diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h > > index 74b32e1d6735..889336a932fb 100644 > > --- a/include/linux/platform_data/x86/asus-wmi.h > > +++ b/include/linux/platform_data/x86/asus-wmi.h > > @@ -67,6 +67,7 @@ > > #define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY 0x00120075 > > > > /* Misc */ > > +#define ASUS_WMI_DEVID_PANEL_HD 0x0005001C > > #define ASUS_WMI_DEVID_PANEL_OD 0x00050019 > > #define ASUS_WMI_DEVID_CAMERA 0x00060013 > > #define ASUS_WMI_DEVID_LID_FLIP 0x00060062 > > @@ -152,8 +153,18 @@ > > #define ASUS_WMI_DSTS_LIGHTBAR_MASK 0x0000000F > > > > #if IS_REACHABLE(CONFIG_ASUS_WMI) > > +int asus_wmi_get_devstate_dsts(u32 dev_id, u32 *retval); > > +int asus_wmi_set_devstate(u32 dev_id, u32 ctrl_param, u32 *retval); > > int asus_wmi_evaluate_method(u32 method_id, u32 arg0, u32 arg1, u32 *retval); > > #else > > +static int asus_wmi_get_devstate_dsts(u32 dev_id, u32 *retval) > > +{ > > + return -ENODEV; > > +} > > +static int asus_wmi_set_devstate(u32 dev_id, u32 ctrl_param, u32 *retval) > > +{ > > + return -ENODEV; > > +} > > static inline int asus_wmi_evaluate_method(u32 method_id, u32 arg0, u32 arg1, > > u32 *retval) > > { > >
On Tue, 16 Jul 2024, at 9:50 PM, Hans de Goede wrote: > Hi Luke, > > On 7/16/24 7:16 AM, Luke D. Jones wrote: > > The fw_attributes_class provides a much cleaner interface to all of the > > attributes introduced to asus-wmi. This patch moves all of these extra > > attributes over to fw_attributes_class, and shifts the bulk of these > > definitions to a new kernel module to reduce the clutter of asus-wmi > > with the intention of deprecating the asus-wmi attributes in future. > > > > The work applies only to WMI methods which don't have a clearly defined > > place within the sysfs and as a result ended up lumped together in > > /sys/devices/platform/asus-nb-wmi/ with no standard API. > > > > Where possible the fw attrs now implement defaults, min, max, scalar, > > choices, etc. As en example dgpu_disable becomes: > > > > /sys/class/firmware-attributes/asus-bioscfg/attributes/dgpu_disable/ > > ├── current_value > > ├── display_name > > ├── possible_values > > └── type > > > > as do other attributes. > > > > Signed-off-by: Luke D. Jones <luke@ljones.dev> > > Interesting (also see my reply to the cover-letter). > > Note this is not a full review, just a few small remarks > with things which I noticed while taking a quick look. > > <snip> > > > +static bool asus_bios_requires_reboot(struct kobj_attribute *attr) > > +{ > > + return !strcmp(attr->attr.name, "gpu_mux_mode"); > > + !strcmp(attr->attr.name, "panel_hd_mode"); > > +} > > The second statement here is never reached, I believe you want > a || between the 2 strcmp() calls: > > static bool asus_bios_requires_reboot(struct kobj_attribute *attr) > { > return !strcmp(attr->attr.name, "gpu_mux_mode") || > !strcmp(attr->attr.name, "panel_hd_mode"); > } > > <snip> > > > +/* Simple attribute creation */ > > I think it would be good to do the following for registering > these "simple" attributes ... continued below. > > > +ATTR_GROUP_ENUM_INT_RW(thermal_policy, "thermal_policy", ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY, > > + 0, 3, "0;1;2", "Set the thermal profile: 0=normal, 1=performance, 2=quiet"); > > +ATTR_GROUP_PPT_RW(ppt_pl2_sppt, "ppt_pl2_sppt", ASUS_WMI_DEVID_PPT_PL2_SPPT, > > + cpu_default, 5, cpu_max, 1, "Set the CPU fast package limit"); > > +ATTR_GROUP_PPT_RW(ppt_apu_sppt, "ppt_apu_sppt", ASUS_WMI_DEVID_PPT_APU_SPPT, > > + platform_default, 5, platform_max, 1, "Set the CPU slow package limit"); > > +ATTR_GROUP_PPT_RW(ppt_platform_sppt, "ppt_platform_sppt", ASUS_WMI_DEVID_PPT_PLAT_SPPT, > > + platform_default, 5, platform_max, 1, "Set the CPU slow package limit"); > > +ATTR_GROUP_PPT_RW(ppt_fppt, "ppt_fppt", ASUS_WMI_DEVID_PPT_FPPT, > > + cpu_default, 5, cpu_max, 1, "Set the CPU slow package limit"); > > + > > +ATTR_GROUP_PPT_RW(nv_dynamic_boost, "nv_dynamic_boost", ASUS_WMI_DEVID_NV_DYN_BOOST, > > + nv_boost_default, 5, nv_boost_max, 1, "Set the Nvidia dynamic boost limit"); > > +ATTR_GROUP_PPT_RW(nv_temp_target, "nv_temp_target", ASUS_WMI_DEVID_NV_THERM_TARGET, > > + nv_temp_default, 75, 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"); > > +ATTR_GROUP_BOOL_RW(boot_sound, "boot_sound", ASUS_WMI_DEVID_BOOT_SOUND, > > + "Set the boot POST sound"); > > +ATTR_GROUP_BOOL_RW(mcu_powersave, "mcu_powersave", ASUS_WMI_DEVID_MCU_POWERSAVE, > > + "Set MCU powersaving mode"); > > +ATTR_GROUP_BOOL_RW(panel_od, "panel_overdrive", ASUS_WMI_DEVID_PANEL_OD, > > + "Set the panel refresh overdrive"); > > +ATTR_GROUP_BOOL_RW(panel_hd_mode, "panel_hd_mode", ASUS_WMI_DEVID_PANEL_HD, > > + "Set the panel HD mode to UHD<0> or FHD<1>"); > > +ATTR_GROUP_BOOL_RO(egpu_connected, "egpu_connected", ASUS_WMI_DEVID_EGPU_CONNECTED, > > + "Show the eGPU connection status"); > > Create an array of simple attribute groups for this > entire set of simple attributes: > > struct asus_attr_group { > const struct attribute_group *attr_group; > u32 wmi_devid; > }; > > static const struct asus_attr_group simple_attribute_groups[] = { > { &thermal_policy_attr_group, ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY }, > { &ppt_pl2_sppt_attr_group, ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY }, > ... > { &egpu_connected_attr_group, ASUS_WMI_DEVID_EGPU_CONNECTED }, > }; > > And then in asus_fw_attr_add() .. continued below: > > > +static int asus_fw_attr_add(void) > > +{ > > + int ret; > > + > > + ret = fw_attributes_class_get(&fw_attr_class); > > + if (ret) > > + goto fail_class_created; > > + else > > + asus_bioscfg.fw_attr_dev = device_create(fw_attr_class, NULL, > > + MKDEV(0, 0), NULL, "%s", DRIVER_NAME); > > + > > + if (IS_ERR(asus_bioscfg.fw_attr_dev)) { > > + ret = PTR_ERR(asus_bioscfg.fw_attr_dev); > > + goto fail_class_created; > > + } > > + > > + asus_bioscfg.fw_attr_kset = kset_create_and_add("attributes", NULL, > > + &asus_bioscfg.fw_attr_dev->kobj); > > + if (!asus_bioscfg.fw_attr_dev) { > > + ret = -ENOMEM; > > + pr_debug("Failed to create and add attributes\n"); > > + goto err_destroy_classdev; > > + } > > + > > + /* Add any firmware_attributes required */ > > + ret = sysfs_create_file(&asus_bioscfg.fw_attr_kset->kobj, &pending_reboot.attr); > > + if (ret) { > > + pr_warn("Failed to create sysfs level attributes\n"); > > + goto fail_class_created; > > + } > > + > > + // TODO: logging > > + asus_bioscfg.mini_led_dev_id = 0; > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_MINI_LED_MODE)) { > > + asus_bioscfg.mini_led_dev_id = ASUS_WMI_DEVID_MINI_LED_MODE; > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &mini_led_mode_attr_group); > > + } else if (asus_wmi_is_present(ASUS_WMI_DEVID_MINI_LED_MODE2)) { > > + asus_bioscfg.mini_led_dev_id = ASUS_WMI_DEVID_MINI_LED_MODE2; > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &mini_led_mode_attr_group); > > + } > > + > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_GPU_MUX)) { > > + asus_bioscfg.gpu_mux_dev_id = ASUS_WMI_DEVID_GPU_MUX; > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &gpu_mux_mode_attr_group); > > + } else if (asus_wmi_is_present(ASUS_WMI_DEVID_GPU_MUX_VIVO)) { > > + asus_bioscfg.gpu_mux_dev_id = ASUS_WMI_DEVID_GPU_MUX_VIVO; > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &gpu_mux_mode_attr_group); > > + } > > + > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_DGPU)) { > > + asus_bioscfg.dgpu_disable_available = true; > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &dgpu_disable_attr_group); > > + } > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_EGPU)) { > > + asus_bioscfg.egpu_enable_available = true; > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &egpu_enable_attr_group); > > + } > > Replace the block starting here and ending ... > > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_EGPU_CONNECTED)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &egpu_connected_attr_group); > > + > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &thermal_policy_attr_group); > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_PL1_SPL)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_pl1_spl_attr_group); > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_PL2_SPPT)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_pl2_sppt_attr_group); > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_APU_SPPT)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_apu_sppt_attr_group); > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_PLAT_SPPT)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_platform_sppt_attr_group); > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_FPPT)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_fppt_attr_group); > > + > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_NV_DYN_BOOST)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &nv_dynamic_boost_attr_group); > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_NV_THERM_TARGET)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &nv_temp_target_attr_group); > > + > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_CHARGE_MODE)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &charge_mode_attr_group); > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_BOOT_SOUND)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &boot_sound_attr_group); > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_MCU_POWERSAVE)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &mcu_powersave_attr_group); > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PANEL_OD)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &panel_od_attr_group); > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_PANEL_HD)) > > + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &panel_hd_mode_attr_group); > > here, with: > > for (i = 0; i < ARRAY_SIZE(simple_attribute_groups); i++) { > if (!asus_wmi_is_present(simple_attribute_groups[i].wmi_devid)) > continue; > > sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, simple_attribute_groups[i].attr_group); > pr_dbg("Created sysfs-group for %s\n", simple_attribute_groups[i].attr_group->name); > } > > This will make adding new simple attributes a matter of just: > > 1. Declaring the new attr using one of the macros > 2. Adding it to simple_attribute_groups[] > > And this also takes care of you logging TODO for simple attributes > without needing to add a ton of pr_debug() calls. Ah perfect, this was one problem I ws trying to figure out a better way of doing. I'll have a crack at this after addressing all other concerns mentioned so far. Cheers, Luke. > > Regards, > > Hans > > >
On Tue, 16 Jul 2024, Luke Jones wrote: > On Tue, 16 Jul 2024, at 9:45 PM, Ilpo Järvinen wrote: > > On Tue, 16 Jul 2024, Luke D. Jones wrote: > > > > > The fw_attributes_class provides a much cleaner interface to all of the > > > attributes introduced to asus-wmi. This patch moves all of these extra > > > attributes over to fw_attributes_class, and shifts the bulk of these > > > definitions to a new kernel module to reduce the clutter of asus-wmi > > > with the intention of deprecating the asus-wmi attributes in future. > > > > > > The work applies only to WMI methods which don't have a clearly defined > > > place within the sysfs and as a result ended up lumped together in > > > /sys/devices/platform/asus-nb-wmi/ with no standard API. > > > > > > Where possible the fw attrs now implement defaults, min, max, scalar, > > > choices, etc. As en example dgpu_disable becomes: > > > > > > /sys/class/firmware-attributes/asus-bioscfg/attributes/dgpu_disable/ > > > ├── current_value > > > ├── display_name > > > ├── possible_values > > > └── type > > > > > > as do other attributes. > > > > > > Signed-off-by: Luke D. Jones <luke@ljones.dev> > > > --- > > > drivers/platform/x86/Kconfig | 14 + > > > drivers/platform/x86/Makefile | 1 + > > > drivers/platform/x86/asus-bioscfg.c | 666 +++++++++++++++++++++ > > > drivers/platform/x86/asus-bioscfg.h | 243 ++++++++ > > > drivers/platform/x86/asus-wmi.c | 18 +- > > > include/linux/platform_data/x86/asus-wmi.h | 11 + > > > 6 files changed, 952 insertions(+), 1 deletion(-) > > > create mode 100644 drivers/platform/x86/asus-bioscfg.c > > > create mode 100644 drivers/platform/x86/asus-bioscfg.h > > > > > > diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig > > > index 665fa9524986..b4a5a5bec7f3 100644 > > > --- a/drivers/platform/x86/Kconfig > > > +++ b/drivers/platform/x86/Kconfig > > > @@ -265,6 +265,18 @@ config ASUS_WIRELESS > > > If you choose to compile this driver as a module the module will be > > > called asus-wireless. > > > > > > +config ASUS_BIOS > > > + tristate "ASUS BIOS Driver" > > > + depends on ACPI_WMI > > > + depends on ASUS_WMI > > > + select FW_ATTR_CLASS > > > + help > > > + Say Y here if you have a WMI aware Asus laptop and would like to use the > > > + firmware_attributes API. > > > + > > > + To compile this driver as a module, choose M here: the module will > > > + be called asus-bios. > > > + > > > config ASUS_WMI > > > tristate "ASUS WMI Driver" > > > depends on ACPI_WMI > > > @@ -276,6 +288,8 @@ config ASUS_WMI > > > depends on HOTPLUG_PCI > > > depends on ACPI_VIDEO || ACPI_VIDEO = n > > > depends on SERIO_I8042 || SERIO_I8042 = n > > > + select ASUS_BIOS > > > > Selecting user visible configs is not a good idea. Also, there > > seems to be circular dependency now between ASUS_BIOS & ASUS_WMI ? > > Is "selects" the same as "depends"? It's not the same. Selects ask to enabled another symbol (with caveats) and depends only shows this symbol if the other symbol is already enabled. Select comes with many many caveats and should only be used for the config symbols which are truly library type (and not presented to user in the first place). > I did just remove: > select ASUS_WMI_BIOS > which should not be there at all. > > ASUS_BIOS does need ASUS_WMI. And I'd like ASUS_BIOS to be selected by > defualt, is this not the right way to do that? Default should not be handled with either depends on / select I think, but I'm not Kconfig expert. There's also default clause but it should be used sparingly as each and every developer naturally thinks their thing is so important it must be on by default so we know where that thinking ends to. :-) Distros tend enable about everything anyway so it might not be so important in the end what the default is. > > > + select ASUS_WMI_BIOS > > > select INPUT_SPARSEKMAP > > > select LEDS_CLASS > > > select NEW_LEDS > > > + struct mutex mutex; > > > +} asus_bioscfg = { > > > + .mutex = __MUTEX_INITIALIZER(asus_bioscfg.mutex), > > > > Don't try to initialize it on the same go like this. > > > > You might want static too. > > Ack both > > > > > > +}; > > > + > > > +static struct fw_attrs_group { > > > + u32 pending_reboot; > > > +} fw_attrs = { > > > + .pending_reboot = 0, > > > +}; > > > > Same here. > > It was probably done like this in code I read as a reference. I'll shift > to the module init function. ??? I just meant this split: struct fw_attrs_group { u32 pending_reboot; }; static struct fw_attrs_group fw_attrs = { .pending_reboot = 0, }; > > > +static bool asus_bios_requires_reboot(struct kobj_attribute *attr) > > > +{ > > > + return !strcmp(attr->attr.name, "gpu_mux_mode"); > > > + !strcmp(attr->attr.name, "panel_hd_mode"); > > > > ??? > > > > Semicolon and && confusion here? > > Yeah i know, bad rebase I didn't catch. For the record, || is correct here, not && but you probably know this already. > > > + if (result) > > > + return result; > > > + > > > + if (value < min || value > max) > > > + return -EINVAL; > > > + > > > + asus_wmi_set_devstate(wmi_dev, value, &result); > > > > Type confusion, u32 * vs int pointer being passed. > > I miss rust... > > > + if (result) { > > > + pr_err("Failed to set %s: %d\n", attr->attr.name, result); > > > + return result; > > > + } > > > + > > > + if (result > 1) { > > > > What's this supposed to mean given you've the type confusion to begin > > with and return on the earlier line if result is non-zero? > > > > Did you mean to capture the return value of asus_wmi_set_devstate() and > > test that in the first if ()? > > Yep.. this whole bit is a mess. I've fixed the type mess, and added a > comment to clarify the "if (result > 1) {" > (WMI methods return 0 = fail, 1 = success, anything else is error) Don't add these comments into everywhere in the code but document asus_wmi_set_devstate() instead with kerneldoc. > > If you make a previously internal function such as asus_wmi_set_devstate() > > EXPORTed, you should document it with kerneldoc so the interface is clear. > > I'm not sure how to do this, I'll read up. Also didn't know about it so > thanks for the pointer. It's this format: /** * funcname - func short desc * @param1: foo * ... * * Func long description (IMHO, often optional if not some major API). * * Returns: important info about return value */ You'll find plenty of examples with varying quality with grep but the most imporant bits are the return value and parameters, and if there are caveats the caller should know, the long desciption might be handy. > > > + err = -ENODEV; > > > + pr_warn("Can not switch MUX to dGPU mode when dGPU is disabled: %d\n", err); > > > + return err; > > > + } > > > + } > > > + > > > + if (asus_bioscfg.egpu_enable_available) { > > > + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_EGPU, &result); > > > + if (err) > > > + return err; > > > + if (result && !optimus) { > > > + err = -ENODEV; > > > + pr_warn("Can not switch MUX to dGPU mode when eGPU is enabled: %d\n", err); > > > + return err; > > > + } > > > + } > > > + > > > + err = asus_wmi_set_devstate(asus_bioscfg.gpu_mux_dev_id, optimus, &result); > > > + if (err) { > > > + pr_err("%s Failed to set GPU MUX mode: %d\nn", __func__, err); > > > > Never use __func__ for messages shown to normal user. > > Must have been a holdover from debug. Also wasn't aware of that rule, thanks. For pr_debug() I can give some leeway but for anything info/warn/error should definitely be user readable and preferrably understandable too :-D. > > > + return err; > > > + } > > > + /* !1 is considered a fail by ASUS */ > > > > If the interface is documented with kerneldoc, this is unnecessary > > comment. Is 0 also a failure (this differs from >1 checks elsewhere)? > > I've changed the other checks to match. But I'll also try and do a > deeper analysis of those particular WMI functions to see if I can find > the actual causes for other returns and their significance (0 and 2). 1 > is most definitely success though. Understood, I don't expect you to know everything about these interfaces but the difference just caught my eye so I mentioned it in case it's a mistake. > > As general feel of the readiness of this code, I suspect there were many > > more problems which I failed to notice :-(. > > I'd put money on it (sorry). I definitely should have cleaned up better > than I did so you weren't pointing out silly little things, but I was > never expecting to get over the line on the first try and desperately > needed some insight for the overall patch series to see if what I was > doing was actually going to be acceptable or not. It's not problem in itself if you were just after an early review of the concept but there are little things like not maintaining consistency in variable naming which easily trips one here and there which I really recommend you change because then many patterns can be checked with grep / find if things are consistent (and it helps the code reader too if the variable naming doesn't suddenly became opposite of what it was in the previous function). > As always, thanks so much for your time and review.
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 665fa9524986..b4a5a5bec7f3 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -265,6 +265,18 @@ config ASUS_WIRELESS If you choose to compile this driver as a module the module will be called asus-wireless. +config ASUS_BIOS + tristate "ASUS BIOS Driver" + depends on ACPI_WMI + depends on ASUS_WMI + select FW_ATTR_CLASS + help + Say Y here if you have a WMI aware Asus laptop and would like to use the + firmware_attributes API. + + To compile this driver as a module, choose M here: the module will + be called asus-bios. + config ASUS_WMI tristate "ASUS WMI Driver" depends on ACPI_WMI @@ -276,6 +288,8 @@ config ASUS_WMI depends on HOTPLUG_PCI depends on ACPI_VIDEO || ACPI_VIDEO = n depends on SERIO_I8042 || SERIO_I8042 = n + select ASUS_BIOS + select ASUS_WMI_BIOS select INPUT_SPARSEKMAP select LEDS_CLASS select NEW_LEDS diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index e1b142947067..d9b5b3f3b241 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -32,6 +32,7 @@ obj-$(CONFIG_APPLE_GMUX) += apple-gmux.o # ASUS obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o obj-$(CONFIG_ASUS_WIRELESS) += asus-wireless.o +obj-$(CONFIG_ASUS_BIOS) += asus-bios.o obj-$(CONFIG_ASUS_WMI) += asus-wmi.o obj-$(CONFIG_ASUS_NB_WMI) += asus-nb-wmi.o obj-$(CONFIG_ASUS_TF103C_DOCK) += asus-tf103c-dock.o diff --git a/drivers/platform/x86/asus-bioscfg.c b/drivers/platform/x86/asus-bioscfg.c new file mode 100644 index 000000000000..0b34e727aab4 --- /dev/null +++ b/drivers/platform/x86/asus-bioscfg.c @@ -0,0 +1,666 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Asus BIOS attributes driver + * + * Copyright(C) 2010 Intel Corporation. + * Copyright(C) 2024-2024 Luke Jones <luke@ljones.dev> + */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include <linux/platform_data/x86/asus-wmi.h> +#include <linux/errno.h> +#include <linux/fs.h> +#include <linux/types.h> +#include <linux/dmi.h> +#include <linux/device.h> +#include <linux/kmod.h> +#include <linux/kobject.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/kernel.h> +#include "asus-bios.h" +#include "firmware_attributes_class.h" + +MODULE_AUTHOR("Luke Jones <luke@ljones.dev>"); +MODULE_DESCRIPTION("ASUS BIOS Configuration Driver"); +MODULE_LICENSE("GPL"); + +#define ASUS_NB_WMI_EVENT_GUID "0B3CBB35-E3C2-45ED-91C2-4C5A6D195D1C" + +MODULE_ALIAS("wmi:"ASUS_NB_WMI_EVENT_GUID); + +#define ASUS_MINI_LED_MODE_MASK 0x03 +/* Standard modes for devices with only on/off */ +#define ASUS_MINI_LED_OFF 0x00 +#define ASUS_MINI_LED_ON 0x01 +/* New mode on some devices, define here to clarify remapping later */ +#define ASUS_MINI_LED_STRONG_MODE 0x02 +/* New modes for devices with 3 mini-led mode types */ +#define ASUS_MINI_LED_2024_WEAK 0x00 +#define ASUS_MINI_LED_2024_STRONG 0x01 +#define ASUS_MINI_LED_2024_OFF 0x02 + +/* Default limits for tunables available on ASUS ROG laptops */ +#define PPT_CPU_LIMIT_MIN 5 +#define PPT_CPU_LIMIT_MAX 150 +#define PPT_CPU_LIMIT_DEFAULT 80 +#define PPT_PLATFORM_MIN 5 +#define PPT_PLATFORM_MAX 100 +#define PPT_PLATFORM_DEFAULT 80 +#define NVIDIA_BOOST_MIN 5 +#define NVIDIA_BOOST_MAX 25 +#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_max; + + u32 platform_default; + 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_max; + u32 nv_dynamic_boost; + + u32 nv_temp_default; + u32 nv_temp_max; + u32 nv_temp_target; +}; + +static const struct class *fw_attr_class; + +struct asus_bios_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; + bool dgpu_disable_available; + bool egpu_enable_available; + + struct mutex mutex; +} asus_bioscfg = { + .mutex = __MUTEX_INITIALIZER(asus_bioscfg.mutex), +}; + +static struct fw_attrs_group { + u32 pending_reboot; +} fw_attrs = { + .pending_reboot = 0, +}; + +/* WMI helper methods */ +static bool asus_wmi_is_present(u32 dev_id) +{ + int status = asus_wmi_get_devstate_dsts(dev_id, &retval); + u32 retval; + + pr_debug("%s called (0x%08x), retval: 0x%08x\n", __func__, dev_id, retval); + + return status == 0 && (retval & ASUS_WMI_DSTS_PRESENCE_BIT); +} + +static void asus_set_reboot_and_signal_event(void) +{ + fw_attrs.pending_reboot = 1; + kobject_uevent(&asus_bioscfg.fw_attr_dev->kobj, KOBJ_CHANGE); +} + +static ssize_t pending_reboot_show(struct kobject *kobj, + struct kobj_attribute *attr, + char *buf) +{ + return sysfs_emit(buf, "%d\n", fw_attrs.pending_reboot); +} + +static struct kobj_attribute pending_reboot = __ATTR_RO(pending_reboot); + +static bool asus_bios_requires_reboot(struct kobj_attribute *attr) +{ + return !strcmp(attr->attr.name, "gpu_mux_mode"); + !strcmp(attr->attr.name, "panel_hd_mode"); +} + +/* + * Generic store function for use with many ROG tunables + */ +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) +{ + int result, value; + + result = kstrtoint(buf, 10, &value); + if (result) + return result; + + if (value < min || value > max) + return -EINVAL; + + asus_wmi_set_devstate(wmi_dev, value, &result); + if (result) { + pr_err("Failed to set %s: %d\n", attr->attr.name, result); + return result; + } + + if (result > 1) { + pr_err("Failed to set %s (result): 0x%x\n", attr->attr.name, result); + return -EIO; + } + + if (store_value != NULL) + *store_value = value; + sysfs_notify(kobj, NULL, attr->attr.name); + + if (asus_bios_requires_reboot(attr)) + asus_set_reboot_and_signal_event(); + + return count; +} + +/* Mini-LED mode **************************************************************/ +static ssize_t mini_led_mode_current_value_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + u32 value; + int err; + + err = asus_wmi_get_devstate_dsts(asus_bioscfg.mini_led_dev_id, &value); + if (err) + return err; + + value = value & ASUS_MINI_LED_MODE_MASK; + + /* + * Remap the mode values to match previous generation mini-led. The last gen + * WMI 0 == off, while on this version WMI 2 ==off (flipped). + */ + if (asus_bioscfg.mini_led_dev_id == ASUS_WMI_DEVID_MINI_LED_MODE2) { + switch (value) { + case ASUS_MINI_LED_2024_WEAK: + value = ASUS_MINI_LED_ON; + break; + case ASUS_MINI_LED_2024_STRONG: + value = ASUS_MINI_LED_STRONG_MODE; + break; + case ASUS_MINI_LED_2024_OFF: + value = ASUS_MINI_LED_OFF; + break; + } + } + + return sysfs_emit(buf, "%d\n", value); +} + +static ssize_t mini_led_mode_current_value_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t count) +{ + int result, err; + u32 mode; + + result = kstrtou32(buf, 10, &mode); + if (result) + return result; + + if (asus_bioscfg.mini_led_dev_id == ASUS_WMI_DEVID_MINI_LED_MODE && + mode > ASUS_MINI_LED_ON) + return -EINVAL; + if (asus_bioscfg.mini_led_dev_id == ASUS_WMI_DEVID_MINI_LED_MODE2 && + mode > ASUS_MINI_LED_STRONG_MODE) + return -EINVAL; + + /* + * Remap the mode values so expected behaviour is the same as the last + * generation of mini-LED with 0 == off, 1 == on. + */ + if (asus_bioscfg.mini_led_dev_id == ASUS_WMI_DEVID_MINI_LED_MODE2) { + switch (mode) { + case ASUS_MINI_LED_OFF: + mode = ASUS_MINI_LED_2024_OFF; + break; + case ASUS_MINI_LED_ON: + mode = ASUS_MINI_LED_2024_WEAK; + break; + case ASUS_MINI_LED_STRONG_MODE: + mode = ASUS_MINI_LED_2024_STRONG; + break; + } + } + + err = asus_wmi_set_devstate(asus_bioscfg.mini_led_dev_id, mode, &result); + if (err) { + pr_warn("Failed to set mini-LED: %d\n", err); + return err; + } + + if (result > 1) { + pr_warn("Failed to set mini-LED mode (result): 0x%x\n", result); + return -EIO; + } + + sysfs_notify(kobj, NULL, attr->attr.name); + + return count; +} + +static ssize_t mini_led_mode_possible_values_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + switch (asus_bioscfg.mini_led_dev_id) { + case ASUS_WMI_DEVID_MINI_LED_MODE: + return sysfs_emit(buf, "0;1\n"); + case ASUS_WMI_DEVID_MINI_LED_MODE2: + return sysfs_emit(buf, "0;1;2\n"); + } + + return sysfs_emit(buf, "0\n"); +} + +ATTR_GROUP_ENUM_CUSTOM(mini_led_mode, "mini_led_mode", "Set the mini-LED backlight mode"); + +static ssize_t gpu_mux_mode_current_value_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t count) +{ + int result, err; + u32 optimus; + + err = kstrtou32(buf, 10, &optimus); + if (err) + return err; + + if (optimus > 1) + return -EINVAL; + + if (asus_bioscfg.dgpu_disable_available) { + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_DGPU, &result); + if (err) + return err; + if (err && !optimus) { + err = -ENODEV; + pr_warn("Can not switch MUX to dGPU mode when dGPU is disabled: %d\n", err); + return err; + } + } + + if (asus_bioscfg.egpu_enable_available) { + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_EGPU, &result); + if (err) + return err; + if (result && !optimus) { + err = -ENODEV; + pr_warn("Can not switch MUX to dGPU mode when eGPU is enabled: %d\n", err); + return err; + } + } + + err = asus_wmi_set_devstate(asus_bioscfg.gpu_mux_dev_id, optimus, &result); + if (err) { + pr_err("%s Failed to set GPU MUX mode: %d\nn", __func__, err); + return err; + } + /* !1 is considered a fail by ASUS */ + if (result != 1) { + pr_warn("%s Failed to set GPU MUX mode (result): 0x%x\n", __func__, result); + return -EIO; + } + + sysfs_notify(kobj, NULL, attr->attr.name); + + return count; +} +WMI_SHOW_INT(gpu_mux_mode_current_value, "%d\n", asus_bioscfg.gpu_mux_dev_id); +ATTR_GROUP_BOOL_CUSTOM(gpu_mux_mode, "gpu_mux_mode", "Set the GPU display MUX mode"); + +/* + * A user may be required to store the value twice, typcial store first, then + * rescan PCI bus to activate power, then store a second time to save correctly. + * The reason for this is that an extra code path in the ACPI is enabled when + * the device and bus are powered. + */ +static ssize_t dgpu_disable_current_value_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t count) +{ + int result, err; + u32 disable; + + result = kstrtou32(buf, 10, &disable); + if (result) + return result; + + if (disable > 1) + return -EINVAL; + + if (asus_bioscfg.gpu_mux_dev_id) { + err = asus_wmi_get_devstate_dsts(asus_bioscfg.gpu_mux_dev_id, &result); + if (err) + return err; + if (!result && disable) { + err = -ENODEV; + pr_warn("Can not disable dGPU when the MUX is in dGPU mode: %d\n", err); + return err; + } + } + + err = asus_wmi_set_devstate(ASUS_WMI_DEVID_DGPU, disable, &result); + if (err) { + pr_warn("Failed to set dgpu disable: %d\n", err); + return err; + } + + if (result > 1) { + pr_warn("Failed to set dgpu disable (result): 0x%x\n", result); + return -EIO; + } + + sysfs_notify(kobj, NULL, attr->attr.name); + + return count; +} +WMI_SHOW_INT(dgpu_disable_current_value, "%d\n", ASUS_WMI_DEVID_DGPU); +ATTR_GROUP_BOOL_CUSTOM(dgpu_disable, "dgpu_disable", "Disable the dGPU"); + +/* The ACPI call to enable the eGPU also disables the internal dGPU */ +static ssize_t egpu_enable_current_value_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t count) +{ + int result, err; + u32 enable; + + err = kstrtou32(buf, 10, &enable); + if (err) + return err; + + if (enable > 1) + return -EINVAL; + + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_EGPU_CONNECTED, &result); + if (err) { + pr_warn("Failed to get egpu connection status: %d\n", err); + return err; + } + + if (asus_bioscfg.gpu_mux_dev_id) { + err = asus_wmi_get_devstate_dsts(asus_bioscfg.gpu_mux_dev_id, &result); + if (err) { + pr_warn("Failed to get gpu mux status: %d\n", result); + return result; + } + if (!result && enable) { + err = -ENODEV; + pr_warn("Can not enable eGPU when the MUX is in dGPU mode: %d\n", err); + return err; + } + } + + err = asus_wmi_set_devstate(ASUS_WMI_DEVID_EGPU, enable, &result); + if (err) { + pr_warn("Failed to set egpu state: %d\n", err); + return err; + } + + if (result > 1) { + pr_warn("Failed to set egpu state (retval): 0x%x\n", result); + return -EIO; + } + + sysfs_notify(kobj, NULL, attr->attr.name); + + return count; +} +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_ENUM_INT_RW(thermal_policy, "thermal_policy", ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY, + 0, 3, "0;1;2", "Set the thermal profile: 0=normal, 1=performance, 2=quiet"); +ATTR_GROUP_PPT_RW(ppt_pl1_spl, "ppt_pl1_spl", ASUS_WMI_DEVID_PPT_PL1_SPL, + cpu_default, 5, cpu_max, 1, "Set the CPU slow package limit"); +ATTR_GROUP_PPT_RW(ppt_pl2_sppt, "ppt_pl2_sppt", ASUS_WMI_DEVID_PPT_PL2_SPPT, + cpu_default, 5, cpu_max, 1, "Set the CPU fast package limit"); +ATTR_GROUP_PPT_RW(ppt_apu_sppt, "ppt_apu_sppt", ASUS_WMI_DEVID_PPT_APU_SPPT, + platform_default, 5, platform_max, 1, "Set the CPU slow package limit"); +ATTR_GROUP_PPT_RW(ppt_platform_sppt, "ppt_platform_sppt", ASUS_WMI_DEVID_PPT_PLAT_SPPT, + platform_default, 5, platform_max, 1, "Set the CPU slow package limit"); +ATTR_GROUP_PPT_RW(ppt_fppt, "ppt_fppt", ASUS_WMI_DEVID_PPT_FPPT, + cpu_default, 5, cpu_max, 1, "Set the CPU slow package limit"); + +ATTR_GROUP_PPT_RW(nv_dynamic_boost, "nv_dynamic_boost", ASUS_WMI_DEVID_NV_DYN_BOOST, + nv_boost_default, 5, nv_boost_max, 1, "Set the Nvidia dynamic boost limit"); +ATTR_GROUP_PPT_RW(nv_temp_target, "nv_temp_target", ASUS_WMI_DEVID_NV_THERM_TARGET, + nv_temp_default, 75, 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"); +ATTR_GROUP_BOOL_RW(boot_sound, "boot_sound", ASUS_WMI_DEVID_BOOT_SOUND, + "Set the boot POST sound"); +ATTR_GROUP_BOOL_RW(mcu_powersave, "mcu_powersave", ASUS_WMI_DEVID_MCU_POWERSAVE, + "Set MCU powersaving mode"); +ATTR_GROUP_BOOL_RW(panel_od, "panel_overdrive", ASUS_WMI_DEVID_PANEL_OD, + "Set the panel refresh overdrive"); +ATTR_GROUP_BOOL_RW(panel_hd_mode, "panel_hd_mode", ASUS_WMI_DEVID_PANEL_HD, + "Set the panel HD mode to UHD<0> or FHD<1>"); +ATTR_GROUP_BOOL_RO(egpu_connected, "egpu_connected", ASUS_WMI_DEVID_EGPU_CONNECTED, + "Show the eGPU connection status"); + +static int asus_fw_attr_add(void) +{ + int ret; + + ret = fw_attributes_class_get(&fw_attr_class); + if (ret) + goto fail_class_created; + else + asus_bioscfg.fw_attr_dev = device_create(fw_attr_class, NULL, + MKDEV(0, 0), NULL, "%s", DRIVER_NAME); + + if (IS_ERR(asus_bioscfg.fw_attr_dev)) { + ret = PTR_ERR(asus_bioscfg.fw_attr_dev); + goto fail_class_created; + } + + asus_bioscfg.fw_attr_kset = kset_create_and_add("attributes", NULL, + &asus_bioscfg.fw_attr_dev->kobj); + if (!asus_bioscfg.fw_attr_dev) { + ret = -ENOMEM; + pr_debug("Failed to create and add attributes\n"); + goto err_destroy_classdev; + } + + /* Add any firmware_attributes required */ + ret = sysfs_create_file(&asus_bioscfg.fw_attr_kset->kobj, &pending_reboot.attr); + if (ret) { + pr_warn("Failed to create sysfs level attributes\n"); + goto fail_class_created; + } + + // TODO: logging + asus_bioscfg.mini_led_dev_id = 0; + if (asus_wmi_is_present(ASUS_WMI_DEVID_MINI_LED_MODE)) { + asus_bioscfg.mini_led_dev_id = ASUS_WMI_DEVID_MINI_LED_MODE; + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &mini_led_mode_attr_group); + } else if (asus_wmi_is_present(ASUS_WMI_DEVID_MINI_LED_MODE2)) { + asus_bioscfg.mini_led_dev_id = ASUS_WMI_DEVID_MINI_LED_MODE2; + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &mini_led_mode_attr_group); + } + + if (asus_wmi_is_present(ASUS_WMI_DEVID_GPU_MUX)) { + asus_bioscfg.gpu_mux_dev_id = ASUS_WMI_DEVID_GPU_MUX; + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &gpu_mux_mode_attr_group); + } else if (asus_wmi_is_present(ASUS_WMI_DEVID_GPU_MUX_VIVO)) { + asus_bioscfg.gpu_mux_dev_id = ASUS_WMI_DEVID_GPU_MUX_VIVO; + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &gpu_mux_mode_attr_group); + } + + if (asus_wmi_is_present(ASUS_WMI_DEVID_DGPU)) { + asus_bioscfg.dgpu_disable_available = true; + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &dgpu_disable_attr_group); + } + if (asus_wmi_is_present(ASUS_WMI_DEVID_EGPU)) { + asus_bioscfg.egpu_enable_available = true; + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &egpu_enable_attr_group); + } + if (asus_wmi_is_present(ASUS_WMI_DEVID_EGPU_CONNECTED)) + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &egpu_connected_attr_group); + + if (asus_wmi_is_present(ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY)) + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &thermal_policy_attr_group); + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_PL1_SPL)) + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_pl1_spl_attr_group); + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_PL2_SPPT)) + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_pl2_sppt_attr_group); + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_APU_SPPT)) + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_apu_sppt_attr_group); + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_PLAT_SPPT)) + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_platform_sppt_attr_group); + if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_FPPT)) + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &ppt_fppt_attr_group); + + if (asus_wmi_is_present(ASUS_WMI_DEVID_NV_DYN_BOOST)) + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &nv_dynamic_boost_attr_group); + if (asus_wmi_is_present(ASUS_WMI_DEVID_NV_THERM_TARGET)) + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &nv_temp_target_attr_group); + + if (asus_wmi_is_present(ASUS_WMI_DEVID_CHARGE_MODE)) + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &charge_mode_attr_group); + if (asus_wmi_is_present(ASUS_WMI_DEVID_BOOT_SOUND)) + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &boot_sound_attr_group); + if (asus_wmi_is_present(ASUS_WMI_DEVID_MCU_POWERSAVE)) + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &mcu_powersave_attr_group); + if (asus_wmi_is_present(ASUS_WMI_DEVID_PANEL_OD)) + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &panel_od_attr_group); + if (asus_wmi_is_present(ASUS_WMI_DEVID_PANEL_HD)) + sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &panel_hd_mode_attr_group); + + return 0; + +err_destroy_classdev: + device_destroy(fw_attr_class, MKDEV(0, 0)); + +fail_class_created: + fw_attributes_class_put(); + return ret; +} + +/* 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; + + /* + * ASUS product_name contains everything required, e.g, + * "ROG Flow X16 GV601VV_GV601VV_00185149B" + */ + product = dmi_get_system_info(DMI_PRODUCT_NAME); + + 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")) { + 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; + } + + 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_max = cpu_max; + + rog->platform_default = platform_default; + 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 = platform_default; + + rog->nv_boost_default = NVIDIA_BOOST_MAX; + 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_MAX; + rog->nv_temp_target = NVIDIA_TEMP_MIN; + +} + +static int __init asus_fw_init(void) +{ + int err; + + mutex_lock(&asus_bioscfg.mutex); + + asus_bioscfg.rog_tunables = kzalloc(sizeof(struct rog_tunables), GFP_KERNEL); + if (!asus_bioscfg.rog_tunables) { + mutex_unlock(&asus_bioscfg.mutex); + return -ENOMEM; + } + init_rog_tunables(asus_bioscfg.rog_tunables); + + err = asus_fw_attr_add(); + mutex_unlock(&asus_bioscfg.mutex); + if (err) + return err; + + return 0; +} + +static void __exit asus_fw_exit(void) +{ + mutex_lock(&asus_bioscfg.mutex); + + sysfs_remove_file(&asus_bioscfg.fw_attr_kset->kobj, &pending_reboot.attr); + kset_unregister(asus_bioscfg.fw_attr_kset); + device_destroy(fw_attr_class, MKDEV(0, 0)); + fw_attributes_class_put(); + + mutex_unlock(&asus_bioscfg.mutex); +} + +module_init(asus_fw_init); +module_exit(asus_fw_exit); diff --git a/drivers/platform/x86/asus-bioscfg.h b/drivers/platform/x86/asus-bioscfg.h new file mode 100644 index 000000000000..403563c25f53 --- /dev/null +++ b/drivers/platform/x86/asus-bioscfg.h @@ -0,0 +1,243 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * Definitions for kernel modules using asus-bios driver + * + * Copyright (c) 2024 Luke Jones <luke@ljones.dev> + */ + +#ifndef _ASUS_BIOSCFG_H_ +#define _ASUS_BIOSCFG_H_ + +#include "firmware_attributes_class.h" +#include <linux/types.h> + +#define DRIVER_NAME "asus-bioscfg" + +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) +{ + return sysfs_emit(buf, "enumeration\n"); +} + +#define __ASUS_ATTR_RO(_func, _name) { \ + .attr = { .name = __stringify(_name), .mode = 0444 }, \ + .show = _func##_##_name##_show, \ +} + +#define __ASUS_ATTR_RO_AS(_name, _show) { \ + .attr = { .name = __stringify(_name), .mode = 0444 }, \ + .show = _show, \ +} + +#define __ASUS_ATTR_RW(_func, _name) __ATTR(_name, 0644, \ + _func##_##_name##_show, _func##_##_name##_store) + +#define __WMI_STORE_INT(_attr, _min, _max, _wmi) \ +static ssize_t _attr##_store(struct kobject *kobj, \ + struct kobj_attribute *attr, \ + const char *buf, size_t count) \ +{ \ + return attr_int_store(kobj, attr, buf, count, _min, _max, NULL, _wmi); \ +} + +#define WMI_SHOW_INT(_attr, _fmt, _wmi) \ +static ssize_t _attr##_show(struct kobject *kobj, \ + struct kobj_attribute *attr, char *buf) \ +{ \ + u32 result; \ + int err; \ + err = asus_wmi_get_devstate_dsts(_wmi, &result); \ + if (err) \ + return err; \ + return sysfs_emit(buf, _fmt, \ + result & ~ASUS_WMI_DSTS_PRESENCE_BIT); \ +} + +/* Create functions and attributes for use in other macros or on their own */ + +#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, \ + _min, asus_bioscfg.rog_tunables->_max, \ + &asus_bioscfg.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_bioscfg.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_bioscfg.rog_tunables->_val);\ +} \ +static struct kobj_attribute attr_##_attrname##_##_prop = \ + __ASUS_ATTR_RO(_attrname, _prop) + +#define __ATTR_CURRENT_INT_RO(_attr, _wmi) \ +WMI_SHOW_INT(_attr##_current_value, "%d\n", _wmi); \ +static struct kobj_attribute attr_##_attr##_current_value = \ + __ASUS_ATTR_RO(_attr, current_value) + +#define __ATTR_CURRENT_INT_RW(_attr, _minv, _maxv, _wmi) \ +__WMI_STORE_INT(_attr##_current_value, _minv, _maxv, _wmi); \ +WMI_SHOW_INT(_attr##_current_value, "%d\n", _wmi); \ +static struct kobj_attribute attr_##_attr##_current_value = \ + __ASUS_ATTR_RW(_attr, current_value) + +/* Shows a formatted static variable */ +#define __ATTR_SHOW_FMT(_prop, _attrname, _fmt, _val) \ +static ssize_t _attrname##_##_prop##_show(struct kobject *kobj, \ + struct kobj_attribute *attr, char *buf) \ +{ \ + return sysfs_emit(buf, _fmt, _val); \ +} \ +static struct kobj_attribute attr_##_attrname##_##_prop = \ + __ASUS_ATTR_RO(_attrname, _prop) + +/* Int style min/max range, base macro. Requires current_value show&|store */ +#define __ATTR_GROUP_INT(_attrname, _fsname, _default, \ + _min, _max, _incstep, _dispname)\ +__ATTR_SHOW_FMT(default_value, _attrname, "%d\n", _default); \ +__ATTR_SHOW_FMT(min_value, _attrname, "%d\n", _min); \ +__ATTR_SHOW_FMT(max_value, _attrname, "%d\n", _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 \ +} + +/* Boolean style enumeration, base macro. Requires adding show/store */ +#define __ATTR_GROUP_ENUM(_attrname, _fsname, _possible, _dispname) \ +__ATTR_SHOW_FMT(display_name, _attrname, "%s\n", _dispname); \ +__ATTR_SHOW_FMT(possible_values, _attrname, "%s\n", _possible); \ +static struct kobj_attribute attr_##_attrname##_type = \ + __ASUS_ATTR_RO_AS(type, enum_type_show); \ +static struct attribute *_attrname##_attrs[] = { \ + &attr_##_attrname##_current_value.attr, \ + &attr_##_attrname##_display_name.attr, \ + &attr_##_attrname##_possible_values.attr, \ + &attr_##_attrname##_type.attr, \ + NULL \ +}; \ +static const struct attribute_group _attrname##_attr_group = { \ + .name = _fsname, \ + .attrs = _attrname##_attrs \ +} + +#define ATTR_GROUP_BOOL_RO(_attrname, _fsname, _wmi, _dispname) \ +do { \ + __ATTR_CURRENT_INT_RO(_attrname, _wmi); \ + __ATTR_GROUP_ENUM(_attrname, _fsname, "0;1", _dispname);\ +} while (0) + +#define ATTR_GROUP_BOOL_RW(_attrname, _fsname, _wmi, _dispname) \ +do { \ + __ATTR_CURRENT_INT_RW(_attrname, 0, 1, _wmi); \ + __ATTR_GROUP_ENUM(_attrname, _fsname, "0;1", _dispname);\ +} while (0) + +/* + * Requires <name>_current_value_show(), <name>_current_value_show() + */ +#define ATTR_GROUP_BOOL_CUSTOM(_attrname, _fsname, _dispname) \ +static struct kobj_attribute attr_##_attrname##_current_value = \ + __ASUS_ATTR_RW(_attrname, current_value); \ +__ATTR_GROUP_ENUM(_attrname, _fsname, "0;1", _dispname) + +#define ATTR_GROUP_ENUM_INT_RO(_attrname, _fsname, _wmi, \ + _possible, _dispname) \ +do { \ + __ATTR_CURRENT_INT_RO(_attrname, _wmi); \ + __ATTR_GROUP_ENUM(_attrname, _fsname, _possible, _dispname); \ +} while (0) + +#define ATTR_GROUP_ENUM_INT_RW(_attrname, _fsname, _wmi, _min, \ + _max, _possible, _dispname) \ +do { \ + __ATTR_CURRENT_INT_RW(_attrname, _min, _max, _wmi); \ + __ATTR_GROUP_ENUM(_attrname, _fsname, _possible, _dispname); \ +} while (0) + +/* + * Requires <name>_current_value_show(), <name>_current_value_show() + * and <name>_possible_values_show() + */ +#define ATTR_GROUP_ENUM_CUSTOM(_attrname, _fsname, _dispname) \ +__ATTR_SHOW_FMT(display_name, _attrname, "%s\n", _dispname); \ +static struct kobj_attribute attr_##_attrname##_current_value = \ + __ASUS_ATTR_RW(_attrname, current_value); \ +static struct kobj_attribute attr_##_attrname##_possible_values = \ + __ASUS_ATTR_RO(_attrname, possible_values); \ +static struct kobj_attribute attr_##_attrname##_type = \ + __ASUS_ATTR_RO_AS(type, enum_type_show); \ +static struct attribute *_attrname##_attrs[] = { \ + &attr_##_attrname##_current_value.attr, \ + &attr_##_attrname##_display_name.attr, \ + &attr_##_attrname##_possible_values.attr, \ + &attr_##_attrname##_type.attr, \ + NULL \ +}; \ +static const struct attribute_group _attrname##_attr_group = { \ + .name = _fsname, \ + .attrs = _attrname##_attrs \ +} + +/* ROG PPT attributes need a little different in setup */ +#define ATTR_GROUP_PPT_RW(_attrname, _fsname, _wmi, _default, \ + _min, _max, _incstep, _dispname) \ +__ROG_TUNABLE_RW(_attrname, _min, _max, _wmi); \ +__ROG_TUNABLE_SHOW(default_value, _attrname, _default); \ +__ATTR_SHOW_FMT(min_value, _attrname, "%d\n", _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_ */ diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 2b968003cb9b..3f1998638fea 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -529,12 +529,28 @@ static int asus_wmi_get_devstate(struct asus_wmi *asus, u32 dev_id, u32 *retval) return 0; } -static int asus_wmi_set_devstate(u32 dev_id, u32 ctrl_param, +int asus_wmi_get_devstate_dsts(u32 dev_id, u32 *retval) +{ + int err; + + err = asus_wmi_evaluate_method(ASUS_WMI_METHODID_DSTS, dev_id, 0, retval); + if (err) + return err; + + if (*retval == ~0) + return -ENODEV; + + return 0; +} +EXPORT_SYMBOL_GPL(asus_wmi_get_devstate_dsts); + +int asus_wmi_set_devstate(u32 dev_id, u32 ctrl_param, u32 *retval) { return asus_wmi_evaluate_method(ASUS_WMI_METHODID_DEVS, dev_id, ctrl_param, retval); } +EXPORT_SYMBOL_GPL(asus_wmi_set_devstate); /* Helper for special devices with magic return codes */ static int asus_wmi_get_devstate_bits(struct asus_wmi *asus, diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h index 74b32e1d6735..889336a932fb 100644 --- a/include/linux/platform_data/x86/asus-wmi.h +++ b/include/linux/platform_data/x86/asus-wmi.h @@ -67,6 +67,7 @@ #define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY 0x00120075 /* Misc */ +#define ASUS_WMI_DEVID_PANEL_HD 0x0005001C #define ASUS_WMI_DEVID_PANEL_OD 0x00050019 #define ASUS_WMI_DEVID_CAMERA 0x00060013 #define ASUS_WMI_DEVID_LID_FLIP 0x00060062 @@ -152,8 +153,18 @@ #define ASUS_WMI_DSTS_LIGHTBAR_MASK 0x0000000F #if IS_REACHABLE(CONFIG_ASUS_WMI) +int asus_wmi_get_devstate_dsts(u32 dev_id, u32 *retval); +int asus_wmi_set_devstate(u32 dev_id, u32 ctrl_param, u32 *retval); int asus_wmi_evaluate_method(u32 method_id, u32 arg0, u32 arg1, u32 *retval); #else +static int asus_wmi_get_devstate_dsts(u32 dev_id, u32 *retval) +{ + return -ENODEV; +} +static int asus_wmi_set_devstate(u32 dev_id, u32 ctrl_param, u32 *retval) +{ + return -ENODEV; +} static inline int asus_wmi_evaluate_method(u32 method_id, u32 arg0, u32 arg1, u32 *retval) {
The fw_attributes_class provides a much cleaner interface to all of the attributes introduced to asus-wmi. This patch moves all of these extra attributes over to fw_attributes_class, and shifts the bulk of these definitions to a new kernel module to reduce the clutter of asus-wmi with the intention of deprecating the asus-wmi attributes in future. The work applies only to WMI methods which don't have a clearly defined place within the sysfs and as a result ended up lumped together in /sys/devices/platform/asus-nb-wmi/ with no standard API. Where possible the fw attrs now implement defaults, min, max, scalar, choices, etc. As en example dgpu_disable becomes: /sys/class/firmware-attributes/asus-bioscfg/attributes/dgpu_disable/ ├── current_value ├── display_name ├── possible_values └── type as do other attributes. Signed-off-by: Luke D. Jones <luke@ljones.dev> --- drivers/platform/x86/Kconfig | 14 + drivers/platform/x86/Makefile | 1 + drivers/platform/x86/asus-bioscfg.c | 666 +++++++++++++++++++++ drivers/platform/x86/asus-bioscfg.h | 243 ++++++++ drivers/platform/x86/asus-wmi.c | 18 +- include/linux/platform_data/x86/asus-wmi.h | 11 + 6 files changed, 952 insertions(+), 1 deletion(-) create mode 100644 drivers/platform/x86/asus-bioscfg.c create mode 100644 drivers/platform/x86/asus-bioscfg.h