Add support for custom fan curves found on some ASUS ROG laptops. This has been fairly widely tested by the asus-rog community now and should be in a good state for merging now. - V1 + Initial patch work - V2 + Don't fail and remove wmi driver if error from asus_wmi_evaluate_method_buf() if error is -ENODEV - V3 + Store the "default" fan curves + Call throttle_thermal_policy_write() if a curve is erased to ensure that the factory default for a profile is applied again - V4 + Do not apply default curves by default. Testers have found that the default curves don't quite match actual no-curve behaviours + Add method to enable/disable curves for each profile - V5 + Remove an unrequired function left over from previous iterations + Ensure default curves are applied if user writes " " to a curve path + Rename "active_fan_curve_profiles" to "enabled_fan_curve_profiles" to better reflect the behavious of this setting + Move throttle_thermal_policy_write_*pu_curves() and rename to fan_curve_*pu_write() + Merge fan_curve_check_valid() and fan_curve_write() + Remove some leftover debug statements - V6 + Refactor data structs to store array or u8 instead of strings. This affects the entire patch except the enabled_fan_curves block + Use sysfs_match_string in enabled_fan_curve block + Add some extra comments to describe things + Allow some variation in how fan curve input can be formatted + Use SENSOR_DEVICE_ATTR_2_RW() to reduce the amount of lines per fan+profile combo drastically - V7 + Further refactor to use pwm1_auto_point1_temp + pwm1_auto_point1_pwm format, creating two blocks of attributes for CPU and GPU fans + Remove storing of defualt curves and method to reset them. The factory defaults are still populated in to structs on module load so users have a starting point - V8 + Make asus_wmi_evaluate_method_buf() safe + Take in to account machines that do not have throttle_thermal_policy but do have a single custom fan curve. These machines can't use a throttle_thermal mode change to reset the fans to factory default if fan curve is disabled so we need to write their stored default back. In some cases this is also needed due to mistakes in ASUS ACPI tables. + Formatting tidy and dev_err() use + Extra comments to make certain things (such as above) more clear + Give generated hwmon a more descriptive `name asus_custom_fan_curve` - V9 + Cleanup and remove per-profile setting + Call `asus_fan_set_auto()` if method supported to ensure fan state is reset on these models + Add extra case (3) to related `pwm<N>_enable`s for fan curves to reset the used curve to factory default + Related to the above is that if throttle_thermal_policy is supported then the fetched factory default curve is correct for the current throttle_thermal_policy_mode + Ensure that if throttle_thermal_policy_mode is changed then fan_curve is set to disabled. + Ensure the same for pwm1_enable_store() - V10 - Better handling of conditions in asus_wmi_evaluate_method_buf() - Correct a mistaken conversion to percentage for temperature - Remove unused function - Formating corrections - Update or remove various comments - Update commit message to better reflect purpose of patch - V11 - Remove fan_curve_verify() as this prevented easily adjusting a fan curve and there is no good way to give user feedback on fan-curve validity unless checked in userspace - V12 - Remove unused old_value as caught by CI + Reported-by: kernel test robot <lkp@xxxxxxxxx> - Rebase on upstream master 78e709522d2c012cb0daad2e668506637bffb7c2 - V13 - Fix the errors related to old_value where I didn't remove the old code + Reported-by: kernel test robot <lkp@xxxxxxxxx> - V14 - Fix incorrect logic in fan_curve_get_factory_default() - Ensure fan_curve_enable_show() displays correct status for state - V15 - Remove unused "default" fan curve store as these are read from the hardware when required - Use correct `to_sensor_dev_attr` for pwm<N>_enable instead of to_sensor_dev_attr_2 - Don't call fan_curve_attr_2_select 3 times in fan_curve_show() - General code quality cleanup Luke D. Jones (1): asus-wmi: Add support for custom fan curves drivers/platform/x86/asus-wmi.c | 614 ++++++++++++++++++++- include/linux/platform_data/x86/asus-wmi.h | 2 + 2 files changed, 608 insertions(+), 8 deletions(-) -- 2.32.0