platform/x86: asus-wmi: add support for vivobook fan profiles

Add support for vivobook fan profiles wmi call on the ASUS VIVOBOOK
to adjust power limits.

These fan profiles have a different device id than the ROG series
and different order. This reorders the existing modes.

As part of keeping the patch clean the throttle_thermal_policy_available
boolean stored in the driver struct is removed and
throttle_thermal_policy_dev is used in place (as on init it is zeroed).

Co-developed-by: Luke D. Jones <luke@ljones.dev>
Signed-off-by: Luke D. Jones <luke@ljones.dev>
Signed-off-by: Mohamed Ghanmi <mohamed.ghanmi@supcom.tn>
Reviewed-by: Luke D. Jones <luke@ljones.dev>
Link: https://lore.kernel.org/r/20240609144849.2532-2-mohamed.ghanmi@supcom.tn
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index cc735931f97b93be2329e2039d22994456a16584..00669cf678fb17d1502d69d5c05526fade8331e2 100644 (file)
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -97,6 +97,12 @@ module_param(fnlock_default, bool, 0444);
 #define ASUS_THROTTLE_THERMAL_POLICY_OVERBOOST 1
 #define ASUS_THROTTLE_THERMAL_POLICY_SILENT    2
 
+#define ASUS_THROTTLE_THERMAL_POLICY_DEFAULT_VIVO      0
+#define ASUS_THROTTLE_THERMAL_POLICY_SILENT_VIVO       1
+#define ASUS_THROTTLE_THERMAL_POLICY_OVERBOOST_VIVO    2
+
+#define PLATFORM_PROFILE_MAX 2
+
 #define USB_INTEL_XUSB2PR              0xD0
 #define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI  0x9c31
 
@@ -286,8 +292,8 @@ struct asus_wmi {
        u32 kbd_rgb_dev;
        bool kbd_rgb_state_available;
 
-       bool throttle_thermal_policy_available;
        u8 throttle_thermal_policy_mode;
+       u32 throttle_thermal_policy_dev;
 
        bool cpu_fan_curve_available;
        bool gpu_fan_curve_available;
@@ -3162,7 +3168,7 @@ static int fan_curve_get_factory_default(struct asus_wmi *asus, u32 fan_dev)
        int err, fan_idx;
        u8 mode = 0;
 
-       if (asus->throttle_thermal_policy_available)
+       if (asus->throttle_thermal_policy_dev)
                mode = asus->throttle_thermal_policy_mode;
        /* DEVID_<C/G>PU_FAN_CURVE is switched for OVERBOOST vs SILENT */
        if (mode == 2)
@@ -3369,7 +3375,7 @@ static ssize_t fan_curve_enable_store(struct device *dev,
                 * For machines with throttle this is the only way to reset fans
                 * to default mode of operation (does not erase curve data).
                 */
-               if (asus->throttle_thermal_policy_available) {
+               if (asus->throttle_thermal_policy_dev) {
                        err = throttle_thermal_policy_write(asus);
                        if (err)
                                return err;
@@ -3586,8 +3592,8 @@ static const struct attribute_group asus_fan_curve_attr_group = {
 __ATTRIBUTE_GROUPS(asus_fan_curve_attr);
 
 /*
- * Must be initialised after throttle_thermal_policy_check_present() as
- * we check the status of throttle_thermal_policy_available during init.
+ * Must be initialised after throttle_thermal_policy_dev is set as
+ * we check the status of throttle_thermal_policy_dev during init.
  */
 static int asus_wmi_custom_fan_curve_init(struct asus_wmi *asus)
 {
@@ -3628,38 +3634,13 @@ static int asus_wmi_custom_fan_curve_init(struct asus_wmi *asus)
 }
 
 /* Throttle thermal policy ****************************************************/
-
-static int throttle_thermal_policy_check_present(struct asus_wmi *asus)
-{
-       u32 result;
-       int err;
-
-       asus->throttle_thermal_policy_available = false;
-
-       err = asus_wmi_get_devstate(asus,
-                                   ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY,
-                                   &result);
-       if (err) {
-               if (err == -ENODEV)
-                       return 0;
-               return err;
-       }
-
-       if (result & ASUS_WMI_DSTS_PRESENCE_BIT)
-               asus->throttle_thermal_policy_available = true;
-
-       return 0;
-}
-
 static int throttle_thermal_policy_write(struct asus_wmi *asus)
 {
-       int err;
-       u8 value;
+       u8 value = asus->throttle_thermal_policy_mode;
        u32 retval;
+       int err;
 
-       value = asus->throttle_thermal_policy_mode;
-
-       err = asus_wmi_set_devstate(ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY,
+       err = asus_wmi_set_devstate(asus->throttle_thermal_policy_dev,
                                    value, &retval);
 
        sysfs_notify(&asus->platform_device->dev.kobj, NULL,
@@ -3689,7 +3670,7 @@ static int throttle_thermal_policy_write(struct asus_wmi *asus)
 
 static int throttle_thermal_policy_set_default(struct asus_wmi *asus)
 {
-       if (!asus->throttle_thermal_policy_available)
+       if (!asus->throttle_thermal_policy_dev)
                return 0;
 
        asus->throttle_thermal_policy_mode = ASUS_THROTTLE_THERMAL_POLICY_DEFAULT;
@@ -3701,7 +3682,7 @@ static int throttle_thermal_policy_switch_next(struct asus_wmi *asus)
        u8 new_mode = asus->throttle_thermal_policy_mode + 1;
        int err;
 
-       if (new_mode > ASUS_THROTTLE_THERMAL_POLICY_SILENT)
+       if (new_mode > PLATFORM_PROFILE_MAX)
                new_mode = ASUS_THROTTLE_THERMAL_POLICY_DEFAULT;
 
        asus->throttle_thermal_policy_mode = new_mode;
@@ -3740,7 +3721,7 @@ static ssize_t throttle_thermal_policy_store(struct device *dev,
        if (result < 0)
                return result;
 
-       if (new_mode > ASUS_THROTTLE_THERMAL_POLICY_SILENT)
+       if (new_mode > PLATFORM_PROFILE_MAX)
                return -EINVAL;
 
        asus->throttle_thermal_policy_mode = new_mode;
@@ -3757,10 +3738,52 @@ static ssize_t throttle_thermal_policy_store(struct device *dev,
        return count;
 }
 
-// Throttle thermal policy: 0 - default, 1 - overboost, 2 - silent
+/*
+ * Throttle thermal policy: 0 - default, 1 - overboost, 2 - silent
+ */
 static DEVICE_ATTR_RW(throttle_thermal_policy);
 
 /* Platform profile ***********************************************************/
+static int asus_wmi_platform_profile_to_vivo(struct asus_wmi *asus, int mode)
+{
+       bool vivo;
+
+       vivo = asus->throttle_thermal_policy_dev == ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY_VIVO;
+
+       if (vivo) {
+               switch (mode) {
+               case ASUS_THROTTLE_THERMAL_POLICY_DEFAULT:
+                       return ASUS_THROTTLE_THERMAL_POLICY_DEFAULT_VIVO;
+               case ASUS_THROTTLE_THERMAL_POLICY_OVERBOOST:
+                       return ASUS_THROTTLE_THERMAL_POLICY_OVERBOOST_VIVO;
+               case ASUS_THROTTLE_THERMAL_POLICY_SILENT:
+                       return ASUS_THROTTLE_THERMAL_POLICY_SILENT_VIVO;
+               }
+       }
+
+       return mode;
+}
+
+static int asus_wmi_platform_profile_mode_from_vivo(struct asus_wmi *asus, int mode)
+{
+       bool vivo;
+
+       vivo = asus->throttle_thermal_policy_dev == ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY_VIVO;
+
+       if (vivo) {
+               switch (mode) {
+               case ASUS_THROTTLE_THERMAL_POLICY_DEFAULT_VIVO:
+                       return ASUS_THROTTLE_THERMAL_POLICY_DEFAULT;
+               case ASUS_THROTTLE_THERMAL_POLICY_OVERBOOST_VIVO:
+                       return ASUS_THROTTLE_THERMAL_POLICY_OVERBOOST;
+               case ASUS_THROTTLE_THERMAL_POLICY_SILENT_VIVO:
+                       return ASUS_THROTTLE_THERMAL_POLICY_SILENT;
+               }
+       }
+
+       return mode;
+}
+
 static int asus_wmi_platform_profile_get(struct platform_profile_handler *pprof,
                                        enum platform_profile_option *profile)
 {
@@ -3768,10 +3791,9 @@ static int asus_wmi_platform_profile_get(struct platform_profile_handler *pprof,
        int tp;
 
        asus = container_of(pprof, struct asus_wmi, platform_profile_handler);
-
        tp = asus->throttle_thermal_policy_mode;
 
-       switch (tp) {
+       switch (asus_wmi_platform_profile_mode_from_vivo(asus, tp)) {
        case ASUS_THROTTLE_THERMAL_POLICY_DEFAULT:
                *profile = PLATFORM_PROFILE_BALANCED;
                break;
@@ -3810,7 +3832,7 @@ static int asus_wmi_platform_profile_set(struct platform_profile_handler *pprof,
                return -EOPNOTSUPP;
        }
 
-       asus->throttle_thermal_policy_mode = tp;
+       asus->throttle_thermal_policy_mode = asus_wmi_platform_profile_to_vivo(asus, tp);
        return throttle_thermal_policy_write(asus);
 }
 
@@ -3823,7 +3845,7 @@ static int platform_profile_setup(struct asus_wmi *asus)
         * Not an error if a component platform_profile relies on is unavailable
         * so early return, skipping the setup of platform_profile.
         */
-       if (!asus->throttle_thermal_policy_available)
+       if (!asus->throttle_thermal_policy_dev)
                return 0;
 
        dev_info(dev, "Using throttle_thermal_policy for platform_profile support\n");
@@ -4238,7 +4260,7 @@ static void asus_wmi_handle_event_code(int code, struct asus_wmi *asus)
        if (code == NOTIFY_KBD_FBM || code == NOTIFY_KBD_TTP) {
                if (asus->fan_boost_mode_available)
                        fan_boost_mode_switch_next(asus);
-               if (asus->throttle_thermal_policy_available)
+               if (asus->throttle_thermal_policy_dev)
                        throttle_thermal_policy_switch_next(asus);
                return;
 
@@ -4410,7 +4432,7 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj,
        else if (attr == &dev_attr_fan_boost_mode.attr)
                ok = asus->fan_boost_mode_available;
        else if (attr == &dev_attr_throttle_thermal_policy.attr)
-               ok = asus->throttle_thermal_policy_available;
+               ok = asus->throttle_thermal_policy_dev != 0;
        else if (attr == &dev_attr_ppt_pl2_sppt.attr)
                devid = ASUS_WMI_DEVID_PPT_PL2_SPPT;
        else if (attr == &dev_attr_ppt_pl1_spl.attr)
@@ -4702,16 +4724,15 @@ static int asus_wmi_add(struct platform_device *pdev)
        else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE2))
                asus->kbd_rgb_dev = ASUS_WMI_DEVID_TUF_RGB_MODE2;
 
+       if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY))
+               asus->throttle_thermal_policy_dev = ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY;
+       else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY_VIVO))
+               asus->throttle_thermal_policy_dev = ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY_VIVO;
+
        err = fan_boost_mode_check_present(asus);
        if (err)
                goto fail_fan_boost_mode;
 
-       err = throttle_thermal_policy_check_present(asus);
-       if (err)
-               goto fail_throttle_thermal_policy;
-       else
-               throttle_thermal_policy_set_default(asus);
-
        err = platform_profile_setup(asus);
        if (err)
                goto fail_platform_profile_setup;
@@ -4806,7 +4827,6 @@ fail_hwmon:
 fail_input:
        asus_wmi_sysfs_exit(asus->platform_device);
 fail_sysfs:
-fail_throttle_thermal_policy:
 fail_custom_fan_curve:
 fail_platform_profile_setup:
        if (asus->platform_profile_support)

diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h
index 0aeeae1c19430b1c8ba2907b02ea63e0d5451fd2..5e6f407b2def54d76bb42f9406c6719fcf63ab49 100644 (file)
--- a/include/linux/platform_data/x86/asus-wmi.h
+++ b/include/linux/platform_data/x86/asus-wmi.h
@@ -68,6 +68,7 @@
 #define ASUS_WMI_DEVID_SCREENPAD_LIGHT 0x00050032
 #define ASUS_WMI_DEVID_FAN_BOOST_MODE  0x00110018
 #define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY 0x00120075
+#define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY_VIVO 0x00110019
 
 /* Misc */
 #define ASUS_WMI_DEVID_PANEL_OD                0x00050019