Octo support is now accepted, update repo to reflect that

This commit is contained in:
Aleksa Savić
2022-04-04 16:29:46 +02:00
parent d0093fe224
commit 9496f16632
4 changed files with 8 additions and 511 deletions

2
Kbuild
View File

@@ -1 +1 @@
obj-m := aquacomputer_d5next.o aquacomputer_octo.o
obj-m := aquacomputer_d5next.o

View File

@@ -2,11 +2,11 @@
A hwmon Linux kernel driver supporting the following Aquacomputer devices:
| Device | Supported since kernel | Functionality |
| :----------: | :--------------------: | :------------------------------------------: |
| D5 Next | 5.15 | Various sensors |
| Farbwerk 360 | 5.18 | Temperature sensors |
| Octo | Not yet in mainline | Temperature and fan sensors, fan PWM control |
| Device | Supported since kernel | Functionality |
| :----------: | :--------------------: | :-------------------------------------------------: |
| D5 Next | 5.15 | Various sensors |
| Farbwerk 360 | 5.18 | Temperature sensors |
| Octo | 5.19 | Temperature and fan sensors, direct fan PWM control |
Being a standard `hwmon` driver, it provides readings via `sysfs`, which are easily accessible through `lm-sensors` as usual. Here's example output for some of the devices:

View File

@@ -216,11 +216,13 @@ struct aqc_data {
unsigned long updated;
};
/* Converts from centi-percent */
static int aqc_percent_to_pwm(u16 val)
{
return DIV_ROUND_CLOSEST(val * 255, 100 * 100);
}
/* Converts to centi-percent */
static int aqc_pwm_to_percent(long val)
{
if (val < 0 || val > 255)

View File

@@ -1,505 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* hwmon driver for Aquacomputer Octo fan controller
*
* The Octo sends HID reports (with ID 0x01) every second to report sensor values
* of up to four connected temperature sensors and up to eight connected fans.
*
* Copyright 2022 Aleksa Savic <savicaleksa83@gmail.com>
*/
#include <asm/unaligned.h>
#include <linux/crc16.h>
#include <linux/debugfs.h>
#include <linux/hid.h>
#include <linux/hwmon.h>
#include <linux/jiffies.h>
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/seq_file.h>
#define DRIVER_NAME "aquacomputer_octo"
#define SENSOR_REPORT_ID 0x01
#define STATUS_UPDATE_INTERVAL (2 * HZ) /* In seconds */
/* Register offsets */
#define SERIAL_FIRST_PART 0x03
#define SERIAL_SECOND_PART 0x05
#define FIRMWARE_VERSION 0x0D
/* Register offsets for temperature sensors */
#define NUM_SENSORS 4
#define SENSORS_START 0x3D
#define SENSOR_SIZE 0x02
#define SENSOR_DISCONNECTED 0x7FFF
/* Fan info in sensor report */
#define NUM_FANS 8
#define FAN_PERCENT_OFFSET 0x00
#define FAN_VOLTAGE_OFFSET 0x02
#define FAN_CURRENT_OFFSET 0x04
#define FAN_POWER_OFFSET 0x06
#define FAN_SPEED_OFFSET 0x08
/* Registers for reading fan-related info */
static u8 sensor_fan_offsets[] = {
0x7D,
0x8A,
0x97,
0xA4,
0xB1,
0xBE,
0xCB,
0xD8
};
#define CTRL_REPORT_ID 0x03
#define CTRL_REPORT_SIZE 0x65F
#define CTRL_REPORT_CHECKSUM_OFFSET 0x65D
#define CTRL_REPORT_CHECKSUM_START 0x01
#define CTRL_REPORT_CHECKSUM_LENGTH 0x65C
/* Fan speed registers in control report (from 0-100%) */
static u16 ctrl_fan_offsets[] = {
0x5B,
0xB0,
0x105,
0x15A,
0x1AF,
0x204,
0x259,
0x2AE
};
/* The HID report that the official software always sends after writing values */
#define SECONDARY_CTRL_REPORT_ID 0x02
#define SECONDARY_CTRL_REPORT_SIZE 0x0B
static u8 secondary_ctrl_report[] = {
0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x34, 0xC6
};
struct octo_data {
struct hid_device *hdev;
struct device *hwmon_dev;
struct dentry *debugfs;
struct mutex mutex;
s32 temp_input[4];
u16 speed_input[8];
u32 power_input[8];
u16 voltage_input[8];
u16 current_input[8];
u32 serial_number[2];
u16 firmware_version;
u8 *buffer;
unsigned long updated;
};
static int octo_percent_to_pwm(u16 val)
{
return DIV_ROUND_CLOSEST(val * 255, 100 * 100);
}
static u16 octo_pwm_to_percent(u8 val)
{
return DIV_ROUND_CLOSEST(val * 100 * 100, 255);
}
/* Expects the mutex to be locked */
static int octo_get_ctrl_data(struct octo_data *priv)
{
int ret;
memset(priv->buffer, 0x00, CTRL_REPORT_SIZE);
ret = hid_hw_raw_request(priv->hdev, CTRL_REPORT_ID, priv->buffer,
CTRL_REPORT_SIZE, HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
if (ret < 0)
ret = -ENODATA;
return ret;
}
/* Expects the mutex to be locked */
static int octo_send_ctrl_data(struct octo_data *priv)
{
int ret;
u16 checksum = 0xffff; /* Init value for CRC-16/USB */
checksum = crc16(checksum, priv->buffer + CTRL_REPORT_CHECKSUM_START, CTRL_REPORT_CHECKSUM_LENGTH);
checksum ^= 0xffff; /* Xorout value for CRC-16/USB */
/* Place the new checksum at the end of the report */
put_unaligned_be16(checksum, priv->buffer + CTRL_REPORT_CHECKSUM_OFFSET);
/* Send the patched up report back to the pump */
ret = hid_hw_raw_request(priv->hdev, CTRL_REPORT_ID, priv->buffer, CTRL_REPORT_SIZE,
HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
if (ret < 0)
goto exit;
/* The official software sends this report after every change, so do it here as well */
ret = hid_hw_raw_request(priv->hdev, SECONDARY_CTRL_REPORT_ID, secondary_ctrl_report, SECONDARY_CTRL_REPORT_SIZE, HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
exit:
return ret;
}
static umode_t octo_is_visible(const void *data, enum hwmon_sensor_types type, u32 attr,
int channel)
{
switch (type) {
case hwmon_temp:
return 0444;
case hwmon_fan:
return 0444;
case hwmon_power:
return 0444;
case hwmon_pwm:
switch (attr) {
case hwmon_pwm_input:
return 0644;
default:
break;
}
break;
case hwmon_in:
return 0444;
case hwmon_curr:
return 0444;
default:
break;
}
return 0;
}
static int octo_read(struct device *dev, enum hwmon_sensor_types type, u32 attr, int channel,
long *val)
{
int ret;
struct octo_data *priv = dev_get_drvdata(dev);
if (time_after(jiffies, priv->updated + STATUS_UPDATE_INTERVAL))
return -ENODATA;
switch (type) {
case hwmon_temp:
*val = priv->temp_input[channel];
break;
case hwmon_fan:
*val = priv->speed_input[channel];
break;
case hwmon_power:
*val = priv->power_input[channel];
break;
case hwmon_pwm:
mutex_lock(&priv->mutex);
ret = octo_get_ctrl_data(priv);
if (ret < 0)
goto unlock;
*val = octo_percent_to_pwm(get_unaligned_be16(priv->buffer + ctrl_fan_offsets[channel]));
unlock:
mutex_unlock(&priv->mutex);
break;
case hwmon_in:
*val = priv->voltage_input[channel];
break;
case hwmon_curr:
*val = priv->current_input[channel];
break;
default:
return -EOPNOTSUPP;
}
return 0;
}
static int octo_read_string(struct device *dev, enum hwmon_sensor_types type, u32 attr,
int channel, const char **str)
{
return -EOPNOTSUPP;
}
static int octo_write(struct device *dev, enum hwmon_sensor_types type, u32 attr,
int channel, long val)
{
int ret;
struct octo_data *priv = dev_get_drvdata(dev);
switch (type) {
case hwmon_pwm:
switch (attr) {
case hwmon_pwm_input:
mutex_lock(&priv->mutex);
ret = octo_get_ctrl_data(priv);
if (ret < 0)
goto unlock_and_return;
put_unaligned_be16(octo_pwm_to_percent(val), priv->buffer + ctrl_fan_offsets[channel]);
ret = octo_send_ctrl_data(priv);
unlock_and_return:
mutex_unlock(&priv->mutex);
return ret;
default:
break;
}
break;
default:
break;
}
return 0;
}
static const struct hwmon_ops octo_hwmon_ops = {
.is_visible = octo_is_visible,
.read = octo_read,
.read_string = octo_read_string,
.write = octo_write
};
static const struct hwmon_channel_info *octo_info[] = {
HWMON_CHANNEL_INFO(temp,
HWMON_T_INPUT | HWMON_T_LABEL,
HWMON_T_INPUT | HWMON_T_LABEL,
HWMON_T_INPUT | HWMON_T_LABEL,
HWMON_T_INPUT | HWMON_T_LABEL),
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_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,
HWMON_PWM_INPUT,
HWMON_PWM_INPUT,
HWMON_PWM_INPUT,
HWMON_PWM_INPUT),
HWMON_CHANNEL_INFO(power,
HWMON_P_INPUT | HWMON_P_LABEL,
HWMON_P_INPUT | HWMON_P_LABEL,
HWMON_P_INPUT | HWMON_P_LABEL,
HWMON_P_INPUT | HWMON_P_LABEL,
HWMON_P_INPUT | HWMON_P_LABEL,
HWMON_P_INPUT | HWMON_P_LABEL,
HWMON_P_INPUT | HWMON_P_LABEL,
HWMON_P_INPUT | HWMON_P_LABEL),
HWMON_CHANNEL_INFO(in,
HWMON_I_INPUT | HWMON_I_LABEL,
HWMON_I_INPUT | HWMON_I_LABEL,
HWMON_I_INPUT | HWMON_I_LABEL,
HWMON_I_INPUT | HWMON_I_LABEL,
HWMON_I_INPUT | HWMON_I_LABEL,
HWMON_I_INPUT | HWMON_I_LABEL,
HWMON_I_INPUT | HWMON_I_LABEL,
HWMON_I_INPUT | HWMON_I_LABEL),
HWMON_CHANNEL_INFO(curr,
HWMON_C_INPUT | HWMON_C_LABEL,
HWMON_C_INPUT | HWMON_C_LABEL,
HWMON_C_INPUT | HWMON_C_LABEL,
HWMON_C_INPUT | HWMON_C_LABEL,
HWMON_C_INPUT | HWMON_C_LABEL,
HWMON_C_INPUT | HWMON_C_LABEL,
HWMON_C_INPUT | HWMON_C_LABEL,
HWMON_C_INPUT | HWMON_C_LABEL),
NULL
};
static const struct hwmon_chip_info octo_chip_info = {
.ops = &octo_hwmon_ops,
.info = octo_info,
};
static int octo_raw_event(struct hid_device *hdev, struct hid_report *report, u8 *data, int size)
{
int i, sensor_value;
struct octo_data *priv;
if (report->id != SENSOR_REPORT_ID)
return 0;
priv = hid_get_drvdata(hdev);
/* Info provided with every report */
priv->serial_number[0] = get_unaligned_be16(data + SERIAL_FIRST_PART);
priv->serial_number[1] = get_unaligned_be16(data + SERIAL_SECOND_PART);
priv->firmware_version = get_unaligned_be16(data + FIRMWARE_VERSION);
/* Temperature sensor readings */
for (i = 0; i < NUM_SENSORS; i++)
{
sensor_value = get_unaligned_be16(data + SENSORS_START + i * SENSOR_SIZE);
if (sensor_value == SENSOR_DISCONNECTED)
sensor_value = 0;
priv->temp_input[i] = sensor_value * 10;
}
/* Fan speed and PWM readings */
for (i = 0; i < NUM_FANS; i++) {
priv->speed_input[i] = get_unaligned_be16(data + sensor_fan_offsets[i] + FAN_SPEED_OFFSET);
priv->power_input[i] = get_unaligned_be16(data + sensor_fan_offsets[i] + FAN_POWER_OFFSET) * 10000;
priv->voltage_input[i] = get_unaligned_be16(data + sensor_fan_offsets[i] + FAN_VOLTAGE_OFFSET) * 10;
priv->current_input[i] = get_unaligned_be16(data + sensor_fan_offsets[i] + FAN_CURRENT_OFFSET);
}
priv->updated = jiffies;
return 0;
}
#ifdef CONFIG_DEBUG_FS
static int serial_number_show(struct seq_file *seqf, void *unused)
{
struct octo_data *priv = seqf->private;
seq_printf(seqf, "%05u-%05u\n", priv->serial_number[0], priv->serial_number[1]);
seq_printf(seqf, "%u-%u\n", priv->speed_input[0], priv->speed_input[7]);
if (priv->speed_input[0] == 0)
seq_printf(seqf, "nula je\n");
return 0;
}
DEFINE_SHOW_ATTRIBUTE(serial_number);
static int firmware_version_show(struct seq_file *seqf, void *unused)
{
struct octo_data *priv = seqf->private;
seq_printf(seqf, "%u\n", priv->firmware_version);
return 0;
}
DEFINE_SHOW_ATTRIBUTE(firmware_version);
static void octo_debugfs_init(struct octo_data *priv)
{
char name[32];
scnprintf(name, sizeof(name), "%s-%s", DRIVER_NAME, dev_name(&priv->hdev->dev));
priv->debugfs = debugfs_create_dir(name, NULL);
debugfs_create_file("serial_number", 0444, priv->debugfs, priv, &serial_number_fops);
debugfs_create_file("firmware_version", 0444, priv->debugfs, priv, &firmware_version_fops);
}
#else
static void octo_debugfs_init(struct octo_data *priv)
{
}
#endif
static int octo_probe(struct hid_device *hdev, const struct hid_device_id *id)
{
struct octo_data *priv;
int ret;
priv = devm_kzalloc(&hdev->dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
return -ENOMEM;
priv->hdev = hdev;
hid_set_drvdata(hdev, priv);
priv->buffer = devm_kzalloc(&hdev->dev, CTRL_REPORT_SIZE, GFP_KERNEL);
if (!priv->buffer)
return -ENOMEM;
priv->updated = jiffies - STATUS_UPDATE_INTERVAL;
ret = hid_parse(hdev);
if (ret)
return ret;
ret = hid_hw_start(hdev, HID_CONNECT_HIDRAW);
if (ret)
return ret;
ret = hid_hw_open(hdev);
if (ret)
goto fail_and_stop;
hid_device_io_start(hdev);
priv->hwmon_dev = hwmon_device_register_with_info(&hdev->dev, "octo", priv,
&octo_chip_info, NULL);
mutex_init(&priv->mutex);
if (IS_ERR(priv->hwmon_dev)) {
ret = PTR_ERR(priv->hwmon_dev);
goto fail_and_close;
}
octo_debugfs_init(priv);
return 0;
fail_and_close:
hid_hw_close(hdev);
fail_and_stop:
hid_hw_stop(hdev);
return ret;
}
static void octo_remove(struct hid_device *hdev)
{
struct octo_data *priv = hid_get_drvdata(hdev);
mutex_unlock(&priv->mutex);
mutex_destroy(&priv->mutex);
debugfs_remove_recursive(priv->debugfs);
hwmon_device_unregister(priv->hwmon_dev);
hid_hw_close(hdev);
hid_hw_stop(hdev);
}
static const struct hid_device_id octo_table[] = {
{ HID_USB_DEVICE(0x0c70, 0xf011) }, /* Aquacomputer Octo */
{},
};
MODULE_DEVICE_TABLE(hid, octo_table);
static struct hid_driver octo_driver = {
.name = DRIVER_NAME,
.id_table = octo_table,
.probe = octo_probe,
.remove = octo_remove,
.raw_event = octo_raw_event,
};
static int __init octo_init(void)
{
return hid_register_driver(&octo_driver);
}
static void __exit octo_exit(void)
{
hid_unregister_driver(&octo_driver);
}
/* Request to initialize after the HID bus to ensure it's not being loaded before */
late_initcall(octo_init);
module_exit(octo_exit);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Aleksa Savic <savicaleksa83@gmail.com>");
MODULE_DESCRIPTION("Hwmon driver for Aquacomputer Octo fan controller");