Skip to contentSkip to conversation

hwmon: (aquacomputer_d5next) Add D5 Next fan control support

PATCH Superseded Aleksa Savic 2 participants 3 messages Jul 17, 2022

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Aleksa Savic

author maintainer
#0 lore raw

PATCH 1/1 hwmon: (aquacomputer_d5next) Add D5 Next fan control support

Define pump and fan speed register offsets in
D5 Next control report, as well as its size, to expose PWM fan control.

---
 drivers/hwmon/aquacomputer_d5next.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/hwmon/aquacomputer_d5next.c +6 -0
index 0e56cc711a26..997d72ea6182 100644
@@ -71,8 +71,12 @@ static u8 secondary_ctrl_report[] = {
 #define D5NEXT_PUMP_OFFSET		0x6c
 #define D5NEXT_FAN_OFFSET		0x5f
 #define D5NEXT_5V_VOLTAGE		0x39
+#define D5NEXT_CTRL_REPORT_SIZE		0x329
 static u8 d5next_sensor_fan_offsets[] = { D5NEXT_PUMP_OFFSET, D5NEXT_FAN_OFFSET };
 
+/* Pump and fan speed registers in D5 Next control report (from 0-100%) */
+static u16 d5next_ctrl_fan_offsets[] = { 0x97, 0x42 };
+
 /* Register offsets for the Farbwerk RGB controller */
 #define FARBWERK_NUM_SENSORS		4
 #define FARBWERK_SENSOR_START		0x2f
@@ -667,9 +671,11 @@ static int aqc_probe(struct hid_device *hdev, const struct hid_device_id *id)
 
 		priv->num_fans = D5NEXT_NUM_FANS;
 		priv->fan_sensor_offsets = d5next_sensor_fan_offsets;
+		priv->fan_ctrl_offsets = d5next_ctrl_fan_offsets;
 		priv->num_temp_sensors = D5NEXT_NUM_SENSORS;
 		priv->temp_sensor_start_offset = D5NEXT_COOLANT_TEMP;
 		priv->power_cycle_count_offset = D5NEXT_POWER_CYCLES;
+		priv->buffer_size = D5NEXT_CTRL_REPORT_SIZE;
 
 		priv->temp_label = label_d5next_temp;
 		priv->speed_label = label_d5next_speeds;
Signature · 1 line
2.36.1
maintainer
#1 lore raw
Quoted 5 lines · Aleksa Savic

Define pump and fan speed register offsets in
D5 Next control report, as well as its size, to expose PWM fan control.

This suggests that Jack Doan was the author of this patch, not Aleksa Savic. However, that is not reflected in the patch itself. Please either use Originally-from: instead of Signed-off-by:
or make sure that the original author is listed correctly.

Thanks,
Guenter

Quoted 33 lines
---
  drivers/hwmon/aquacomputer_d5next.c | 6 ++++++
  1 file changed, 6 insertions(+)
drivers/hwmon/aquacomputer_d5next.c +6 -0
index 0e56cc711a26..997d72ea6182 100644
@@ -71,8 +71,12 @@ static u8 secondary_ctrl_report[] = {
  #define D5NEXT_PUMP_OFFSET		0x6c
  #define D5NEXT_FAN_OFFSET		0x5f
  #define D5NEXT_5V_VOLTAGE		0x39
+#define D5NEXT_CTRL_REPORT_SIZE		0x329
  static u8 d5next_sensor_fan_offsets[] = { D5NEXT_PUMP_OFFSET, D5NEXT_FAN_OFFSET };
 
+/* Pump and fan speed registers in D5 Next control report (from 0-100%) */
+static u16 d5next_ctrl_fan_offsets[] = { 0x97, 0x42 };
+
  /* Register offsets for the Farbwerk RGB controller */
  #define FARBWERK_NUM_SENSORS		4
  #define FARBWERK_SENSOR_START		0x2f
@@ -667,9 +671,11 @@ static int aqc_probe(struct hid_device *hdev, const struct hid_device_id *id)
 
  		priv->num_fans = D5NEXT_NUM_FANS;
  		priv->fan_sensor_offsets = d5next_sensor_fan_offsets;
+		priv->fan_ctrl_offsets = d5next_ctrl_fan_offsets;
  		priv->num_temp_sensors = D5NEXT_NUM_SENSORS;
  		priv->temp_sensor_start_offset = D5NEXT_COOLANT_TEMP;
  		priv->power_cycle_count_offset = D5NEXT_POWER_CYCLES;
+		priv->buffer_size = D5NEXT_CTRL_REPORT_SIZE;
 
  		priv->temp_label = label_d5next_temp;
  		priv->speed_label = label_d5next_speeds;
author maintainer
#2 lore raw
Quoted 7 lines · Guenter Roeck
Quoted 5 lines · Aleksa Savic

Define pump and fan speed register offsets in
D5 Next control report, as well as its size, to expose PWM fan control.

Quoted 8 lines

This suggests that Jack Doan was the author of this patch, not Aleksa Savic. However, that is not reflected in the patch itself. Please either use Originally-from: instead of Signed-off-by:
or make sure that the original author is listed correctly.

Thanks,
Guenter

Thanks for the clarification. I'll send a v2.

Aleksa

Quoted 31 lines
Quoted 30 lines
---
  drivers/hwmon/aquacomputer_d5next.c | 6 ++++++
  1 file changed, 6 insertions(+)
drivers/hwmon/aquacomputer_d5next.c +6 -0
index 0e56cc711a26..997d72ea6182 100644
@@ -71,8 +71,12 @@ static u8 secondary_ctrl_report[] = {
  #define D5NEXT_PUMP_OFFSET		0x6c
  #define D5NEXT_FAN_OFFSET		0x5f
  #define D5NEXT_5V_VOLTAGE		0x39
+#define D5NEXT_CTRL_REPORT_SIZE		0x329
  static u8 d5next_sensor_fan_offsets[] = { D5NEXT_PUMP_OFFSET, D5NEXT_FAN_OFFSET };
+/* Pump and fan speed registers in D5 Next control report (from 0-100%) */
+static u16 d5next_ctrl_fan_offsets[] = { 0x97, 0x42 };
+
  /* Register offsets for the Farbwerk RGB controller */
  #define FARBWERK_NUM_SENSORS		4
  #define FARBWERK_SENSOR_START		0x2f
@@ -667,9 +671,11 @@ static int aqc_probe(struct hid_device *hdev, const struct hid_device_id *id)
  		priv->num_fans = D5NEXT_NUM_FANS;
  		priv->fan_sensor_offsets = d5next_sensor_fan_offsets;
+		priv->fan_ctrl_offsets = d5next_ctrl_fan_offsets;
  		priv->num_temp_sensors = D5NEXT_NUM_SENSORS;
  		priv->temp_sensor_start_offset = D5NEXT_COOLANT_TEMP;
  		priv->power_cycle_count_offset = D5NEXT_POWER_CYCLES;
+		priv->buffer_size = D5NEXT_CTRL_REPORT_SIZE;
  		priv->temp_label = label_d5next_temp;
  		priv->speed_label = label_d5next_speeds;