hwmon: Add System76 Thelio Io driver
Subsystems (2)
PATCH 1/1 hwmon: Add System76 Thelio Io driver
This driver allows fan control using System76 Thelio Io.
--- MAINTAINERS | 9 +- drivers/hwmon/Kconfig | 10 + drivers/hwmon/Makefile | 1 + drivers/hwmon/system76-thelio-io.c | 424 +++++++++++++++++++++++++++++ 4 files changed, 443 insertions(+), 1 deletion(-) create mode 100644 drivers/hwmon/system76-thelio-io.c
MAINTAINERS +8 -1
@@ -20733,11 +20733,18 @@ F: include/uapi/linux/stm.h SYSTEM76 ACPI DRIVER M: Jeremy Soller <[email protected]> -M: System76 Product Development <[email protected]> +M: System76 <[email protected]> L: [email protected] S: Maintained F: drivers/platform/x86/system76_acpi.c +SYSTEM76 THELIO IO DRIVER +M: Jeremy Soller <[email protected]> +M: System76 <[email protected]> +L: [email protected] +S: Maintained +F: drivers/hwmon/system76-thelio-io.c + SYSV FILESYSTEM S: Orphan F: Documentation/filesystems/sysv-fs.rst
drivers/hwmon/Kconfig +10 -0
@@ -2433,6 +2433,16 @@ config SENSORS_HP_WMI This driver can also be built as a module. If so, the module will be called hp_wmi_sensors. +config SENSORS_SYSTEM76_THELIO_IO + tristate "System76 Thelio Io controller" + depends on HID + help + If you say yes here you get support for the System76 Thelio Io + controller. + + This driver can also be built as a module. If so, the module + will be called system76-thelio-io. + endif # ACPI endif # HWMON
drivers/hwmon/Makefile +1 -0
@@ -199,6 +199,7 @@ obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o obj-$(CONFIG_SENSORS_SPARX5) += sparx5-temp.o obj-$(CONFIG_SENSORS_STTS751) += stts751.o obj-$(CONFIG_SENSORS_SY7636A) += sy7636a-hwmon.o +obj-$(CONFIG_SENSORS_SYSTEM76_THELIO_IO) += system76-thelio-io.o obj-$(CONFIG_SENSORS_AMC6821) += amc6821.o obj-$(CONFIG_SENSORS_TC74) += tc74.o obj-$(CONFIG_SENSORS_THMC50) += thmc50.o
drivers/hwmon/system76-thelio-io.c new file +424 -0
424 lines not on this page · raw message
Signature · 1 line
2.34.1
Guenter Roeck
maintainerQuoted 2 lines · Jeremy Soller
This driver allows fan control using System76 Thelio Io.
Explain what that is. If this is more than a fan controller, clarify that and explain why other functionality is not supported.
Read and follow Documentation/hwmon/submitting-patches.rst. Just by browsing through the code I can see at least five violations.
Quoted 6 lines
Signed-off-by Jeremy Soller <[email protected]>--- MAINTAINERS | 9 +- drivers/hwmon/Kconfig | 10 + drivers/hwmon/Makefile | 1 + drivers/hwmon/system76-thelio-io.c | 424 +++++++++++++++++++++++++++++
* Document the driver in Documentation/hwmon/<driver_name>.rst.
MAINTAINERS F: include/uapi/linux/stm.h · line 20736
Quoted 13 lines
4 files changed, 443 insertions(+), 1 deletion(-) create mode 100644 drivers/hwmon/system76-thelio-io.cMAINTAINERS +1
-1@@ -20733,11 +20733,18 @@ F: include/uapi/linux/stm.h SYSTEM76 ACPI DRIVER M: Jeremy Soller <[email protected]> -M: System76 Product Development <[email protected]> +M: System76 <[email protected]>
* Never mix bug fixes, cleanup, and functional enhancements in a single patch.
This change is completely unrelated and inappropriate in this patch.
Quoted 22 lines
MAINTAINERS +7
-0L: [email protected] S: Maintained F: drivers/platform/x86/system76_acpi.c +SYSTEM76 THELIO IO DRIVER +M: Jeremy Soller <[email protected]> +M: System76 <[email protected]> +L: [email protected] +S: Maintained +F: drivers/hwmon/system76-thelio-io.c + SYSV FILESYSTEM S: Orphan F: Documentation/filesystems/sysv-fs.rstdrivers/hwmon/Kconfig +0
-0@@ -2433,6 +2433,16 @@ config SENSORS_HP_WMI This driver can also be built as a module. If so, the module will be called hp_wmi_sensors.
drivers/hwmon/Kconfig config SENSORS_HP_WMI · line 2445
Quoted 10 lines
drivers/hwmon/Kconfig +10
-0+config SENSORS_SYSTEM76_THELIO_IO + tristate "System76 Thelio Io controller" + depends on HID + help + If you say yes here you get support for the System76 Thelio Io + controller. + + This driver can also be built as a module. If so, the module + will be called system76-thelio-io. +
Why would this driver silently depend on ACPI ?
Quoted 39 lines
drivers/hwmon/Kconfig +0
-0endif # ACPI endif # HWMONdrivers/hwmon/Makefile +1
-0@@ -199,6 +199,7 @@ obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o obj-$(CONFIG_SENSORS_SPARX5) += sparx5-temp.o obj-$(CONFIG_SENSORS_STTS751) += stts751.o obj-$(CONFIG_SENSORS_SY7636A) += sy7636a-hwmon.o +obj-$(CONFIG_SENSORS_SYSTEM76_THELIO_IO) += system76-thelio-io.o obj-$(CONFIG_SENSORS_AMC6821) += amc6821.o obj-$(CONFIG_SENSORS_TC74) += tc74.o obj-$(CONFIG_SENSORS_THMC50) += thmc50.odrivers/hwmon/system76-thelio-io.c new file +18
-0@@ -0,0 +1,424 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* +* system76-thelio-io.c - Linux driver for System76 Thelio Io +* Copyright (C) 2023 System76 +* +* Based on: +* corsair-cpro.c - Linux driver for Corsair Commander Pro +* Copyright (C) 2020 Marius Zachmann <[email protected]> +* +* This driver uses hid reports to communicate with the device to allow hidraw userspace drivers +* still being used. The device does not use report ids. When using hidraw and this driver +* simultaniously, reports could be switched. +*/ + +#include <linux/bitops.h> +#include <linux/completion.h> +#include <linux/hid.h>
drivers/hwmon/system76-thelio-io.c line 28
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+#include <linux/hwmon.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/slab.h> +#include <linux/suspend.h> +#include <linux/types.h> + +#define BUFFER_SIZE 32 +#define REQ_TIMEOUT 300
#define<space>DEFINE<tab>value
Quoted 6 lines
drivers/hwmon/system76-thelio-io.c new file +6
-0+ +#define HID_CMD 0 +#define HID_RES 1 +#define HID_DATA 2 + +#define CMD_FAN_GET 7
drivers/hwmon/system76-thelio-io.c line 44
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+#define CMD_FAN_SET 8 +#define CMD_LED_SET_MODE 16 +#define CMD_FAN_TACH 22 + +struct thelio_io_device { +struct hid_device *hdev; +struct device *hwmon_dev; +#ifdef CONFIG_PM_SLEEP +struct notifier_block pm_notifier; +#endif
You'll need to explain in detail why normal pm callback functions would not work.
drivers/hwmon/system76-thelio-io.c line 57
Quoted 13 lines
drivers/hwmon/system76-thelio-io.c new file +13
-0+struct completion wait_input_report; +struct mutex mutex;/* whenever buffer is used, lock before send_usb_cmd */ +u8 *buffer; +}; + +/* converts response error in buffer to errno */ +static int thelio_io_get_errno (struct thelio_io_device *thelio_io) +{ +switch (thelio_io->buffer[HID_RES ]) { +case 0x00 :/* success */ +return 0 ; +default : +hid_err (thelio_io->hdev,"unknown response error: %d" , thelio_io->buffer[HID_RES ]);
* Limit the number of kernel log messages. In general, your driver should not generate an error message just because a runtime operation failed. Report errors to user space instead, using an appropriate error code. Keep in mind that kernel error log messages not only fill up the kernel log, but also are printed synchronously, most likely with interrupt disabled, often to a serial console. Excessive logging can seriously affect system performance.
drivers/hwmon/system76-thelio-io.c line 64
Quoted 7 lines
drivers/hwmon/system76-thelio-io.c new file +7
-0+return -EIO ; + } +} + +/* send command, check for error in response, response in thelio_io->buffer */ +static int send_usb_cmd (struct thelio_io_device *thelio_io,u8 command, +u8 byte1,u8 byte2,u8 byte3)
* Please run your patch through 'checkpatch --strict'. There should be no errors, no warnings, and few if any check messages. If there are any messages, please be prepared to explain.
Quoted 9 lines
drivers/hwmon/system76-thelio-io.c new file +9
-0+{ +unsigned long t; +int ret; + +memset (thelio_io->buffer,0x00 ,BUFFER_SIZE ); + thelio_io->buffer[HID_CMD ] = command; + thelio_io->buffer[HID_DATA ] = byte1; + thelio_io->buffer[HID_DATA +1 ] = byte2; + thelio_io->buffer[HID_DATA +2 ] = byte3;
drivers/hwmon/system76-thelio-io.c line 83
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+ +reinit_completion (&thelio_io->wait_input_report); + + ret =hid_hw_output_report (thelio_io->hdev, thelio_io->buffer,BUFFER_SIZE ); +if (ret <0 ) +return ret; + + t =wait_for_completion_timeout (&thelio_io->wait_input_report, +msecs_to_jiffies (REQ_TIMEOUT )); +if (!t)
Unnecessary variable.
if (!wait_for_completion_timeout())
Quoted 23 lines
drivers/hwmon/system76-thelio-io.c new file +23
-0+return -ETIMEDOUT ; + +return thelio_io_get_errno (thelio_io); +} + +static int thelio_io_raw_event (struct hid_device *hdev,struct hid_report *report, +u8 *data,int size) +{ +struct thelio_io_device *thelio_io =hid_get_drvdata (hdev); + +/* only copy buffer when requested */ +if (completion_done (&thelio_io->wait_input_report)) +return 0 ; + +memcpy (thelio_io->buffer, data,min (BUFFER_SIZE , size)); +complete (&thelio_io->wait_input_report); + +return 0 ; +} + +/* requests and returns single data values depending on channel */ +static int get_data (struct thelio_io_device *thelio_io,int command,int channel, +bool two_byte_data)
drivers/hwmon/system76-thelio-io.c line 116
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+{ +int ret; + +mutex_lock (&thelio_io->mutex); + + ret =send_usb_cmd (thelio_io, command, channel,0 ,0 ); +if (ret) + goto out_unlock; + + ret = (int )thelio_io->buffer[HID_DATA +1 ];
Unnecessary typecast. There is no need for one for a u8 -> int conversion.
drivers/hwmon/system76-thelio-io.c line 118
Quoted 2 lines
drivers/hwmon/system76-thelio-io.c new file +2
-0+if (two_byte_data) + ret |= (((int )thelio_io->buffer[HID_DATA +2 ]) <<8 );
Same here.
Quoted 164 lines
drivers/hwmon/system76-thelio-io.c new file +164
-0+ +out_unlock: +mutex_unlock (&thelio_io->mutex); +return ret; +} + +static int set_pwm (struct thelio_io_device *thelio_io,int channel,long val) +{ +int ret; + +if (val <0 || val >255 ) +return -EINVAL ; + +mutex_lock (&thelio_io->mutex); + + ret =send_usb_cmd (thelio_io,CMD_FAN_SET , channel, val,0 ); + +mutex_unlock (&thelio_io->mutex); +return ret; +} + +static int thelio_io_read_string (struct device *dev,enum hwmon_sensor_types type, +u32 attr,int channel,const char **str) +{ +switch (type) { +case hwmon_fan: +switch (attr) { +case hwmon_fan_label: +switch (channel) { +case 0 : + *str ="CPU Fan" ; +return 0 ; +case 1 : + *str ="Intake Fan" ; +return 0 ; +case 2 : + *str ="GPU Fan" ; +return 0 ; +case 3 : + *str ="Aux Fan" ; +return 0 ; +default : +break ; + } +default : +break ; + } +break ; +default : +break ; + } + +return -EOPNOTSUPP ; +} + +static int thelio_io_read (struct device *dev,enum hwmon_sensor_types type, +u32 attr,int channel,long *val) +{ +struct thelio_io_device *thelio_io =dev_get_drvdata (dev); +int ret; + +switch (type) { +case hwmon_fan: +switch (attr) { +case hwmon_fan_input: + ret =get_data (thelio_io,CMD_FAN_TACH , channel, true); +if (ret <0 ) +return ret; + *val = ret; +return 0 ; +default : +break ; + } +break ; +case hwmon_pwm: +switch (attr) { +case hwmon_pwm_input: + ret =get_data (thelio_io,CMD_FAN_GET , channel, false); +if (ret <0 ) +return ret; + *val = ret; +return 0 ; +default : +break ; + } +break ; +default : +break ; + } + +return -EOPNOTSUPP ; +}; + +static int thelio_io_write (struct device *dev,enum hwmon_sensor_types type, +u32 attr,int channel,long val) +{ +struct thelio_io_device *thelio_io =dev_get_drvdata (dev); + +switch (type) { +case hwmon_pwm: +switch (attr) { +case hwmon_pwm_input: +return set_pwm (thelio_io, channel, val); +default : +break ; + } +break ; +default : +break ; + } + +return -EOPNOTSUPP ; +}; + +static umode_t thelio_io_is_visible (const void *data,enum hwmon_sensor_types type, +u32 attr,int channel) +{ +switch (type) { +case hwmon_fan: +switch (attr) { +case hwmon_fan_input: +return 0444 ; +case hwmon_fan_label: +return 0444 ; +default : +break ; + } +break ; +case hwmon_pwm: +switch (attr) { +case hwmon_pwm_input: +return 0644 ; +default : +break ; + } +break ; +default : +break ; + } + +return 0 ; +}; + +static const struct hwmon_ops thelio_io_hwmon_ops = { + .is_visible = thelio_io_is_visible, + .read = thelio_io_read, + .read_string = thelio_io_read_string, + .write = thelio_io_write, +}; + +static const struct hwmon_channel_info *thelio_io_info[] = { +HWMON_CHANNEL_INFO (chip, +HWMON_C_REGISTER_TZ ), +HWMON_CHANNEL_INFO (fan, +HWMON_F_INPUT |HWMON_F_LABEL , +HWMON_F_INPUT |HWMON_F_LABEL , +HWMON_F_INPUT |HWMON_F_LABEL , +HWMON_F_INPUT |HWMON_F_LABEL + ), + HWMON_CHANNEL_INFO(pwm, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT
drivers/hwmon/system76-thelio-io.c line 292
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+ ), + NULL +}; + +static const struct hwmon_chip_info thelio_io_chip_info = { + .ops = &thelio_io_hwmon_ops, + .info = thelio_io_info, +}; + +#ifdef CONFIG_PM_SLEEP
Again, you'll need to explain in detail why the standard pm callback functions won't work.
Quoted 53 lines
drivers/hwmon/system76-thelio-io.c new file +53
-0+static int thelio_io_pm (struct notifier_block *nb,unsigned long action,void *data) +{ + struct thelio_io_device *thelio_io = container_of(nb, struct thelio_io_device, pm_notifier); + +switch (action) { +case PM_HIBERNATION_PREPARE : +case PM_SUSPEND_PREPARE : +mutex_lock (&thelio_io->mutex); +send_usb_cmd (thelio_io,CMD_LED_SET_MODE ,0 ,1 ,0 ); +mutex_unlock (&thelio_io->mutex); +break ; + +case PM_POST_HIBERNATION : +case PM_POST_SUSPEND : +mutex_lock (&thelio_io->mutex); +send_usb_cmd (thelio_io,CMD_LED_SET_MODE ,0 ,0 ,0 ); +mutex_unlock (&thelio_io->mutex); +break ; + +case PM_POST_RESTORE : +case PM_RESTORE_PREPARE : +default : +break ; + } + +return NOTIFY_DONE ; +} +#endif + +static int thelio_io_probe (struct hid_device *hdev,const struct hid_device_id *id) +{ +struct thelio_io_device *thelio_io; +int ret; + + thelio_io =devm_kzalloc (&hdev->dev,sizeof (*thelio_io),GFP_KERNEL ); +if (!thelio_io) +return -ENOMEM ; + + thelio_io->buffer =devm_kmalloc (&hdev->dev,BUFFER_SIZE ,GFP_KERNEL ); +if (!thelio_io->buffer) +return -ENOMEM ; + + ret =hid_parse (hdev); +if (ret) +return ret; + + ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT ); +if (ret) +return ret; + + ret =hid_hw_open (hdev); +if (ret) + goto out_hw_stop;
drivers/hwmon/system76-thelio-io.c line 355
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+ + thelio_io->hdev = hdev; +hid_set_drvdata (hdev, thelio_io); +mutex_init (&thelio_io->mutex); +init_completion (&thelio_io->wait_input_report); + +hid_device_io_start (hdev); + +if (hdev->maxcollection ==1 && hdev->collection[0 ].usage ==0xFF600061 ) { +hid_info (hdev,"found command device\n" );
Now this is really noise.
drivers/hwmon/system76-thelio-io.c line 367
Quoted 12 lines
drivers/hwmon/system76-thelio-io.c new file +12
-0+ thelio_io->hwmon_dev =hwmon_device_register_with_info (&hdev->dev, +"system76_thelio_io" , thelio_io, &thelio_io_chip_info,0 ); +if (IS_ERR (thelio_io->hwmon_dev)) { + ret =PTR_ERR (thelio_io->hwmon_dev); + goto out_hw_close; + } + +#ifdef CONFIG_PM_SLEEP + thelio_io->pm_notifier.notifier_call = thelio_io_pm; +register_pm_notifier (&thelio_io->pm_notifier); +#endif + }
This leaves the driver running even if there is no hwmon device, and let it just sit there doing nothing. What would be the point of that ?
Quoted 7 lines
drivers/hwmon/system76-thelio-io.c new file +7
-0+ +return 0 ; + +out_hw_close: +hid_hw_close (hdev); +out_hw_stop: +hid_hw_stop (hdev);
drivers/hwmon/system76-thelio-io.c line 384
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+return ret; +} + +static void thelio_io_remove (struct hid_device *hdev) +{ +struct thelio_io_device *thelio_io =hid_get_drvdata (hdev); + +#ifdef CONFIG_PM_SLEEP +unregister_pm_notifier (&thelio_io->pm_notifier); +#endif
.... and then, worse, it tries to unregister a pm notifier which it never registered because it didn't register a hwmon device and didn't bail out either.
drivers/hwmon/system76-thelio-io.c line 394
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+ +if (thelio_io->hwmon_dev) +hwmon_device_unregister (thelio_io->hwmon_dev); + +hid_hw_close (hdev); +hid_hw_stop (hdev); +} + +static const struct hid_device_id thelio_io_devices[] = { + {HID_USB_DEVICE (0x3384 ,0x000B ) },// thelio_io_2
* Please use the standard multi-line comment style. Do not mix C and C++ style comments in a single driver (with the exception of the SPDX license identifier).
Quoted 32 lines
drivers/hwmon/system76-thelio-io.c new file +30
-0+ { } +}; + +static struct hid_driver thelio_io_driver = { + .name ="system76-thelio-io" , + .id_table = thelio_io_devices, + .probe = thelio_io_probe, + .remove = thelio_io_remove, + .raw_event = thelio_io_raw_event, +}; + +MODULE_DEVICE_TABLE (hid, thelio_io_devices); +MODULE_LICENSE ("GPL" ); + +static int __init thelio_io_init (void ) +{ +return hid_register_driver (&thelio_io_driver); +} + +static void __exit thelio_io_exit(void) +{ +hid_unregister_driver (&thelio_io_driver); +} + +/* +* When compiling this driver as built-in, hwmon initcalls will get called before the +* hid driver and this driver would fail to register. late_initcall solves this. +*/ +late_initcall (thelio_io_init); +module_exit (thelio_io_exit);Signature · 1 line
2.34.1
Quoted 6 lines · Guenter Roeck
Quoted 2 lines · Jeremy Soller
This driver allows fan control using System76 Thelio Io.
Explain what that is. If this is more than a fan controller, clarify that and explain why other functionality is not supported.
All functionality of this controller is exposed by this driver in its present state.
Quoted 4 lines
Read and follow
Documentation/hwmon/submitting-patches.rst. Just by browsing through the code I can see at least five violations.
I will read this. I did ./scripts/checkpatch.pl already to ensure style was conformant.
Quoted 9 lines
Quoted 7 lines
Signed-off-by Jeremy Soller <[email protected]>--- MAINTAINERS | 9 +- drivers/hwmon/Kconfig | 10 + drivers/hwmon/Makefile | 1 + drivers/hwmon/system76-thelio-io.c | 424 +++++++++++++++++++++++++++++* Document the driver in Documentation/hwmon/<driver_name>.rst.
Will do.
Quoted 10 lines
Quoted 10 lines
4 files changed, 443 insertions(+), 1 deletion(-) create mode 100644 drivers/hwmon/system76-thelio-io.cMAINTAINERS +0
-0@@ -20733,11 +20733,18 @@ F: include/uapi/linux/stm.h
Quoted 8 lines
MAINTAINERS F: include/uapi/linux/stm.h · line 20736
Quoted 4 lines
MAINTAINERS +1
-1SYSTEM76 ACPI DRIVER M: Jeremy Soller <[email protected]> -M: System76 Product Development <[email protected]> +M: System76 <[email protected]>* Never mix bug fixes, cleanup, and functional enhancements in a single patch.
This change is completely unrelated and inappropriate in this patch.
That is fine, I will remove this change. I noticed the email was incorrect but can put that in a separate patch.
Quoted 23 lines
Quoted 23 lines
MAINTAINERS +7
-0L: [email protected] S: Maintained F: drivers/platform/x86/system76_acpi.c +SYSTEM76 THELIO IO DRIVER +M: Jeremy Soller <[email protected]> +M: System76 <[email protected]> +L: [email protected] +S: Maintained +F: drivers/hwmon/system76-thelio-io.c + SYSV FILESYSTEM S: Orphan F: Documentation/filesystems/sysv-fs.rstdrivers/hwmon/Kconfig +0
-0@@ -2433,6 +2433,16 @@ config SENSORS_HP_WMI This driver can also be built as a module. If so, the module will be called hp_wmi_sensors.
Quoted 13 lines
drivers/hwmon/Kconfig config SENSORS_HP_WMI · line 2445
Quoted 10 lines
drivers/hwmon/Kconfig +10
-0+config SENSORS_SYSTEM76_THELIO_IO + tristate "System76 Thelio Io controller" + depends on HID + help + If you say yes here you get support for the System76 Thelio Io + controller. + + This driver can also be built as a module. If so, the module + will be called system76-thelio-io. +Why would this driver silently depend on ACPI ?
It can be moved out of the ifdef. I was just adding it to the end of a very long list and did not see this.
Quoted 43 lines
Quoted 43 lines
drivers/hwmon/Kconfig +0
-0endif # ACPI endif # HWMONdrivers/hwmon/Makefile +1
-0@@ -199,6 +199,7 @@ obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o obj-$(CONFIG_SENSORS_SPARX5) += sparx5-temp.o obj-$(CONFIG_SENSORS_STTS751) += stts751.o obj-$(CONFIG_SENSORS_SY7636A) += sy7636a-hwmon.o +obj-$(CONFIG_SENSORS_SYSTEM76_THELIO_IO) += system76-thelio-io.o obj-$(CONFIG_SENSORS_AMC6821) += amc6821.o obj-$(CONFIG_SENSORS_TC74) += tc74.o obj-$(CONFIG_SENSORS_THMC50) += thmc50.odrivers/hwmon/system76-thelio-io.c new file +22
-0@@ -0,0 +1,424 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* +* system76-thelio-io.c - Linux driver for System76 Thelio Io +* Copyright (C) 2023 System76 +* +* Based on: +* corsair-cpro.c - Linux driver for Corsair Commander Pro +* Copyright (C) 2020 Marius Zachmann <[email protected]> +* +* This driver uses hid reports to communicate with the device to allow hidraw userspace drivers +* still being used. The device does not use report ids. When using hidraw and this driver +* simultaniously, reports could be switched. +*/ + +#include <linux/bitops.h> +#include <linux/completion.h> +#include <linux/hid.h> +#include <linux/hwmon.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/mutex.h>
Quoted 8 lines
drivers/hwmon/system76-thelio-io.c line 28
Quoted 6 lines
drivers/hwmon/system76-thelio-io.c new file +6
-0+#include <linux/slab.h> +#include <linux/suspend.h> +#include <linux/types.h> + +#define BUFFER_SIZE 32 +#define REQ_TIMEOUT 300#define<space>DEFINE<tab>value
Will do.
Quoted 11 lines
Quoted 11 lines
drivers/hwmon/system76-thelio-io.c new file +11
-0+ +#define HID_CMD 0 +#define HID_RES 1 +#define HID_DATA 2 + +#define CMD_FAN_GET 7 +#define CMD_FAN_SET 8 +#define CMD_LED_SET_MODE 16 +#define CMD_FAN_TACH 22 + +struct thelio_io_device {
Quoted 9 lines
drivers/hwmon/system76-thelio-io.c line 44
Quoted 5 lines
drivers/hwmon/system76-thelio-io.c new file +5
-0+struct hid_device *hdev; +struct device *hwmon_dev; +#ifdef CONFIG_PM_SLEEP +struct notifier_block pm_notifier; +#endif You'll need to explain in detail why normal pm callback functions would not work.
I am not aware of the difference. The controller needs to know when the system suspends and resumes, this was one way I found to accomplish this. If there is a better way, point me to an example.
Quoted 21 lines
drivers/hwmon/system76-thelio-io.c line 57
Quoted 13 lines
drivers/hwmon/system76-thelio-io.c new file +13
-0+struct completion wait_input_report; +struct mutex mutex;/* whenever buffer is used, lock before send_usb_cmd */ +u8 *buffer; +}; + +/* converts response error in buffer to errno */ +static int thelio_io_get_errno (struct thelio_io_device *thelio_io) +{ +switch (thelio_io->buffer[HID_RES ]) { +case 0x00 :/* success */ +return 0 ; +default : +hid_err (thelio_io->hdev,"unknown response error: %d" , thelio_io->buffer[HID_RES ]);* Limit the number of kernel log messages. In general, your driver should not generate an error message just because a runtime operation failed. Report errors to user space instead, using an appropriate error code. Keep in mind that kernel error log messages not only fill up the kernel log, but also are printed synchronously, most likely with interrupt disabled, often to a serial console. Excessive logging can seriously affect system performance.
Quoted 12 lines
drivers/hwmon/system76-thelio-io.c line 64
Quoted 7 lines
drivers/hwmon/system76-thelio-io.c new file +7
-0+return -EIO ; + } +} + +/* send command, check for error in response, response in thelio_io->buffer */ +static int send_usb_cmd (struct thelio_io_device *thelio_io,u8 command, +u8 byte1,u8 byte2,u8 byte3)* Please run your patch through 'checkpatch --strict'. There should be no errors, no warnings, and few if any check messages. If there are any messages, please be prepared to explain.
I already ran this patch through checkpatch. If strict is required, I will do that with the next version I submit.
Quoted 308 lines
Quoted 9 lines
drivers/hwmon/system76-thelio-io.c new file +9
-0+{ +unsigned long t; +int ret; + +memset (thelio_io->buffer,0x00 ,BUFFER_SIZE ); + thelio_io->buffer[HID_CMD ] = command; + thelio_io->buffer[HID_DATA ] = byte1; + thelio_io->buffer[HID_DATA +1 ] = byte2; + thelio_io->buffer[HID_DATA +2 ] = byte3;drivers/hwmon/system76-thelio-io.c line 83
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+ +reinit_completion (&thelio_io->wait_input_report); + + ret =hid_hw_output_report (thelio_io->hdev, thelio_io->buffer,BUFFER_SIZE ); +if (ret <0 ) +return ret; + + t =wait_for_completion_timeout (&thelio_io->wait_input_report, +msecs_to_jiffies (REQ_TIMEOUT )); +if (!t)Unnecessary variable.
if (!wait_for_completion_timeout())Quoted 23 lines
drivers/hwmon/system76-thelio-io.c new file +23
-0+return -ETIMEDOUT ; + +return thelio_io_get_errno (thelio_io); +} + +static int thelio_io_raw_event (struct hid_device *hdev,struct hid_report *report, +u8 *data,int size) +{ +struct thelio_io_device *thelio_io =hid_get_drvdata (hdev); + +/* only copy buffer when requested */ +if (completion_done (&thelio_io->wait_input_report)) +return 0 ; + +memcpy (thelio_io->buffer, data,min (BUFFER_SIZE , size)); +complete (&thelio_io->wait_input_report); + +return 0 ; +} + +/* requests and returns single data values depending on channel */ +static int get_data (struct thelio_io_device *thelio_io,int command,int channel, +bool two_byte_data)drivers/hwmon/system76-thelio-io.c line 116
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+{ +int ret; + +mutex_lock (&thelio_io->mutex); + + ret =send_usb_cmd (thelio_io, command, channel,0 ,0 ); +if (ret) + goto out_unlock; + + ret = (int )thelio_io->buffer[HID_DATA +1 ];Unnecessary typecast. There is no need for one for a u8 -> int conversion.
drivers/hwmon/system76-thelio-io.c line 118
Quoted 2 lines
drivers/hwmon/system76-thelio-io.c new file +2
-0+if (two_byte_data) + ret |= (((int )thelio_io->buffer[HID_DATA +2 ]) <<8 );Same here.
Quoted 164 lines
drivers/hwmon/system76-thelio-io.c new file +164
-0+ +out_unlock: +mutex_unlock (&thelio_io->mutex); +return ret; +} + +static int set_pwm (struct thelio_io_device *thelio_io,int channel,long val) +{ +int ret; + +if (val <0 || val >255 ) +return -EINVAL ; + +mutex_lock (&thelio_io->mutex); + + ret =send_usb_cmd (thelio_io,CMD_FAN_SET , channel, val,0 ); + +mutex_unlock (&thelio_io->mutex); +return ret; +} + +static int thelio_io_read_string (struct device *dev,enum hwmon_sensor_types type, +u32 attr,int channel,const char **str) +{ +switch (type) { +case hwmon_fan: +switch (attr) { +case hwmon_fan_label: +switch (channel) { +case 0 : + *str ="CPU Fan" ; +return 0 ; +case 1 : + *str ="Intake Fan" ; +return 0 ; +case 2 : + *str ="GPU Fan" ; +return 0 ; +case 3 : + *str ="Aux Fan" ; +return 0 ; +default : +break ; + } +default : +break ; + } +break ; +default : +break ; + } + +return -EOPNOTSUPP ; +} + +static int thelio_io_read (struct device *dev,enum hwmon_sensor_types type, +u32 attr,int channel,long *val) +{ +struct thelio_io_device *thelio_io =dev_get_drvdata (dev); +int ret; + +switch (type) { +case hwmon_fan: +switch (attr) { +case hwmon_fan_input: + ret =get_data (thelio_io,CMD_FAN_TACH , channel, true); +if (ret <0 ) +return ret; + *val = ret; +return 0 ; +default : +break ; + } +break ; +case hwmon_pwm: +switch (attr) { +case hwmon_pwm_input: + ret =get_data (thelio_io,CMD_FAN_GET , channel, false); +if (ret <0 ) +return ret; + *val = ret; +return 0 ; +default : +break ; + } +break ; +default : +break ; + } + +return -EOPNOTSUPP ; +}; + +static int thelio_io_write (struct device *dev,enum hwmon_sensor_types type, +u32 attr,int channel,long val) +{ +struct thelio_io_device *thelio_io =dev_get_drvdata (dev); + +switch (type) { +case hwmon_pwm: +switch (attr) { +case hwmon_pwm_input: +return set_pwm (thelio_io, channel, val); +default : +break ; + } +break ; +default : +break ; + } + +return -EOPNOTSUPP ; +}; + +static umode_t thelio_io_is_visible (const void *data,enum hwmon_sensor_types type, +u32 attr,int channel) +{ +switch (type) { +case hwmon_fan: +switch (attr) { +case hwmon_fan_input: +return 0444 ; +case hwmon_fan_label: +return 0444 ; +default : +break ; + } +break ; +case hwmon_pwm: +switch (attr) { +case hwmon_pwm_input: +return 0644 ; +default : +break ; + } +break ; +default : +break ; + } + +return 0 ; +}; + +static const struct hwmon_ops thelio_io_hwmon_ops = { + .is_visible = thelio_io_is_visible, + .read = thelio_io_read, + .read_string = thelio_io_read_string, + .write = thelio_io_write, +}; + +static const struct hwmon_channel_info *thelio_io_info[] = { +HWMON_CHANNEL_INFO (chip, +HWMON_C_REGISTER_TZ ), +HWMON_CHANNEL_INFO (fan, +HWMON_F_INPUT |HWMON_F_LABEL , +HWMON_F_INPUT |HWMON_F_LABEL , +HWMON_F_INPUT |HWMON_F_LABEL , +HWMON_F_INPUT |HWMON_F_LABEL + ), + HWMON_CHANNEL_INFO(pwm, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUTdrivers/hwmon/system76-thelio-io.c line 292
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+ ), + NULL +}; + +static const struct hwmon_chip_info thelio_io_chip_info = { + .ops = &thelio_io_hwmon_ops, + .info = thelio_io_info, +}; + +#ifdef CONFIG_PM_SLEEP Again, you'll need to explain in detail why the standard pm callback functions won't work.
Quoted 53 lines
drivers/hwmon/system76-thelio-io.c new file +53
-0+static int thelio_io_pm (struct notifier_block *nb,unsigned long action,void *data) +{ + struct thelio_io_device *thelio_io = container_of(nb, struct thelio_io_device, pm_notifier); + +switch (action) { +case PM_HIBERNATION_PREPARE : +case PM_SUSPEND_PREPARE : +mutex_lock (&thelio_io->mutex); +send_usb_cmd (thelio_io,CMD_LED_SET_MODE ,0 ,1 ,0 ); +mutex_unlock (&thelio_io->mutex); +break ; + +case PM_POST_HIBERNATION : +case PM_POST_SUSPEND : +mutex_lock (&thelio_io->mutex); +send_usb_cmd (thelio_io,CMD_LED_SET_MODE ,0 ,0 ,0 ); +mutex_unlock (&thelio_io->mutex); +break ; + +case PM_POST_RESTORE : +case PM_RESTORE_PREPARE : +default : +break ; + } + +return NOTIFY_DONE ; +} +#endif + +static int thelio_io_probe (struct hid_device *hdev,const struct hid_device_id *id) +{ +struct thelio_io_device *thelio_io; +int ret; + + thelio_io =devm_kzalloc (&hdev->dev,sizeof (*thelio_io),GFP_KERNEL ); +if (!thelio_io) +return -ENOMEM ; + + thelio_io->buffer =devm_kmalloc (&hdev->dev,BUFFER_SIZE ,GFP_KERNEL ); +if (!thelio_io->buffer) +return -ENOMEM ; + + ret =hid_parse (hdev); +if (ret) +return ret; + + ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT ); +if (ret) +return ret; + + ret =hid_hw_open (hdev); +if (ret) + goto out_hw_stop;drivers/hwmon/system76-thelio-io.c line 355
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+ + thelio_io->hdev = hdev; +hid_set_drvdata (hdev, thelio_io); +mutex_init (&thelio_io->mutex); +init_completion (&thelio_io->wait_input_report); + +hid_device_io_start (hdev); + +if (hdev->maxcollection ==1 && hdev->collection[0 ].usage ==0xFF600061 ) { +hid_info (hdev,"found command device\n" );Now this is really noise.
Quoted 16 lines
drivers/hwmon/system76-thelio-io.c line 367
Quoted 12 lines
drivers/hwmon/system76-thelio-io.c new file +12
-0+ thelio_io->hwmon_dev =hwmon_device_register_with_info (&hdev->dev, +"system76_thelio_io" , thelio_io, &thelio_io_chip_info,0 ); +if (IS_ERR (thelio_io->hwmon_dev)) { + ret =PTR_ERR (thelio_io->hwmon_dev); + goto out_hw_close; + } + +#ifdef CONFIG_PM_SLEEP + thelio_io->pm_notifier.notifier_call = thelio_io_pm; +register_pm_notifier (&thelio_io->pm_notifier); +#endif + }This leaves the driver running even if there is no hwmon device, and let it just sit there doing nothing. What would be the point of that ?
There is something critical here that I have found that will either need to be allowed or an alternative be proposed. I found that returning an error here, due to this being a composite device, causes all the other interfaces on the device to not be probed by their correct drivers. Above, you will see an explicit check for the HID usage of this HID device matching the command device's expected HID usage. This probe function runs on multiple interfaces, and for some reason, if it returns an error, the HID subsystem does not continue with probing. I did not find a way to only probe on the correct interface. Again, if there is a way to do this, please let me know.
Quoted 69 lines
Quoted 7 lines
drivers/hwmon/system76-thelio-io.c new file +7
-0+ +return 0 ; + +out_hw_close: +hid_hw_close (hdev); +out_hw_stop: +hid_hw_stop (hdev);drivers/hwmon/system76-thelio-io.c line 384
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+return ret; +} + +static void thelio_io_remove (struct hid_device *hdev) +{ +struct thelio_io_device *thelio_io =hid_get_drvdata (hdev); + +#ifdef CONFIG_PM_SLEEP +unregister_pm_notifier (&thelio_io->pm_notifier); +#endif .... and then, worse, it tries to unregister a pm notifier which it never registered because it didn't register a hwmon device and didn't bail out either.
drivers/hwmon/system76-thelio-io.c line 394
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+ +if (thelio_io->hwmon_dev) +hwmon_device_unregister (thelio_io->hwmon_dev); + +hid_hw_close (hdev); +hid_hw_stop (hdev); +} + +static const struct hid_device_id thelio_io_devices[] = { + {HID_USB_DEVICE (0x3384 ,0x000B ) },// thelio_io_2 * Please use the standard multi-line comment style. Do not mix C and C++ style comments in a single driver (with the exception of the SPDX license identifier).
Quoted 32 lines
drivers/hwmon/system76-thelio-io.c new file +30
-0+ { } +}; + +static struct hid_driver thelio_io_driver = { + .name ="system76-thelio-io" , + .id_table = thelio_io_devices, + .probe = thelio_io_probe, + .remove = thelio_io_remove, + .raw_event = thelio_io_raw_event, +}; + +MODULE_DEVICE_TABLE (hid, thelio_io_devices); +MODULE_LICENSE ("GPL" ); + +static int __init thelio_io_init (void ) +{ +return hid_register_driver (&thelio_io_driver); +} + +static void __exit thelio_io_exit(void) +{ +hid_unregister_driver (&thelio_io_driver); +} + +/* +* When compiling this driver as built-in, hwmon initcalls will get called before the +* hid driver and this driver would fail to register. late_initcall solves this. +*/ +late_initcall (thelio_io_init); +module_exit (thelio_io_exit);Signature · 1 line
2.34.1
PATCH v2 1/1 hwmon: Add System76 Thelio Io driver
This driver fully supports the System76 Thelio Io, by exposing fan controls and sending the system suspend/resume state.
--- MAINTAINERS | 7 + drivers/hwmon/Kconfig | 10 + drivers/hwmon/Makefile | 1 + drivers/hwmon/system76-thelio-io.c | 424 +++++++++++++++++++++++++++++ 4 files changed, 442 insertions(+) create mode 100644 drivers/hwmon/system76-thelio-io.c
MAINTAINERS +7 -0
@@ -20738,6 +20738,13 @@ L: [email protected] S: Maintained F: drivers/platform/x86/system76_acpi.c +SYSTEM76 THELIO IO DRIVER +M: Jeremy Soller <[email protected]> +M: System76 <[email protected]> +L: [email protected] +S: Maintained +F: drivers/hwmon/system76-thelio-io.c + SYSV FILESYSTEM S: Orphan F: Documentation/filesystems/sysv-fs.rst
drivers/hwmon/Kconfig +10 -0
@@ -1965,6 +1965,16 @@ config SENSORS_SMM665 This driver can also be built as a module. If so, the module will be called smm665. +config SENSORS_SYSTEM76_THELIO_IO + tristate "System76 Thelio Io controller" + depends on HID + help + If you say yes here you get support for the System76 Thelio Io + controller. + + This driver can also be built as a module. If so, the module + will be called system76-thelio-io. + config SENSORS_ADC128D818 tristate "Texas Instruments ADC128D818" depends on I2C
drivers/hwmon/Makefile +1 -0
@@ -199,6 +199,7 @@ obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o obj-$(CONFIG_SENSORS_SPARX5) += sparx5-temp.o obj-$(CONFIG_SENSORS_STTS751) += stts751.o obj-$(CONFIG_SENSORS_SY7636A) += sy7636a-hwmon.o +obj-$(CONFIG_SENSORS_SYSTEM76_THELIO_IO) += system76-thelio-io.o obj-$(CONFIG_SENSORS_AMC6821) += amc6821.o obj-$(CONFIG_SENSORS_TC74) += tc74.o obj-$(CONFIG_SENSORS_THMC50) += thmc50.o
drivers/hwmon/system76-thelio-io.c new file +424 -0
424 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v3 1/1 hwmon: Add System76 Thelio Io driver
The System76 Thelio Io is a fan and power button LED controller. This driver fully supports the System76 Thelio Io, by exposing fan controls and sending the system suspend/resume state.
--- MAINTAINERS | 7 + drivers/hwmon/Kconfig | 10 + drivers/hwmon/Makefile | 1 + drivers/hwmon/system76-thelio-io.c | 424 +++++++++++++++++++++++++++++ 4 files changed, 442 insertions(+) create mode 100644 drivers/hwmon/system76-thelio-io.c
MAINTAINERS +7 -0
@@ -20738,6 +20738,13 @@ L: [email protected] S: Maintained F: drivers/platform/x86/system76_acpi.c +SYSTEM76 THELIO IO DRIVER +M: Jeremy Soller <[email protected]> +M: System76 <[email protected]> +L: [email protected] +S: Maintained +F: drivers/hwmon/system76-thelio-io.c + SYSV FILESYSTEM S: Orphan F: Documentation/filesystems/sysv-fs.rst
drivers/hwmon/Kconfig +10 -0
@@ -1965,6 +1965,16 @@ config SENSORS_SMM665 This driver can also be built as a module. If so, the module will be called smm665. +config SENSORS_SYSTEM76_THELIO_IO + tristate "System76 Thelio Io controller" + depends on HID + help + If you say yes here you get support for the System76 Thelio Io + controller. + + This driver can also be built as a module. If so, the module + will be called system76-thelio-io. + config SENSORS_ADC128D818 tristate "Texas Instruments ADC128D818" depends on I2C
drivers/hwmon/Makefile +1 -0
@@ -199,6 +199,7 @@ obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o obj-$(CONFIG_SENSORS_SPARX5) += sparx5-temp.o obj-$(CONFIG_SENSORS_STTS751) += stts751.o obj-$(CONFIG_SENSORS_SY7636A) += sy7636a-hwmon.o +obj-$(CONFIG_SENSORS_SYSTEM76_THELIO_IO) += system76-thelio-io.o obj-$(CONFIG_SENSORS_AMC6821) += amc6821.o obj-$(CONFIG_SENSORS_TC74) += tc74.o obj-$(CONFIG_SENSORS_THMC50) += thmc50.o
drivers/hwmon/system76-thelio-io.c new file +424 -0
424 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v4 1/1 hwmon: Add System76 Thelio Io driver
The System76 Thelio Io is a fan and power button LED controller. This driver fully supports the System76 Thelio Io, by exposing fan controls and sending the system suspend/resume state.
--- Documentation/hwmon/system76-thelio-io.rst | 31 ++ MAINTAINERS | 7 + drivers/hwmon/Kconfig | 10 + drivers/hwmon/Makefile | 1 + drivers/hwmon/system76-thelio-io.c | 424 +++++++++++++++++++++ 5 files changed, 473 insertions(+) create mode 100644 Documentation/hwmon/system76-thelio-io.rst create mode 100644 drivers/hwmon/system76-thelio-io.c
Documentation/hwmon/system76-thelio-io.rst new file +31 -0
@@ -0,0 +1,31 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later + +Kernel driver system76-thelio-io +========================== + +Supported devices: + + * System76 Thelio Io (thelio_io_2) + +Author: Jeremy Soller + +Description +----------- + +This driver implements the sysfs interface for the System76 Thelio Io. +The System76 Thelio Io is a USB device with 4 fan connectors and a +power button LED. + +Usage Notes +----------- + +Since it is a USB device, hotswapping is possible. The device is autodetected. + +Sysfs entries +------------- + +======================= ===================================================================== +fan[1-4]_input Connected fan rpm. +fan[1-4]_label Shows fan connector name. +pwm[1-4] Sets the fan speed. Values from 0-255. +======================= =====================================================================
MAINTAINERS +7 -0
@@ -20738,6 +20738,13 @@ L: [email protected] S: Maintained F: drivers/platform/x86/system76_acpi.c +SYSTEM76 THELIO IO DRIVER +M: Jeremy Soller <[email protected]> +M: System76 <[email protected]> +L: [email protected] +S: Maintained +F: drivers/hwmon/system76-thelio-io.c + SYSV FILESYSTEM S: Orphan F: Documentation/filesystems/sysv-fs.rst
drivers/hwmon/Kconfig +10 -0
@@ -1965,6 +1965,16 @@ config SENSORS_SMM665 This driver can also be built as a module. If so, the module will be called smm665. +config SENSORS_SYSTEM76_THELIO_IO + tristate "System76 Thelio Io controller" + depends on HID + help + If you say yes here you get support for the System76 Thelio Io + controller. + + This driver can also be built as a module. If so, the module + will be called system76-thelio-io. + config SENSORS_ADC128D818 tristate "Texas Instruments ADC128D818" depends on I2C
drivers/hwmon/Makefile +1 -0
@@ -199,6 +199,7 @@ obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o obj-$(CONFIG_SENSORS_SPARX5) += sparx5-temp.o obj-$(CONFIG_SENSORS_STTS751) += stts751.o obj-$(CONFIG_SENSORS_SY7636A) += sy7636a-hwmon.o +obj-$(CONFIG_SENSORS_SYSTEM76_THELIO_IO) += system76-thelio-io.o obj-$(CONFIG_SENSORS_AMC6821) += amc6821.o obj-$(CONFIG_SENSORS_TC74) += tc74.o obj-$(CONFIG_SENSORS_THMC50) += thmc50.o
drivers/hwmon/system76-thelio-io.c new file +424 -0
424 lines not on this page · raw message
Signature · 1 line
2.34.1
I believe my latest patch (v4) addresses all the comments except for the use of the pm_notifier API. This API was used because I need the whole system sleep status to be sent to the controller, so that it can correctly control the power button state. If I can get the same information through PM callbacks, please confirm and I will switch to using them.
Quoted 558 lines · Jeremy Soller
The System76 Thelio Io is a fan and power button LED controller. This driver fully supports the System76 Thelio Io, by exposing fan controls and sending the system suspend/resume state.
Signed-off-by Jeremy Soller <[email protected]>--- Documentation/hwmon/system76-thelio-io.rst | 31 ++ MAINTAINERS | 7 + drivers/hwmon/Kconfig | 10 + drivers/hwmon/Makefile | 1 + drivers/hwmon/system76-thelio-io.c | 424 +++++++++++++++++++++ 5 files changed, 473 insertions(+) create mode 100644 Documentation/hwmon/system76-thelio-io.rst create mode 100644 drivers/hwmon/system76-thelio-io.cDocumentation/hwmon/system76-thelio-io.rst new file +22
-0@@ -0,0 +1,31 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later + +Kernel driver system76-thelio-io +========================== + +Supported devices: + + * System76 Thelio Io (thelio_io_2) + +Author: Jeremy Soller + +Description +----------- + +This driver implements the sysfs interface for the System76 Thelio Io. +The System76 Thelio Io is a USB device with 4 fan connectors and a +power button LED. + +Usage Notes +----------- + +Since it is a USB device, hotswapping is possible. The device isautodetected.
Documentation/hwmon/system76-thelio-io.rst new file +5
-0+ +Sysfs entries +------------- + +============================================================================================
Documentation/hwmon/system76-thelio-io.rst new file +4
-0+fan[1-4]_input Connected fan rpm. +fan[1-4]_label Shows fan connector name. +pwm[1-4] Sets the fan speed. Values from 0-255. +============================================================================================
MAINTAINERS +7
-0@@ -20738,6 +20738,13 @@ L: [email protected] S: Maintained F: drivers/platform/x86/system76_acpi.c +SYSTEM76 THELIO IO DRIVER +M: Jeremy Soller <[email protected]> +M: System76 <[email protected]> +L: [email protected] +S: Maintained +F: drivers/hwmon/system76-thelio-io.c + SYSV FILESYSTEM S: Orphan F: Documentation/filesystems/sysv-fs.rstdrivers/hwmon/Kconfig +10
-0@@ -1965,6 +1965,16 @@ config SENSORS_SMM665 This driver can also be built as a module. If so, the module will be called smm665. +config SENSORS_SYSTEM76_THELIO_IO + tristate "System76 Thelio Io controller" + depends on HID + help + If you say yes here you get support for the System76 Thelio Io + controller. + + This driver can also be built as a module. If so, the module + will be called system76-thelio-io. + config SENSORS_ADC128D818 tristate "Texas Instruments ADC128D818" depends on I2Cdrivers/hwmon/Makefile +1
-0@@ -199,6 +199,7 @@ obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o obj-$(CONFIG_SENSORS_SPARX5) += sparx5-temp.o obj-$(CONFIG_SENSORS_STTS751) += stts751.o obj-$(CONFIG_SENSORS_SY7636A) += sy7636a-hwmon.o +obj-$(CONFIG_SENSORS_SYSTEM76_THELIO_IO) += system76-thelio-io.o obj-$(CONFIG_SENSORS_AMC6821) += amc6821.o obj-$(CONFIG_SENSORS_TC74) += tc74.o obj-$(CONFIG_SENSORS_THMC50) += thmc50.odrivers/hwmon/system76-thelio-io.c new file +11
-0@@ -0,0 +1,424 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* +* system76-thelio-io.c - Linux driver for System76 Thelio Io +* Copyright (C) 2023 System76 +* +* Based on: +* corsair-cpro.c - Linux driver for Corsair Commander Pro +* Copyright (C) 2020 Marius Zachmann <[email protected]> +* +* This driver uses hid reports to communicate with the device to allow hidraw userspace drivers
+ * still being used. The device does not use report ids. When using hidraw and this driver
+ * simultaniously, reports could be switched.
+ */drivers/hwmon/system76-thelio-io.c new file +32
-0+ +#include <linux/bitops.h> +#include <linux/completion.h> +#include <linux/hid.h> +#include <linux/hwmon.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/slab.h> +#include <linux/suspend.h> +#include <linux/types.h> + +#define BUFFER_SIZE 32 +#define REQ_TIMEOUT 300 + +#define HID_CMD 0 +#define HID_RES 1 +#define HID_DATA 2 + +#define CMD_FAN_GET 7 +#define CMD_FAN_SET 8 +#define CMD_LED_SET_MODE 16 +#define CMD_FAN_TACH 22 + +struct thelio_io_device { +struct hid_device *hdev; +struct device *hwmon_dev; +#ifdef CONFIG_PM_SLEEP +struct notifier_block pm_notifier; +#endif +struct completion wait_input_report; +struct mutex mutex;/* whenever buffer is used, lock before
send_usb_cmd*/drivers/hwmon/system76-thelio-io.c new file +15
-0+u8 *buffer; +}; + +/* converts response error in buffer to errno */ +static int thelio_io_get_errno (struct thelio_io_device *thelio_io) +{ +switch (thelio_io->buffer[HID_RES ]) { +case 0x00 :/* success */ +return 0 ; +default : +return -EIO ; + } +} + +/* send command, check for error in response, response in
thelio_io->buffer*/drivers/hwmon/system76-thelio-io.c new file +14
-0+static int send_usb_cmd (struct thelio_io_device *thelio_io,u8 command, +u8 byte1,u8 byte2,u8 byte3) +{ +int ret; + +memset (thelio_io->buffer,0x00 ,BUFFER_SIZE ); + thelio_io->buffer[HID_CMD ] = command; + thelio_io->buffer[HID_DATA ] = byte1; + thelio_io->buffer[HID_DATA +1 ] = byte2; + thelio_io->buffer[HID_DATA +2 ] = byte3; + +reinit_completion (&thelio_io->wait_input_report); + + ret = hid_hw_output_report(thelio_io->hdev, thelio_io->buffer,
BUFFER_SIZE);drivers/hwmon/system76-thelio-io.c new file +11
-0+if (ret <0 ) +return ret; + +if (!wait_for_completion_timeout (&thelio_io->wait_input_report, +msecs_to_jiffies (REQ_TIMEOUT ))) +return -ETIMEDOUT ; + +return thelio_io_get_errno (thelio_io); +} + +static int thelio_io_raw_event(struct hid_device *hdev, struct
hid_report*report,drivers/hwmon/system76-thelio-io.c new file +16
-0+ u8 *data, int size) +{ +struct thelio_io_device *thelio_io =hid_get_drvdata (hdev); + +/* only copy buffer when requested */ +if (completion_done (&thelio_io->wait_input_report)) +return 0 ; + +memcpy (thelio_io->buffer, data,min (BUFFER_SIZE , size)); +complete (&thelio_io->wait_input_report); + +return 0 ; +} + +/* requests and returns single data values depending on channel */ +static int get_data(struct thelio_io_device *thelio_io, int command,int channel,
drivers/hwmon/system76-thelio-io.c new file +20
-0+ bool two_byte_data) +{ +int ret; + +mutex_lock (&thelio_io->mutex); + + ret =send_usb_cmd (thelio_io, command, channel,0 ,0 ); +if (ret) + goto out_unlock; + + ret = thelio_io->buffer[HID_DATA +1 ]; +if (two_byte_data) + ret |= thelio_io->buffer[HID_DATA +2 ] <<8 ; + +out_unlock: +mutex_unlock (&thelio_io->mutex); +return ret; +} + +static int set_pwm(struct thelio_io_device *thelio_io, int channel,long val)
drivers/hwmon/system76-thelio-io.c new file +15
-0+{ +int ret; + +if (val <0 || val >255 ) +return -EINVAL ; + +mutex_lock (&thelio_io->mutex); + + ret =send_usb_cmd (thelio_io,CMD_FAN_SET , channel, val,0 ); + +mutex_unlock (&thelio_io->mutex); +return ret; +} + +static int thelio_io_read_string(struct device *dev, enum
hwmon_sensor_typestype,drivers/hwmon/system76-thelio-io.c new file +34
-0+ u32 attr, int channel, const char **str) +{ + switch (type) { + case hwmon_fan: + switch (attr) { + case hwmon_fan_label: + switch (channel) { + case 0: + *str ="CPU Fan" ; +return 0 ; +case 1 : + *str ="Intake Fan" ; +return 0 ; +case 2 : + *str ="GPU Fan" ; +return 0 ; +case 3 : + *str ="Aux Fan" ; +return 0 ; +default : +break ; + } +default : +break ; + } +break ; +default : +break ; + } + +return -EOPNOTSUPP ; +} + +static int thelio_io_read(struct device *dev, enum hwmon_sensor_typestype,
drivers/hwmon/system76-thelio-io.c new file +38
-0+ u32 attr, int channel, long *val) +{ + struct thelio_io_device *thelio_io = dev_get_drvdata(dev); +int ret; + +switch (type) { +case hwmon_fan: +switch (attr) { +case hwmon_fan_input: + ret =get_data (thelio_io,CMD_FAN_TACH , channel, true); +if (ret <0 ) +return ret; + *val = ret; +return 0 ; +default : +break ; + } +break ; +case hwmon_pwm: +switch (attr) { +case hwmon_pwm_input: + ret =get_data (thelio_io,CMD_FAN_GET , channel, false); +if (ret <0 ) +return ret; + *val = ret; +return 0 ; +default : +break ; + } +break ; +default : +break ; + } + +return -EOPNOTSUPP ; +}; + +static int thelio_io_write(struct device *dev, enum hwmon_sensor_typestype,
drivers/hwmon/system76-thelio-io.c new file +21
-0+ u32 attr, int channel, long val) +{ + struct thelio_io_device *thelio_io = dev_get_drvdata(dev); + +switch (type) { +case hwmon_pwm: +switch (attr) { +case hwmon_pwm_input: +return set_pwm (thelio_io, channel, val); +default : +break ; + } +break ; +default : +break ; + } + +return -EOPNOTSUPP ; +}; + +static umode_t thelio_io_is_visible(const void *data, enum
hwmon_sensor_typestype,drivers/hwmon/system76-thelio-io.c new file +60
-0+ u32 attr, int channel) +{ +switch (type) { +case hwmon_fan: +switch (attr) { +case hwmon_fan_input: +return 0444 ; +case hwmon_fan_label: +return 0444 ; +default : +break ; + } +break ; +case hwmon_pwm: +switch (attr) { +case hwmon_pwm_input: +return 0644 ; +default : +break ; + } +break ; +default : +break ; + } + +return 0 ; +}; + +static const struct hwmon_ops thelio_io_hwmon_ops = { + .is_visible = thelio_io_is_visible, + .read = thelio_io_read, + .read_string = thelio_io_read_string, + .write = thelio_io_write, +}; + +static const struct hwmon_channel_info *thelio_io_info[] = { +HWMON_CHANNEL_INFO (chip, +HWMON_C_REGISTER_TZ ), +HWMON_CHANNEL_INFO (fan, +HWMON_F_INPUT |HWMON_F_LABEL , +HWMON_F_INPUT |HWMON_F_LABEL , +HWMON_F_INPUT |HWMON_F_LABEL , +HWMON_F_INPUT |HWMON_F_LABEL + ), +HWMON_CHANNEL_INFO (pwm, +HWMON_PWM_INPUT , +HWMON_PWM_INPUT , +HWMON_PWM_INPUT , +HWMON_PWM_INPUT + ), +NULL +}; + +static const struct hwmon_chip_info thelio_io_chip_info = { + .ops = &thelio_io_hwmon_ops, + .info = thelio_io_info, +}; + +#ifdef CONFIG_PM_SLEEP +static int thelio_io_pm(struct notifier_block *nb, unsigned longaction, void *data)
drivers/hwmon/system76-thelio-io.c new file +2
-0+{ + struct thelio_io_device *thelio_io = container_of(nb, struct
thelio_io_device,pm_notifier);drivers/hwmon/system76-thelio-io.c new file +27
-0+ +switch (action) { +case PM_HIBERNATION_PREPARE : +case PM_SUSPEND_PREPARE : +mutex_lock (&thelio_io->mutex); +send_usb_cmd (thelio_io,CMD_LED_SET_MODE ,0 ,1 ,0 ); +mutex_unlock (&thelio_io->mutex); +break ; + +case PM_POST_HIBERNATION : +case PM_POST_SUSPEND : +mutex_lock (&thelio_io->mutex); +send_usb_cmd (thelio_io,CMD_LED_SET_MODE ,0 ,0 ,0 ); +mutex_unlock (&thelio_io->mutex); +break ; + +case PM_POST_RESTORE : +case PM_RESTORE_PREPARE : +default : +break ; + } + +return NOTIFY_DONE ; +} +#endif + +static int thelio_io_probe(struct hid_device *hdev, const struct
hid_device_id*id)drivers/hwmon/system76-thelio-io.c new file +32
-0+{ + struct thelio_io_device *thelio_io; + int ret; + + thelio_io = devm_kzalloc(&hdev->dev, sizeof(*thelio_io), GFP_KERNEL); + if (!thelio_io) + return -ENOMEM; + + thelio_io->buffer = devm_kmalloc(&hdev->dev, BUFFER_SIZE, GFP_KERNEL); + if (!thelio_io->buffer) + return -ENOMEM; + + ret = hid_parse(hdev); + if (ret) + return ret; + + ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT); + if (ret) + return ret; + + ret = hid_hw_open(hdev); + if (ret) + goto out_hw_stop; + + thelio_io->hdev = hdev; + hid_set_drvdata(hdev, thelio_io); + mutex_init(&thelio_io->mutex); + init_completion(&thelio_io->wait_input_report); + + hid_device_io_start(hdev); + + if (hdev->maxcollection == 1 && hdev->collection[0].usage ==
0xFF600061) {drivers/hwmon/system76-thelio-io.c new file +69
-0+ thelio_io->hwmon_dev =hwmon_device_register_with_info (&hdev->dev, +"system76_thelio_io" , + thelio_io, + &thelio_io_chip_info, +0 ); +if (IS_ERR (thelio_io->hwmon_dev)) { + ret =PTR_ERR (thelio_io->hwmon_dev); + goto out_hw_close; + } + +#ifdef CONFIG_PM_SLEEP + thelio_io->pm_notifier.notifier_call = thelio_io_pm; +register_pm_notifier (&thelio_io->pm_notifier); +#endif + } + +return 0 ; + +out_hw_close: +hid_hw_close (hdev); +out_hw_stop: +hid_hw_stop (hdev); +return ret; +} + +static void thelio_io_remove (struct hid_device *hdev) +{ +struct thelio_io_device *thelio_io =hid_get_drvdata (hdev); + +if (thelio_io->hwmon_dev) { +hwmon_device_unregister (thelio_io->hwmon_dev); + +#ifdef CONFIG_PM_SLEEP +unregister_pm_notifier (&thelio_io->pm_notifier); +#endif + } + +hid_hw_close (hdev); +hid_hw_stop (hdev); +} + +static const struct hid_device_id thelio_io_devices[] = { + {HID_USB_DEVICE (0x3384 ,0x000B ) },/* thelio_io_2 */ + { } +}; + +static struct hid_driver thelio_io_driver = { + .name ="system76-thelio-io" , + .id_table = thelio_io_devices, + .probe = thelio_io_probe, + .remove = thelio_io_remove, + .raw_event = thelio_io_raw_event, +}; + +MODULE_DEVICE_TABLE (hid, thelio_io_devices); +MODULE_LICENSE ("GPL" ); + +static int __init thelio_io_init (void ) +{ +return hid_register_driver (&thelio_io_driver); +} + +static void __exit thelio_io_exit(void) +{ +hid_unregister_driver (&thelio_io_driver); +} + +/* +* When compiling this driver as built-in, hwmon initcalls will get called before the
+ * hid driver and this driver would fail to register.late_initcallsolves this.
+ */drivers/hwmon/system76-thelio-io.c new file +2
-0+late_initcall (thelio_io_init); +module_exit (thelio_io_exit);Signature · 1 line
2.34.1
Guenter Roeck
maintainerQuoted 4 lines · Jeremy Soller
The System76 Thelio Io is a fan and power button LED controller. This driver fully supports the System76 Thelio Io, by exposing fan controls and sending the system suspend/resume state.
You might want to consider reading Documentation/process/submitting-patches.rst. It would tell you that
... However, for a multi-patch series, it is generally
best to avoid using In-Reply-To: to link to older versions of the series. This way multiple versions of the patch don't become an unmanageable forest of references in email clients. If a link is helpful, you can use the https://lore.kernel.org/ redirector (e.g., in the cover email text) to link to an earlier version of the patch series.
It might possibly make sense to also add a note saying something like "don't send X revisions of your patch in a row".
Quoted 2 lines
Signed-off-by Jeremy Soller <[email protected]>---
Missing change log. You are flooding me with patch revisions. Do you really expect me to look into each of those to figure out what you changed ?
Random feedback below. Since the is no explanation for what has changed and what hasn't and why, the feedback is necessarily incomplete.
Quoted 1 line
Documentation/hwmon/system76-thelio-io.rst | 31 ++
Missing reference in Documentation/hwmon/index.rst
Quoted 120 lines
MAINTAINERS | 7 + drivers/hwmon/Kconfig | 10 + drivers/hwmon/Makefile | 1 + drivers/hwmon/system76-thelio-io.c | 424 +++++++++++++++++++++ 5 files changed, 473 insertions(+) create mode 100644 Documentation/hwmon/system76-thelio-io.rst create mode 100644 drivers/hwmon/system76-thelio-io.cDocumentation/hwmon/system76-thelio-io.rst new file +31
-0@@ -0,0 +1,31 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later + +Kernel driver system76-thelio-io +========================== + +Supported devices: + + * System76 Thelio Io (thelio_io_2) + +Author: Jeremy Soller + +Description +----------- + +This driver implements the sysfs interface for the System76 Thelio Io. +The System76 Thelio Io is a USB device with 4 fan connectors and a +power button LED. + +Usage Notes +----------- + +Since it is a USB device, hotswapping is possible. The device is autodetected. + +Sysfs entries +------------- + +======================= ===================================================================== +fan[1-4]_input Connected fan rpm. +fan[1-4]_label Shows fan connector name. +pwm[1-4] Sets the fan speed. Values from 0-255. +======================= =====================================================================MAINTAINERS +7
-0@@ -20738,6 +20738,13 @@ L: [email protected] S: Maintained F: drivers/platform/x86/system76_acpi.c +SYSTEM76 THELIO IO DRIVER +M: Jeremy Soller <[email protected]> +M: System76 <[email protected]> +L: [email protected] +S: Maintained +F: drivers/hwmon/system76-thelio-io.c + SYSV FILESYSTEM S: Orphan F: Documentation/filesystems/sysv-fs.rstdrivers/hwmon/Kconfig +10
-0@@ -1965,6 +1965,16 @@ config SENSORS_SMM665 This driver can also be built as a module. If so, the module will be called smm665. +config SENSORS_SYSTEM76_THELIO_IO + tristate "System76 Thelio Io controller" + depends on HID + help + If you say yes here you get support for the System76 Thelio Io + controller. + + This driver can also be built as a module. If so, the module + will be called system76-thelio-io. + config SENSORS_ADC128D818 tristate "Texas Instruments ADC128D818" depends on I2Cdrivers/hwmon/Makefile +1
-0@@ -199,6 +199,7 @@ obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o obj-$(CONFIG_SENSORS_SPARX5) += sparx5-temp.o obj-$(CONFIG_SENSORS_STTS751) += stts751.o obj-$(CONFIG_SENSORS_SY7636A) += sy7636a-hwmon.o +obj-$(CONFIG_SENSORS_SYSTEM76_THELIO_IO) += system76-thelio-io.o obj-$(CONFIG_SENSORS_AMC6821) += amc6821.o obj-$(CONFIG_SENSORS_TC74) += tc74.o obj-$(CONFIG_SENSORS_THMC50) += thmc50.odrivers/hwmon/system76-thelio-io.c new file +18
-0@@ -0,0 +1,424 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* +* system76-thelio-io.c - Linux driver for System76 Thelio Io +* Copyright (C) 2023 System76 +* +* Based on: +* corsair-cpro.c - Linux driver for Corsair Commander Pro +* Copyright (C) 2020 Marius Zachmann <[email protected]> +* +* This driver uses hid reports to communicate with the device to allow hidraw userspace drivers +* still being used. The device does not use report ids. When using hidraw and this driver +* simultaniously, reports could be switched. +*/ + +#include <linux/bitops.h> +#include <linux/completion.h> +#include <linux/hid.h>
drivers/hwmon/system76-thelio-io.c line 28
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+#include <linux/hwmon.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/slab.h> +#include <linux/suspend.h> +#include <linux/types.h> + +#define BUFFER_SIZE 32 +#define REQ_TIMEOUT 300
Nit: It is customary to either add a comment describing the unit (here: milli-seconds) or to indicate it in the define (e.g. REQ_TIMEOUT_MS).
Quoted 251 lines
drivers/hwmon/system76-thelio-io.c new file +251
-0+ +#define HID_CMD 0 +#define HID_RES 1 +#define HID_DATA 2 + +#define CMD_FAN_GET 7 +#define CMD_FAN_SET 8 +#define CMD_LED_SET_MODE 16 +#define CMD_FAN_TACH 22 + +struct thelio_io_device { +struct hid_device *hdev; +struct device *hwmon_dev; +#ifdef CONFIG_PM_SLEEP +struct notifier_block pm_notifier; +#endif +struct completion wait_input_report; +struct mutex mutex;/* whenever buffer is used, lock before send_usb_cmd */ +u8 *buffer; +}; + +/* converts response error in buffer to errno */ +static int thelio_io_get_errno (struct thelio_io_device *thelio_io) +{ +switch (thelio_io->buffer[HID_RES ]) { +case 0x00 :/* success */ +return 0 ; +default : +return -EIO ; + } +} + +/* send command, check for error in response, response in thelio_io->buffer */ +static int send_usb_cmd (struct thelio_io_device *thelio_io,u8 command, +u8 byte1,u8 byte2,u8 byte3) +{ +int ret; + +memset (thelio_io->buffer,0x00 ,BUFFER_SIZE ); + thelio_io->buffer[HID_CMD ] = command; + thelio_io->buffer[HID_DATA ] = byte1; + thelio_io->buffer[HID_DATA +1 ] = byte2; + thelio_io->buffer[HID_DATA +2 ] = byte3; + +reinit_completion (&thelio_io->wait_input_report); + + ret =hid_hw_output_report (thelio_io->hdev, thelio_io->buffer,BUFFER_SIZE ); +if (ret <0 ) +return ret; + +if (!wait_for_completion_timeout (&thelio_io->wait_input_report, +msecs_to_jiffies (REQ_TIMEOUT ))) +return -ETIMEDOUT ; + +return thelio_io_get_errno (thelio_io); +} + +static int thelio_io_raw_event (struct hid_device *hdev,struct hid_report *report, +u8 *data,int size) +{ +struct thelio_io_device *thelio_io =hid_get_drvdata (hdev); + +/* only copy buffer when requested */ +if (completion_done (&thelio_io->wait_input_report)) +return 0 ; + +memcpy (thelio_io->buffer, data,min (BUFFER_SIZE , size)); +complete (&thelio_io->wait_input_report); + +return 0 ; +} + +/* requests and returns single data values depending on channel */ +static int get_data (struct thelio_io_device *thelio_io,int command,int channel, +bool two_byte_data) +{ +int ret; + +mutex_lock (&thelio_io->mutex); + + ret =send_usb_cmd (thelio_io, command, channel,0 ,0 ); +if (ret) + goto out_unlock; + + ret = thelio_io->buffer[HID_DATA +1 ]; +if (two_byte_data) + ret |= thelio_io->buffer[HID_DATA +2 ] <<8 ; + +out_unlock: +mutex_unlock (&thelio_io->mutex); +return ret; +} + +static int set_pwm (struct thelio_io_device *thelio_io,int channel,long val) +{ +int ret; + +if (val <0 || val >255 ) +return -EINVAL ; + +mutex_lock (&thelio_io->mutex); + + ret =send_usb_cmd (thelio_io,CMD_FAN_SET , channel, val,0 ); + +mutex_unlock (&thelio_io->mutex); +return ret; +} + +static int thelio_io_read_string (struct device *dev,enum hwmon_sensor_types type, +u32 attr,int channel,const char **str) +{ +switch (type) { +case hwmon_fan: +switch (attr) { +case hwmon_fan_label: +switch (channel) { +case 0 : + *str ="CPU Fan" ; +return 0 ; +case 1 : + *str ="Intake Fan" ; +return 0 ; +case 2 : + *str ="GPU Fan" ; +return 0 ; +case 3 : + *str ="Aux Fan" ; +return 0 ; +default : +break ; + } +default : +break ; + } +break ; +default : +break ; + } + +return -EOPNOTSUPP ; +} + +static int thelio_io_read (struct device *dev,enum hwmon_sensor_types type, +u32 attr,int channel,long *val) +{ +struct thelio_io_device *thelio_io =dev_get_drvdata (dev); +int ret; + +switch (type) { +case hwmon_fan: +switch (attr) { +case hwmon_fan_input: + ret =get_data (thelio_io,CMD_FAN_TACH , channel, true); +if (ret <0 ) +return ret; + *val = ret; +return 0 ; +default : +break ; + } +break ; +case hwmon_pwm: +switch (attr) { +case hwmon_pwm_input: + ret =get_data (thelio_io,CMD_FAN_GET , channel, false); +if (ret <0 ) +return ret; + *val = ret; +return 0 ; +default : +break ; + } +break ; +default : +break ; + } + +return -EOPNOTSUPP ; +}; + +static int thelio_io_write (struct device *dev,enum hwmon_sensor_types type, +u32 attr,int channel,long val) +{ +struct thelio_io_device *thelio_io =dev_get_drvdata (dev); + +switch (type) { +case hwmon_pwm: +switch (attr) { +case hwmon_pwm_input: +return set_pwm (thelio_io, channel, val); +default : +break ; + } +break ; +default : +break ; + } + +return -EOPNOTSUPP ; +}; + +static umode_t thelio_io_is_visible (const void *data,enum hwmon_sensor_types type, +u32 attr,int channel) +{ +switch (type) { +case hwmon_fan: +switch (attr) { +case hwmon_fan_input: +return 0444 ; +case hwmon_fan_label: +return 0444 ; +default : +break ; + } +break ; +case hwmon_pwm: +switch (attr) { +case hwmon_pwm_input: +return 0644 ; +default : +break ; + } +break ; +default : +break ; + } + +return 0 ; +}; + +static const struct hwmon_ops thelio_io_hwmon_ops = { + .is_visible = thelio_io_is_visible, + .read = thelio_io_read, + .read_string = thelio_io_read_string, + .write = thelio_io_write, +}; + +static const struct hwmon_channel_info *thelio_io_info[] = { +HWMON_CHANNEL_INFO (chip, +HWMON_C_REGISTER_TZ ), +HWMON_CHANNEL_INFO (fan, +HWMON_F_INPUT |HWMON_F_LABEL , +HWMON_F_INPUT |HWMON_F_LABEL , +HWMON_F_INPUT |HWMON_F_LABEL , +HWMON_F_INPUT |HWMON_F_LABEL + ), + HWMON_CHANNEL_INFO(pwm, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT
drivers/hwmon/system76-thelio-io.c line 289
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+ ), + NULL +}; + +static const struct hwmon_chip_info thelio_io_chip_info = { + .ops = &thelio_io_hwmon_ops, + .info = thelio_io_info, +}; + +#ifdef CONFIG_PM_SLEEP
You suggested in one of your replies that is would by my responsibility to prove that standard PM calls are insufficient. That is not the case.
Quoted 51 lines
drivers/hwmon/system76-thelio-io.c new file +51
-0+static int thelio_io_pm (struct notifier_block *nb,unsigned long action,void *data) +{ + struct thelio_io_device *thelio_io = container_of(nb, struct thelio_io_device, pm_notifier); + +switch (action) { +case PM_HIBERNATION_PREPARE : +case PM_SUSPEND_PREPARE : +mutex_lock (&thelio_io->mutex); +send_usb_cmd (thelio_io,CMD_LED_SET_MODE ,0 ,1 ,0 ); +mutex_unlock (&thelio_io->mutex); +break ; + +case PM_POST_HIBERNATION : +case PM_POST_SUSPEND : +mutex_lock (&thelio_io->mutex); +send_usb_cmd (thelio_io,CMD_LED_SET_MODE ,0 ,0 ,0 ); +mutex_unlock (&thelio_io->mutex); +break ; + +case PM_POST_RESTORE : +case PM_RESTORE_PREPARE : +default : +break ; + } + +return NOTIFY_DONE ; +} +#endif + +static int thelio_io_probe (struct hid_device *hdev,const struct hid_device_id *id) +{ +struct thelio_io_device *thelio_io; +int ret; + + thelio_io =devm_kzalloc (&hdev->dev,sizeof (*thelio_io),GFP_KERNEL ); +if (!thelio_io) +return -ENOMEM ; + + thelio_io->buffer =devm_kmalloc (&hdev->dev,BUFFER_SIZE ,GFP_KERNEL ); +if (!thelio_io->buffer) +return -ENOMEM ; + + ret =hid_parse (hdev); +if (ret) +return ret; + + ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT ); +if (ret) +return ret; + + ret =hid_hw_open (hdev);
drivers/hwmon/system76-thelio-io.c line 350
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+if (ret) + goto out_hw_stop; + + thelio_io->hdev = hdev; +hid_set_drvdata (hdev, thelio_io); +mutex_init (&thelio_io->mutex); +init_completion (&thelio_io->wait_input_report); + +hid_device_io_start (hdev); +
Just in case the below is _really_ necessary, which seems unlikely to me, why call hid_device_io_start() even if no hwmon device is going to be registered ? Why start IO on a device that isn't doing anything ?
Quoted 6 lines
drivers/hwmon/system76-thelio-io.c new file +6
-0+if (hdev->maxcollection ==1 && hdev->collection[0 ].usage ==0xFF600061 ) { + thelio_io->hwmon_dev =hwmon_device_register_with_info (&hdev->dev, +"system76_thelio_io" , + thelio_io, + &thelio_io_chip_info, +0 );
drivers/hwmon/system76-thelio-io.c line 366
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+if (IS_ERR (thelio_io->hwmon_dev)) { + ret =PTR_ERR (thelio_io->hwmon_dev); + goto out_hw_close; + } + +#ifdef CONFIG_PM_SLEEP + thelio_io->pm_notifier.notifier_call = thelio_io_pm; +register_pm_notifier (&thelio_io->pm_notifier); +#endif + }
Ok, whatever your explanation for this is: I am not going to accept it, period. It doesn't make sense to instantiate a driver that doesn't do anything. If this would for whatever reason _really_ _really_ _really_ be necessary, I'd expect a lengthy comment describing why this is the case and why it would be necessary to keep possibly multiple instances of this driver around that don't do anything.
And, no, I am not going to dig through all your replies trying to figure out your rationale for doing this. Note that, given that there is not a single driver in the kernel doing anything similar, you might have a hard time convincing me that this makes sense and is necessary (both the check and successfully instantiating the driver without registering a hwmon device).
Quoted 60 lines
drivers/hwmon/system76-thelio-io.c new file +58
-0+ +return 0 ; + +out_hw_close: +hid_hw_close (hdev); +out_hw_stop: +hid_hw_stop (hdev); +return ret; +} + +static void thelio_io_remove (struct hid_device *hdev) +{ +struct thelio_io_device *thelio_io =hid_get_drvdata (hdev); + +if (thelio_io->hwmon_dev) { +hwmon_device_unregister (thelio_io->hwmon_dev); + +#ifdef CONFIG_PM_SLEEP +unregister_pm_notifier (&thelio_io->pm_notifier); +#endif + } + +hid_hw_close (hdev); +hid_hw_stop (hdev); +} + +static const struct hid_device_id thelio_io_devices[] = { + {HID_USB_DEVICE (0x3384 ,0x000B ) },/* thelio_io_2 */ + { } +}; + +static struct hid_driver thelio_io_driver = { + .name ="system76-thelio-io" , + .id_table = thelio_io_devices, + .probe = thelio_io_probe, + .remove = thelio_io_remove, + .raw_event = thelio_io_raw_event, +}; + +MODULE_DEVICE_TABLE (hid, thelio_io_devices); +MODULE_LICENSE ("GPL" ); + +static int __init thelio_io_init (void ) +{ +return hid_register_driver (&thelio_io_driver); +} + +static void __exit thelio_io_exit(void) +{ +hid_unregister_driver (&thelio_io_driver); +} + +/* +* When compiling this driver as built-in, hwmon initcalls will get called before the +* hid driver and this driver would fail to register. late_initcall solves this. +*/ +late_initcall (thelio_io_init); +module_exit (thelio_io_exit);Signature · 1 line
2.34.1
I give up.
Signature · 4 lines
Jeremy Soller System76 Principal Engineer [email protected]
Quoted 590 lines · Guenter Roeck
Quoted 4 lines · Jeremy Soller
The System76 Thelio Io is a fan and power button LED controller. This driver fully supports the System76 Thelio Io, by exposing fan controls and sending the system suspend/resume state.
You might want to consider reading
Documentation/process/submitting-patches.rst. It would tell you that... However, for a multi-patch series, it is generally
best to avoid using In-Reply-To: to link to older versions of the series. This way multiple versions of the patch don't become an unmanageable forest of references in email clients. If a link is helpful, you can use the https://lore.kernel.org/ redirector (e.g., in the cover email text) to link to an earlier version of the patch series.It might possibly make sense to also add a note saying something like "don't send X revisions of your patch in a row".
Quoted 2 lines
Signed-off-by Jeremy Soller <[email protected]>---
Missing change log. You are flooding me with patch revisions. Do you really expect me to look into each of those to figure out what you changed ?
Random feedback below. Since the is no explanation for what has changed and what hasn't and why, the feedback is necessarily incomplete.
Quoted 1 line
Documentation/hwmon/system76-thelio-io.rst | 31 ++Missing reference in
Documentation/hwmon/index.rstQuoted 120 lines
MAINTAINERS | 7 + drivers/hwmon/Kconfig | 10 + drivers/hwmon/Makefile | 1 + drivers/hwmon/system76-thelio-io.c | 424 +++++++++++++++++++++ 5 files changed, 473 insertions(+) create mode 100644 Documentation/hwmon/system76-thelio-io.rst create mode 100644 drivers/hwmon/system76-thelio-io.cDocumentation/hwmon/system76-thelio-io.rst new file +31
-0@@ -0,0 +1,31 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later + +Kernel driver system76-thelio-io +========================== + +Supported devices: + + * System76 Thelio Io (thelio_io_2) + +Author: Jeremy Soller + +Description +----------- + +This driver implements the sysfs interface for the System76 Thelio Io. +The System76 Thelio Io is a USB device with 4 fan connectors and a +power button LED. + +Usage Notes +----------- + +Since it is a USB device, hotswapping is possible. The device is autodetected. + +Sysfs entries +------------- + +======================= ===================================================================== +fan[1-4]_input Connected fan rpm. +fan[1-4]_label Shows fan connector name. +pwm[1-4] Sets the fan speed. Values from 0-255. +======================= =====================================================================MAINTAINERS +7
-0@@ -20738,6 +20738,13 @@ L: [email protected] S: Maintained F: drivers/platform/x86/system76_acpi.c +SYSTEM76 THELIO IO DRIVER +M: Jeremy Soller <[email protected]> +M: System76 <[email protected]> +L: [email protected] +S: Maintained +F: drivers/hwmon/system76-thelio-io.c + SYSV FILESYSTEM S: Orphan F: Documentation/filesystems/sysv-fs.rstdrivers/hwmon/Kconfig +10
-0@@ -1965,6 +1965,16 @@ config SENSORS_SMM665 This driver can also be built as a module. If so, the module will be called smm665. +config SENSORS_SYSTEM76_THELIO_IO + tristate "System76 Thelio Io controller" + depends on HID + help + If you say yes here you get support for the System76 Thelio Io + controller. + + This driver can also be built as a module. If so, the module + will be called system76-thelio-io. + config SENSORS_ADC128D818 tristate "Texas Instruments ADC128D818" depends on I2Cdrivers/hwmon/Makefile +1
-0@@ -199,6 +199,7 @@ obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o obj-$(CONFIG_SENSORS_SPARX5) += sparx5-temp.o obj-$(CONFIG_SENSORS_STTS751) += stts751.o obj-$(CONFIG_SENSORS_SY7636A) += sy7636a-hwmon.o +obj-$(CONFIG_SENSORS_SYSTEM76_THELIO_IO) += system76-thelio-io.o obj-$(CONFIG_SENSORS_AMC6821) += amc6821.o obj-$(CONFIG_SENSORS_TC74) += tc74.o obj-$(CONFIG_SENSORS_THMC50) += thmc50.odrivers/hwmon/system76-thelio-io.c new file +18
-0@@ -0,0 +1,424 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* +* system76-thelio-io.c - Linux driver for System76 Thelio Io +* Copyright (C) 2023 System76 +* +* Based on: +* corsair-cpro.c - Linux driver for Corsair Commander Pro +* Copyright (C) 2020 Marius Zachmann <[email protected]> +* +* This driver uses hid reports to communicate with the device to allow hidraw userspace drivers +* still being used. The device does not use report ids. When using hidraw and this driver +* simultaniously, reports could be switched. +*/ + +#include <linux/bitops.h> +#include <linux/completion.h> +#include <linux/hid.h> drivers/hwmon/system76-thelio-io.c line 28
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+#include <linux/hwmon.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/slab.h> +#include <linux/suspend.h> +#include <linux/types.h> + +#define BUFFER_SIZE 32 +#define REQ_TIMEOUT 300Nit: It is customary to either add a comment describing the unit (here: milli-seconds) or to indicate it in the define (e.g.
REQ_TIMEOUT_MS).Quoted 251 lines
drivers/hwmon/system76-thelio-io.c new file +251
-0+ +#define HID_CMD 0 +#define HID_RES 1 +#define HID_DATA 2 + +#define CMD_FAN_GET 7 +#define CMD_FAN_SET 8 +#define CMD_LED_SET_MODE 16 +#define CMD_FAN_TACH 22 + +struct thelio_io_device { +struct hid_device *hdev; +struct device *hwmon_dev; +#ifdef CONFIG_PM_SLEEP +struct notifier_block pm_notifier; +#endif +struct completion wait_input_report; +struct mutex mutex;/* whenever buffer is used, lock before send_usb_cmd */ +u8 *buffer; +}; + +/* converts response error in buffer to errno */ +static int thelio_io_get_errno (struct thelio_io_device *thelio_io) +{ +switch (thelio_io->buffer[HID_RES ]) { +case 0x00 :/* success */ +return 0 ; +default : +return -EIO ; + } +} + +/* send command, check for error in response, response in thelio_io->buffer */ +static int send_usb_cmd (struct thelio_io_device *thelio_io,u8 command, +u8 byte1,u8 byte2,u8 byte3) +{ +int ret; + +memset (thelio_io->buffer,0x00 ,BUFFER_SIZE ); + thelio_io->buffer[HID_CMD ] = command; + thelio_io->buffer[HID_DATA ] = byte1; + thelio_io->buffer[HID_DATA +1 ] = byte2; + thelio_io->buffer[HID_DATA +2 ] = byte3; + +reinit_completion (&thelio_io->wait_input_report); + + ret =hid_hw_output_report (thelio_io->hdev, thelio_io->buffer,BUFFER_SIZE ); +if (ret <0 ) +return ret; + +if (!wait_for_completion_timeout (&thelio_io->wait_input_report, +msecs_to_jiffies (REQ_TIMEOUT ))) +return -ETIMEDOUT ; + +return thelio_io_get_errno (thelio_io); +} + +static int thelio_io_raw_event (struct hid_device *hdev,struct hid_report *report, +u8 *data,int size) +{ +struct thelio_io_device *thelio_io =hid_get_drvdata (hdev); + +/* only copy buffer when requested */ +if (completion_done (&thelio_io->wait_input_report)) +return 0 ; + +memcpy (thelio_io->buffer, data,min (BUFFER_SIZE , size)); +complete (&thelio_io->wait_input_report); + +return 0 ; +} + +/* requests and returns single data values depending on channel */ +static int get_data (struct thelio_io_device *thelio_io,int command,int channel, +bool two_byte_data) +{ +int ret; + +mutex_lock (&thelio_io->mutex); + + ret =send_usb_cmd (thelio_io, command, channel,0 ,0 ); +if (ret) + goto out_unlock; + + ret = thelio_io->buffer[HID_DATA +1 ]; +if (two_byte_data) + ret |= thelio_io->buffer[HID_DATA +2 ] <<8 ; + +out_unlock: +mutex_unlock (&thelio_io->mutex); +return ret; +} + +static int set_pwm (struct thelio_io_device *thelio_io,int channel,long val) +{ +int ret; + +if (val <0 || val >255 ) +return -EINVAL ; + +mutex_lock (&thelio_io->mutex); + + ret =send_usb_cmd (thelio_io,CMD_FAN_SET , channel, val,0 ); + +mutex_unlock (&thelio_io->mutex); +return ret; +} + +static int thelio_io_read_string (struct device *dev,enum hwmon_sensor_types type, +u32 attr,int channel,const char **str) +{ +switch (type) { +case hwmon_fan: +switch (attr) { +case hwmon_fan_label: +switch (channel) { +case 0 : + *str ="CPU Fan" ; +return 0 ; +case 1 : + *str ="Intake Fan" ; +return 0 ; +case 2 : + *str ="GPU Fan" ; +return 0 ; +case 3 : + *str ="Aux Fan" ; +return 0 ; +default : +break ; + } +default : +break ; + } +break ; +default : +break ; + } + +return -EOPNOTSUPP ; +} + +static int thelio_io_read (struct device *dev,enum hwmon_sensor_types type, +u32 attr,int channel,long *val) +{ +struct thelio_io_device *thelio_io =dev_get_drvdata (dev); +int ret; + +switch (type) { +case hwmon_fan: +switch (attr) { +case hwmon_fan_input: + ret =get_data (thelio_io,CMD_FAN_TACH , channel, true); +if (ret <0 ) +return ret; + *val = ret; +return 0 ; +default : +break ; + } +break ; +case hwmon_pwm: +switch (attr) { +case hwmon_pwm_input: + ret =get_data (thelio_io,CMD_FAN_GET , channel, false); +if (ret <0 ) +return ret; + *val = ret; +return 0 ; +default : +break ; + } +break ; +default : +break ; + } + +return -EOPNOTSUPP ; +}; + +static int thelio_io_write (struct device *dev,enum hwmon_sensor_types type, +u32 attr,int channel,long val) +{ +struct thelio_io_device *thelio_io =dev_get_drvdata (dev); + +switch (type) { +case hwmon_pwm: +switch (attr) { +case hwmon_pwm_input: +return set_pwm (thelio_io, channel, val); +default : +break ; + } +break ; +default : +break ; + } + +return -EOPNOTSUPP ; +}; + +static umode_t thelio_io_is_visible (const void *data,enum hwmon_sensor_types type, +u32 attr,int channel) +{ +switch (type) { +case hwmon_fan: +switch (attr) { +case hwmon_fan_input: +return 0444 ; +case hwmon_fan_label: +return 0444 ; +default : +break ; + } +break ; +case hwmon_pwm: +switch (attr) { +case hwmon_pwm_input: +return 0644 ; +default : +break ; + } +break ; +default : +break ; + } + +return 0 ; +}; + +static const struct hwmon_ops thelio_io_hwmon_ops = { + .is_visible = thelio_io_is_visible, + .read = thelio_io_read, + .read_string = thelio_io_read_string, + .write = thelio_io_write, +}; + +static const struct hwmon_channel_info *thelio_io_info[] = { +HWMON_CHANNEL_INFO (chip, +HWMON_C_REGISTER_TZ ), +HWMON_CHANNEL_INFO (fan, +HWMON_F_INPUT |HWMON_F_LABEL , +HWMON_F_INPUT |HWMON_F_LABEL , +HWMON_F_INPUT |HWMON_F_LABEL , +HWMON_F_INPUT |HWMON_F_LABEL + ), + HWMON_CHANNEL_INFO(pwm, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUTdrivers/hwmon/system76-thelio-io.c line 289
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+ ), + NULL +}; + +static const struct hwmon_chip_info thelio_io_chip_info = { + .ops = &thelio_io_hwmon_ops, + .info = thelio_io_info, +}; + +#ifdef CONFIG_PM_SLEEP You suggested in one of your replies that is would by my responsibility to prove that standard PM calls are insufficient. That is not the case.
Quoted 51 lines
drivers/hwmon/system76-thelio-io.c new file +51
-0+static int thelio_io_pm (struct notifier_block *nb,unsigned long action,void *data) +{ + struct thelio_io_device *thelio_io = container_of(nb, struct thelio_io_device, pm_notifier); + +switch (action) { +case PM_HIBERNATION_PREPARE : +case PM_SUSPEND_PREPARE : +mutex_lock (&thelio_io->mutex); +send_usb_cmd (thelio_io,CMD_LED_SET_MODE ,0 ,1 ,0 ); +mutex_unlock (&thelio_io->mutex); +break ; + +case PM_POST_HIBERNATION : +case PM_POST_SUSPEND : +mutex_lock (&thelio_io->mutex); +send_usb_cmd (thelio_io,CMD_LED_SET_MODE ,0 ,0 ,0 ); +mutex_unlock (&thelio_io->mutex); +break ; + +case PM_POST_RESTORE : +case PM_RESTORE_PREPARE : +default : +break ; + } + +return NOTIFY_DONE ; +} +#endif + +static int thelio_io_probe (struct hid_device *hdev,const struct hid_device_id *id) +{ +struct thelio_io_device *thelio_io; +int ret; + + thelio_io =devm_kzalloc (&hdev->dev,sizeof (*thelio_io),GFP_KERNEL ); +if (!thelio_io) +return -ENOMEM ; + + thelio_io->buffer =devm_kmalloc (&hdev->dev,BUFFER_SIZE ,GFP_KERNEL ); +if (!thelio_io->buffer) +return -ENOMEM ; + + ret =hid_parse (hdev); +if (ret) +return ret; + + ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT ); +if (ret) +return ret; + + ret =hid_hw_open (hdev);drivers/hwmon/system76-thelio-io.c line 350
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+if (ret) + goto out_hw_stop; + + thelio_io->hdev = hdev; +hid_set_drvdata (hdev, thelio_io); +mutex_init (&thelio_io->mutex); +init_completion (&thelio_io->wait_input_report); + +hid_device_io_start (hdev); +Just in case the below is _really_ necessary, which seems unlikely to me, why call
hid_device_io_start()even if no hwmon device is going to be registered ? Why start IO on a device that isn't doing anything ?Quoted 6 lines
drivers/hwmon/system76-thelio-io.c new file +6
-0+if (hdev->maxcollection ==1 && hdev->collection[0 ].usage ==0xFF600061 ) { + thelio_io->hwmon_dev =hwmon_device_register_with_info (&hdev->dev, +"system76_thelio_io" , + thelio_io, + &thelio_io_chip_info, +0 );drivers/hwmon/system76-thelio-io.c line 366
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+if (IS_ERR (thelio_io->hwmon_dev)) { + ret =PTR_ERR (thelio_io->hwmon_dev); + goto out_hw_close; + } + +#ifdef CONFIG_PM_SLEEP + thelio_io->pm_notifier.notifier_call = thelio_io_pm; +register_pm_notifier (&thelio_io->pm_notifier); +#endif + }Ok, whatever your explanation for this is: I am not going to accept it, period. It doesn't make sense to instantiate a driver that doesn't do anything. If this would for whatever reason _really_ _really_ _really_ be necessary, I'd expect a lengthy comment describing why this is the case and why it would be necessary to keep possibly multiple instances of this driver around that don't do anything.
And, no, I am not going to dig through all your replies trying to figure out your rationale for doing this. Note that, given that there is not a single driver in the kernel doing anything similar, you might have a hard time convincing me that this makes sense and is necessary (both the check and successfully instantiating the driver without registering a hwmon device).
Quoted 60 lines
drivers/hwmon/system76-thelio-io.c new file +58
-0+ +return 0 ; + +out_hw_close: +hid_hw_close (hdev); +out_hw_stop: +hid_hw_stop (hdev); +return ret; +} + +static void thelio_io_remove (struct hid_device *hdev) +{ +struct thelio_io_device *thelio_io =hid_get_drvdata (hdev); + +if (thelio_io->hwmon_dev) { +hwmon_device_unregister (thelio_io->hwmon_dev); + +#ifdef CONFIG_PM_SLEEP +unregister_pm_notifier (&thelio_io->pm_notifier); +#endif + } + +hid_hw_close (hdev); +hid_hw_stop (hdev); +} + +static const struct hid_device_id thelio_io_devices[] = { + {HID_USB_DEVICE (0x3384 ,0x000B ) },/* thelio_io_2 */ + { } +}; + +static struct hid_driver thelio_io_driver = { + .name ="system76-thelio-io" , + .id_table = thelio_io_devices, + .probe = thelio_io_probe, + .remove = thelio_io_remove, + .raw_event = thelio_io_raw_event, +}; + +MODULE_DEVICE_TABLE (hid, thelio_io_devices); +MODULE_LICENSE ("GPL" ); + +static int __init thelio_io_init (void ) +{ +return hid_register_driver (&thelio_io_driver); +} + +static void __exit thelio_io_exit(void) +{ +hid_unregister_driver (&thelio_io_driver); +} + +/* +* When compiling this driver as built-in, hwmon initcalls will get called before the +* hid driver and this driver would fail to register. late_initcall solves this. +*/ +late_initcall (thelio_io_init); +module_exit (thelio_io_exit);Signature · 1 line
2.34.1
Almost none of your commentary is about the actual change.
Signature · 4 lines
Jeremy Soller System76 Principal Engineer [email protected]
Quoted 599 lines · Jeremy Soller
I give up.
Signature · 4 lines
Jeremy Soller System76 Principal Engineer [email protected]Quoted 590 lines · Guenter Roeck
Quoted 4 lines · Jeremy Soller
The System76 Thelio Io is a fan and power button LED controller. This driver fully supports the System76 Thelio Io, by exposing fan controls and sending the system suspend/resume state.
You might want to consider reading
Documentation/process/submitting-patches.rst. It would tell you that... However, for a multi-patch series, it is generally
best to avoid using In-Reply-To: to link to older versions of the series. This way multiple versions of the patch don't become an unmanageable forest of references in email clients. If a link is helpful, you can use the https://lore.kernel.org/ redirector (e.g., in the cover email text) to link to an earlier version of the patch series.It might possibly make sense to also add a note saying something like "don't send X revisions of your patch in a row".
Quoted 2 lines
Signed-off-by Jeremy Soller <[email protected]>---
Missing change log. You are flooding me with patch revisions. Do you really expect me to look into each of those to figure out what you changed ?
Random feedback below. Since the is no explanation for what has changed and what hasn't and why, the feedback is necessarily incomplete.
Quoted 1 line
Documentation/hwmon/system76-thelio-io.rst | 31 ++Missing reference in
Documentation/hwmon/index.rstQuoted 120 lines
MAINTAINERS | 7 + drivers/hwmon/Kconfig | 10 + drivers/hwmon/Makefile | 1 + drivers/hwmon/system76-thelio-io.c | 424 +++++++++++++++++++++ 5 files changed, 473 insertions(+) create mode 100644 Documentation/hwmon/system76-thelio-io.rst create mode 100644 drivers/hwmon/system76-thelio-io.cDocumentation/hwmon/system76-thelio-io.rst new file +31
-0@@ -0,0 +1,31 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later + +Kernel driver system76-thelio-io +========================== + +Supported devices: + + * System76 Thelio Io (thelio_io_2) + +Author: Jeremy Soller + +Description +----------- + +This driver implements the sysfs interface for the System76 Thelio Io. +The System76 Thelio Io is a USB device with 4 fan connectors and a +power button LED. + +Usage Notes +----------- + +Since it is a USB device, hotswapping is possible. The device is autodetected. + +Sysfs entries +------------- + +======================= ===================================================================== +fan[1-4]_input Connected fan rpm. +fan[1-4]_label Shows fan connector name. +pwm[1-4] Sets the fan speed. Values from 0-255. +======================= =====================================================================MAINTAINERS +7
-0@@ -20738,6 +20738,13 @@ L: [email protected] S: Maintained F: drivers/platform/x86/system76_acpi.c +SYSTEM76 THELIO IO DRIVER +M: Jeremy Soller <[email protected]> +M: System76 <[email protected]> +L: [email protected] +S: Maintained +F: drivers/hwmon/system76-thelio-io.c + SYSV FILESYSTEM S: Orphan F: Documentation/filesystems/sysv-fs.rstdrivers/hwmon/Kconfig +10
-0@@ -1965,6 +1965,16 @@ config SENSORS_SMM665 This driver can also be built as a module. If so, the module will be called smm665. +config SENSORS_SYSTEM76_THELIO_IO + tristate "System76 Thelio Io controller" + depends on HID + help + If you say yes here you get support for the System76 Thelio Io + controller. + + This driver can also be built as a module. If so, the module + will be called system76-thelio-io. + config SENSORS_ADC128D818 tristate "Texas Instruments ADC128D818" depends on I2Cdrivers/hwmon/Makefile +1
-0@@ -199,6 +199,7 @@ obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o obj-$(CONFIG_SENSORS_SPARX5) += sparx5-temp.o obj-$(CONFIG_SENSORS_STTS751) += stts751.o obj-$(CONFIG_SENSORS_SY7636A) += sy7636a-hwmon.o +obj-$(CONFIG_SENSORS_SYSTEM76_THELIO_IO) += system76-thelio-io.o obj-$(CONFIG_SENSORS_AMC6821) += amc6821.o obj-$(CONFIG_SENSORS_TC74) += tc74.o obj-$(CONFIG_SENSORS_THMC50) += thmc50.odrivers/hwmon/system76-thelio-io.c new file +18
-0@@ -0,0 +1,424 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* +* system76-thelio-io.c - Linux driver for System76 Thelio Io +* Copyright (C) 2023 System76 +* +* Based on: +* corsair-cpro.c - Linux driver for Corsair Commander Pro +* Copyright (C) 2020 Marius Zachmann <[email protected]> +* +* This driver uses hid reports to communicate with the device to allow hidraw userspace drivers +* still being used. The device does not use report ids. When using hidraw and this driver +* simultaniously, reports could be switched. +*/ + +#include <linux/bitops.h> +#include <linux/completion.h> +#include <linux/hid.h> drivers/hwmon/system76-thelio-io.c line 28
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+#include <linux/hwmon.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/slab.h> +#include <linux/suspend.h> +#include <linux/types.h> + +#define BUFFER_SIZE 32 +#define REQ_TIMEOUT 300Nit: It is customary to either add a comment describing the unit (here: milli-seconds) or to indicate it in the define (e.g.
REQ_TIMEOUT_MS).Quoted 251 lines
drivers/hwmon/system76-thelio-io.c new file +251
-0+ +#define HID_CMD 0 +#define HID_RES 1 +#define HID_DATA 2 + +#define CMD_FAN_GET 7 +#define CMD_FAN_SET 8 +#define CMD_LED_SET_MODE 16 +#define CMD_FAN_TACH 22 + +struct thelio_io_device { +struct hid_device *hdev; +struct device *hwmon_dev; +#ifdef CONFIG_PM_SLEEP +struct notifier_block pm_notifier; +#endif +struct completion wait_input_report; +struct mutex mutex;/* whenever buffer is used, lock before send_usb_cmd */ +u8 *buffer; +}; + +/* converts response error in buffer to errno */ +static int thelio_io_get_errno (struct thelio_io_device *thelio_io) +{ +switch (thelio_io->buffer[HID_RES ]) { +case 0x00 :/* success */ +return 0 ; +default : +return -EIO ; + } +} + +/* send command, check for error in response, response in thelio_io->buffer */ +static int send_usb_cmd (struct thelio_io_device *thelio_io,u8 command, +u8 byte1,u8 byte2,u8 byte3) +{ +int ret; + +memset (thelio_io->buffer,0x00 ,BUFFER_SIZE ); + thelio_io->buffer[HID_CMD ] = command; + thelio_io->buffer[HID_DATA ] = byte1; + thelio_io->buffer[HID_DATA +1 ] = byte2; + thelio_io->buffer[HID_DATA +2 ] = byte3; + +reinit_completion (&thelio_io->wait_input_report); + + ret =hid_hw_output_report (thelio_io->hdev, thelio_io->buffer,BUFFER_SIZE ); +if (ret <0 ) +return ret; + +if (!wait_for_completion_timeout (&thelio_io->wait_input_report, +msecs_to_jiffies (REQ_TIMEOUT ))) +return -ETIMEDOUT ; + +return thelio_io_get_errno (thelio_io); +} + +static int thelio_io_raw_event (struct hid_device *hdev,struct hid_report *report, +u8 *data,int size) +{ +struct thelio_io_device *thelio_io =hid_get_drvdata (hdev); + +/* only copy buffer when requested */ +if (completion_done (&thelio_io->wait_input_report)) +return 0 ; + +memcpy (thelio_io->buffer, data,min (BUFFER_SIZE , size)); +complete (&thelio_io->wait_input_report); + +return 0 ; +} + +/* requests and returns single data values depending on channel */ +static int get_data (struct thelio_io_device *thelio_io,int command,int channel, +bool two_byte_data) +{ +int ret; + +mutex_lock (&thelio_io->mutex); + + ret =send_usb_cmd (thelio_io, command, channel,0 ,0 ); +if (ret) + goto out_unlock; + + ret = thelio_io->buffer[HID_DATA +1 ]; +if (two_byte_data) + ret |= thelio_io->buffer[HID_DATA +2 ] <<8 ; + +out_unlock: +mutex_unlock (&thelio_io->mutex); +return ret; +} + +static int set_pwm (struct thelio_io_device *thelio_io,int channel,long val) +{ +int ret; + +if (val <0 || val >255 ) +return -EINVAL ; + +mutex_lock (&thelio_io->mutex); + + ret =send_usb_cmd (thelio_io,CMD_FAN_SET , channel, val,0 ); + +mutex_unlock (&thelio_io->mutex); +return ret; +} + +static int thelio_io_read_string (struct device *dev,enum hwmon_sensor_types type, +u32 attr,int channel,const char **str) +{ +switch (type) { +case hwmon_fan: +switch (attr) { +case hwmon_fan_label: +switch (channel) { +case 0 : + *str ="CPU Fan" ; +return 0 ; +case 1 : + *str ="Intake Fan" ; +return 0 ; +case 2 : + *str ="GPU Fan" ; +return 0 ; +case 3 : + *str ="Aux Fan" ; +return 0 ; +default : +break ; + } +default : +break ; + } +break ; +default : +break ; + } + +return -EOPNOTSUPP ; +} + +static int thelio_io_read (struct device *dev,enum hwmon_sensor_types type, +u32 attr,int channel,long *val) +{ +struct thelio_io_device *thelio_io =dev_get_drvdata (dev); +int ret; + +switch (type) { +case hwmon_fan: +switch (attr) { +case hwmon_fan_input: + ret =get_data (thelio_io,CMD_FAN_TACH , channel, true); +if (ret <0 ) +return ret; + *val = ret; +return 0 ; +default : +break ; + } +break ; +case hwmon_pwm: +switch (attr) { +case hwmon_pwm_input: + ret =get_data (thelio_io,CMD_FAN_GET , channel, false); +if (ret <0 ) +return ret; + *val = ret; +return 0 ; +default : +break ; + } +break ; +default : +break ; + } + +return -EOPNOTSUPP ; +}; + +static int thelio_io_write (struct device *dev,enum hwmon_sensor_types type, +u32 attr,int channel,long val) +{ +struct thelio_io_device *thelio_io =dev_get_drvdata (dev); + +switch (type) { +case hwmon_pwm: +switch (attr) { +case hwmon_pwm_input: +return set_pwm (thelio_io, channel, val); +default : +break ; + } +break ; +default : +break ; + } + +return -EOPNOTSUPP ; +}; + +static umode_t thelio_io_is_visible (const void *data,enum hwmon_sensor_types type, +u32 attr,int channel) +{ +switch (type) { +case hwmon_fan: +switch (attr) { +case hwmon_fan_input: +return 0444 ; +case hwmon_fan_label: +return 0444 ; +default : +break ; + } +break ; +case hwmon_pwm: +switch (attr) { +case hwmon_pwm_input: +return 0644 ; +default : +break ; + } +break ; +default : +break ; + } + +return 0 ; +}; + +static const struct hwmon_ops thelio_io_hwmon_ops = { + .is_visible = thelio_io_is_visible, + .read = thelio_io_read, + .read_string = thelio_io_read_string, + .write = thelio_io_write, +}; + +static const struct hwmon_channel_info *thelio_io_info[] = { +HWMON_CHANNEL_INFO (chip, +HWMON_C_REGISTER_TZ ), +HWMON_CHANNEL_INFO (fan, +HWMON_F_INPUT |HWMON_F_LABEL , +HWMON_F_INPUT |HWMON_F_LABEL , +HWMON_F_INPUT |HWMON_F_LABEL , +HWMON_F_INPUT |HWMON_F_LABEL + ), + HWMON_CHANNEL_INFO(pwm, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUTdrivers/hwmon/system76-thelio-io.c line 289
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+ ), + NULL +}; + +static const struct hwmon_chip_info thelio_io_chip_info = { + .ops = &thelio_io_hwmon_ops, + .info = thelio_io_info, +}; + +#ifdef CONFIG_PM_SLEEP You suggested in one of your replies that is would by my responsibility to prove that standard PM calls are insufficient. That is not the case.
Quoted 51 lines
drivers/hwmon/system76-thelio-io.c new file +51
-0+static int thelio_io_pm (struct notifier_block *nb,unsigned long action,void *data) +{ + struct thelio_io_device *thelio_io = container_of(nb, struct thelio_io_device, pm_notifier); + +switch (action) { +case PM_HIBERNATION_PREPARE : +case PM_SUSPEND_PREPARE : +mutex_lock (&thelio_io->mutex); +send_usb_cmd (thelio_io,CMD_LED_SET_MODE ,0 ,1 ,0 ); +mutex_unlock (&thelio_io->mutex); +break ; + +case PM_POST_HIBERNATION : +case PM_POST_SUSPEND : +mutex_lock (&thelio_io->mutex); +send_usb_cmd (thelio_io,CMD_LED_SET_MODE ,0 ,0 ,0 ); +mutex_unlock (&thelio_io->mutex); +break ; + +case PM_POST_RESTORE : +case PM_RESTORE_PREPARE : +default : +break ; + } + +return NOTIFY_DONE ; +} +#endif + +static int thelio_io_probe (struct hid_device *hdev,const struct hid_device_id *id) +{ +struct thelio_io_device *thelio_io; +int ret; + + thelio_io =devm_kzalloc (&hdev->dev,sizeof (*thelio_io),GFP_KERNEL ); +if (!thelio_io) +return -ENOMEM ; + + thelio_io->buffer =devm_kmalloc (&hdev->dev,BUFFER_SIZE ,GFP_KERNEL ); +if (!thelio_io->buffer) +return -ENOMEM ; + + ret =hid_parse (hdev); +if (ret) +return ret; + + ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT ); +if (ret) +return ret; + + ret =hid_hw_open (hdev);drivers/hwmon/system76-thelio-io.c line 350
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+if (ret) + goto out_hw_stop; + + thelio_io->hdev = hdev; +hid_set_drvdata (hdev, thelio_io); +mutex_init (&thelio_io->mutex); +init_completion (&thelio_io->wait_input_report); + +hid_device_io_start (hdev); +Just in case the below is _really_ necessary, which seems unlikely to me, why call
hid_device_io_start()even if no hwmon device is going to be registered ? Why start IO on a device that isn't doing anything ?Quoted 6 lines
drivers/hwmon/system76-thelio-io.c new file +6
-0+if (hdev->maxcollection ==1 && hdev->collection[0 ].usage ==0xFF600061 ) { + thelio_io->hwmon_dev =hwmon_device_register_with_info (&hdev->dev, +"system76_thelio_io" , + thelio_io, + &thelio_io_chip_info, +0 );drivers/hwmon/system76-thelio-io.c line 366
Quoted 10 lines
drivers/hwmon/system76-thelio-io.c new file +10
-0+if (IS_ERR (thelio_io->hwmon_dev)) { + ret =PTR_ERR (thelio_io->hwmon_dev); + goto out_hw_close; + } + +#ifdef CONFIG_PM_SLEEP + thelio_io->pm_notifier.notifier_call = thelio_io_pm; +register_pm_notifier (&thelio_io->pm_notifier); +#endif + }Ok, whatever your explanation for this is: I am not going to accept it, period. It doesn't make sense to instantiate a driver that doesn't do anything. If this would for whatever reason _really_ _really_ _really_ be necessary, I'd expect a lengthy comment describing why this is the case and why it would be necessary to keep possibly multiple instances of this driver around that don't do anything.
And, no, I am not going to dig through all your replies trying to figure out your rationale for doing this. Note that, given that there is not a single driver in the kernel doing anything similar, you might have a hard time convincing me that this makes sense and is necessary (both the check and successfully instantiating the driver without registering a hwmon device).
Quoted 60 lines
drivers/hwmon/system76-thelio-io.c new file +58
-0+ +return 0 ; + +out_hw_close: +hid_hw_close (hdev); +out_hw_stop: +hid_hw_stop (hdev); +return ret; +} + +static void thelio_io_remove (struct hid_device *hdev) +{ +struct thelio_io_device *thelio_io =hid_get_drvdata (hdev); + +if (thelio_io->hwmon_dev) { +hwmon_device_unregister (thelio_io->hwmon_dev); + +#ifdef CONFIG_PM_SLEEP +unregister_pm_notifier (&thelio_io->pm_notifier); +#endif + } + +hid_hw_close (hdev); +hid_hw_stop (hdev); +} + +static const struct hid_device_id thelio_io_devices[] = { + {HID_USB_DEVICE (0x3384 ,0x000B ) },/* thelio_io_2 */ + { } +}; + +static struct hid_driver thelio_io_driver = { + .name ="system76-thelio-io" , + .id_table = thelio_io_devices, + .probe = thelio_io_probe, + .remove = thelio_io_remove, + .raw_event = thelio_io_raw_event, +}; + +MODULE_DEVICE_TABLE (hid, thelio_io_devices); +MODULE_LICENSE ("GPL" ); + +static int __init thelio_io_init (void ) +{ +return hid_register_driver (&thelio_io_driver); +} + +static void __exit thelio_io_exit(void) +{ +hid_unregister_driver (&thelio_io_driver); +} + +/* +* When compiling this driver as built-in, hwmon initcalls will get called before the +* hid driver and this driver would fail to register. late_initcall solves this. +*/ +late_initcall (thelio_io_init); +module_exit (thelio_io_exit);Signature · 1 line
2.34.1