hwmon: (dell-smm) Add cooling device support

Until now, only the temperature sensors where exported thru
the thermal subsystem. Export the fans as "dell-smm-fan[1-3]" too
to make them available as cooling devices.
Also update Documentation and fix a minor issue with the alphabetic
ordering of the includes.

Signed-off-by: Armin Wolf <W_Armin@gmx.de>
Link: https://lore.kernel.org/r/20220410163935.7840-1-W_Armin@gmx.de
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/Documentation/hwmon/dell-smm-hwmon.rst b/Documentation/hwmon/dell-smm-hwmon.rst
index d3323a96665d6fa7ad16b1e7949a0f904c568060..41839b7de2c13d58366eca6f47fb04bdff868b36 100644 (file)
--- a/Documentation/hwmon/dell-smm-hwmon.rst
+++ b/Documentation/hwmon/dell-smm-hwmon.rst
@@ -86,6 +86,13 @@ probe the BIOS on your machine and discover the appropriate codes.
 
 Again, when you find new codes, we'd be happy to have your patches!
 
+``thermal`` interface
+---------------------------
+
+The driver also exports the fans as thermal cooling devices with
+``type`` set to ``dell-smm-fan[1-3]``. This allows for easy fan control
+using one of the thermal governors.
+
 Module parameters
 -----------------
 

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index d35d74ef6497a345e486cb04f25e8ee9f77f0c7b..7fc3dacc471020beb3fbdaec909d00bd9c8bbb84 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -500,6 +500,7 @@ config SENSORS_DS1621
 config SENSORS_DELL_SMM
        tristate "Dell laptop SMM BIOS hwmon driver"
        depends on X86
+       imply THERMAL
        help
          This hwmon driver adds support for reporting temperature of different
          sensors and controls the fans on Dell laptops via System Management

diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c
index 84cb1ede7bc0b016de75641a70f3657b2ac4ca08..30b6f0c280930d5ce84c9e348547a41ca8dbd70d 100644 (file)
--- a/drivers/hwmon/dell-smm-hwmon.c
+++ b/drivers/hwmon/dell-smm-hwmon.c
@@ -21,14 +21,17 @@
 #include <linux/errno.h>
 #include <linux/hwmon.h>
 #include <linux/init.h>
+#include <linux/kconfig.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-#include <linux/string.h>
+#include <linux/slab.h>
 #include <linux/smp.h>
+#include <linux/string.h>
+#include <linux/thermal.h>
 #include <linux/types.h>
 #include <linux/uaccess.h>
 
@@ -80,6 +83,11 @@ struct dell_smm_data {
        int *fan_nominal_speed[DELL_SMM_NO_FANS];
 };
 
+struct dell_smm_cooling_data {
+       u8 fan_num;
+       struct dell_smm_data *data;
+};
+
 MODULE_AUTHOR("Massimo Dal Zotto (dz@debian.org)");
 MODULE_AUTHOR("Pali Rohár <pali@kernel.org>");
 MODULE_DESCRIPTION("Dell laptop SMM BIOS hwmon driver");
@@ -638,9 +646,50 @@ static void __init i8k_init_procfs(struct device *dev)
 
 #endif
 
-/*
- * Hwmon interface
- */
+static int dell_smm_get_max_state(struct thermal_cooling_device *dev, unsigned long *state)
+{
+       struct dell_smm_cooling_data *cdata = dev->devdata;
+
+       *state = cdata->data->i8k_fan_max;
+
+       return 0;
+}
+
+static int dell_smm_get_cur_state(struct thermal_cooling_device *dev, unsigned long *state)
+{
+       struct dell_smm_cooling_data *cdata = dev->devdata;
+       int ret;
+
+       ret = i8k_get_fan_status(cdata->data, cdata->fan_num);
+       if (ret < 0)
+               return ret;
+
+       *state = ret;
+
+       return 0;
+}
+
+static int dell_smm_set_cur_state(struct thermal_cooling_device *dev, unsigned long state)
+{
+       struct dell_smm_cooling_data *cdata = dev->devdata;
+       struct dell_smm_data *data = cdata->data;
+       int ret;
+
+       if (state > data->i8k_fan_max)
+               return -EINVAL;
+
+       mutex_lock(&data->i8k_mutex);
+       ret = i8k_set_fan(data, cdata->fan_num, (int)state);
+       mutex_unlock(&data->i8k_mutex);
+
+       return ret;
+}
+
+static const struct thermal_cooling_device_ops dell_smm_cooling_ops = {
+       .get_max_state = dell_smm_get_max_state,
+       .get_cur_state = dell_smm_get_cur_state,
+       .set_cur_state = dell_smm_set_cur_state,
+};
 
 static umode_t dell_smm_is_visible(const void *drvdata, enum hwmon_sensor_types type, u32 attr,
                                   int channel)
@@ -941,6 +990,37 @@ static const struct hwmon_chip_info dell_smm_chip_info = {
        .info = dell_smm_info,
 };
 
+static int __init dell_smm_init_cdev(struct device *dev, u8 fan_num)
+{
+       struct dell_smm_data *data = dev_get_drvdata(dev);
+       struct thermal_cooling_device *cdev;
+       struct dell_smm_cooling_data *cdata;
+       int ret = 0;
+       char *name;
+
+       name = kasprintf(GFP_KERNEL, "dell-smm-fan%u", fan_num + 1);
+       if (!name)
+               return -ENOMEM;
+
+       cdata = devm_kmalloc(dev, sizeof(*cdata), GFP_KERNEL);
+       if (cdata) {
+               cdata->fan_num = fan_num;
+               cdata->data = data;
+               cdev = devm_thermal_of_cooling_device_register(dev, NULL, name, cdata,
+                                                              &dell_smm_cooling_ops);
+               if (IS_ERR(cdev)) {
+                       devm_kfree(dev, cdata);
+                       ret = PTR_ERR(cdev);
+               }
+       } else {
+               ret = -ENOMEM;
+       }
+
+       kfree(name);
+
+       return ret;
+}
+
 static int __init dell_smm_init_hwmon(struct device *dev)
 {
        struct dell_smm_data *data = dev_get_drvdata(dev);
@@ -967,6 +1047,15 @@ static int __init dell_smm_init_hwmon(struct device *dev)
                        continue;
 
                data->fan[i] = true;
+
+               /* the cooling device is not critical, ignore failures */
+               if (IS_REACHABLE(CONFIG_THERMAL)) {
+                       err = dell_smm_init_cdev(dev, i);
+                       if (err < 0)
+                               dev_warn(dev, "Failed to register cooling device for fan %u\n",
+                                        i + 1);
+               }
+
                data->fan_nominal_speed[i] = devm_kmalloc_array(dev, data->i8k_fan_max + 1,
                                                                sizeof(*data->fan_nominal_speed[i]),
                                                                GFP_KERNEL);