WIP: [PATCH] hwmon: (w83627ehf) convert to with_info interface
Hi Jean, Guenter,
I'm part way through converting w83627ehf to use the devm_hwmon_device_register_with_info
interface and had some questions I'd appreciate the answer to. My WIP
code is attached below.
a) In the existing driver, all the pseudo files are showing up as:
/sys/devices/platform/w83627ehf.656/blah_input
with the rework:
/sys/devices/platform/w83627ehf.656/hwmon/hwmon1/
my reading is that the reworked one is correct? Although I guess the change is a pain for people with paths in tools.
b) The device has an intrusion0_alarm & intrusion1_alarm that seems pretty common looking in drivers/hwmon - some other devices have a intrustion%d_beep. Does it make sense to add a new hwmon_intrusion type to hwmon_sensor_types ?
c) The device has a bunch more pwm variants:
pwm2_max_output, pwm2_start_output, pwm2_step_output, pwm2_stop_output, pwm2_stop_time, pwm2_target, pwm2_tolerance
for each/some of it's outputs. What's the right thing to
do there? Add them all to hwmon_pwm_attr_templates ? (Unfortunately it looks like everyone has fun with their own
pwm settings).
For reference, I seem to have a w83667hg on an ASRock P55M Pro.
The current status is that 'reading' seems to work (from what I can tell but not looked at the PWM), and I've not converted the writers yet.
Thanks in advance,
Dave
From 1cc4523c938824caa589769497abf71449511326 Mon Sep 17 00:00:00 2001
From: "Dr. David Alan Gilbert" <[email protected]>
Date: Sun, 17 Nov 2019 00:34:36 +0000
Subject: [PATCH] hwmon: (w83627ehf) convert to with_info interface
Convert the old hwmon_device_register code todevm_hwmon_device_register_with_info.
--- drivers/hwmon/w83627ehf.c | 802 ++++++++++++++++---------------------- 1 file changed, 338 insertions(+), 464 deletions(-)
drivers/hwmon/w83627ehf.c +338 -464
@@ -417,8 +417,8 @@ static inline u8 in_to_reg(u32 val, u8 nr, const u16 *scale_in)struct w83627ehf_data {int addr;/* IO base of hw monitor block */ const char *name; +enum kinds kind;/* Convenience copy of sio_data->kind */ -struct device *hwmon_dev;struct mutex lock;u16 reg_temp[NUM_REG_TEMP ];
@@ -786,7 +786,6 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev) {struct w83627ehf_data *data =dev_get_drvdata (dev);struct w83627ehf_sio_data *sio_data =dev_get_platdata (dev); -int i;mutex_lock (&data->update_lock);
@@ -923,25 +922,10 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)return data; } +#if 0 /* * Sysfs callback functions */ -#define show_in_reg (reg) \ -static ssize_t \ -show_##reg(struct device *dev, struct device_attribute *attr, \ - char *buf) \ -{ \ - struct w83627ehf_data *data = w83627ehf_update_device(dev); \ - struct sensor_device_attribute *sensor_attr = \ - to_sensor_dev_attr(attr); \ - int nr = sensor_attr->index; \ - return sprintf(buf, "%ld\n", in_from_reg(data->reg[nr], nr, \ - data->scale_in)); \ -} -show_in_reg(in) -show_in_reg(in_min) -show_in_reg(in_max) -#define store_in_reg (REG , reg) \ static ssize_t \ store_in_##reg(struct device *dev, struct device_attribute *attr, \
@@ -967,6 +951,7 @@ store_in_##reg(struct device *dev, struct device_attribute *attr, \ store_in_reg(MIN, min)store_in_reg (MAX , max) +/* DAG! Note the 'index' here is odd - this is shared among all the alarms */static ssize_t show_alarm (struct device *dev,struct device_attribute *attr,char *buf) {
@@ -976,88 +961,6 @@ static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,return sprintf (buf,"%u\n" , (data->alarms >> nr) &0x01 ); } -static struct sensor_device_attribute sda_in_input[] = { -SENSOR_ATTR (in0_input,S_IRUGO , show_in,NULL ,0 ), -SENSOR_ATTR (in1_input,S_IRUGO , show_in,NULL ,1 ), -SENSOR_ATTR (in2_input,S_IRUGO , show_in,NULL ,2 ), -SENSOR_ATTR (in3_input,S_IRUGO , show_in,NULL ,3 ), -SENSOR_ATTR (in4_input,S_IRUGO , show_in,NULL ,4 ), -SENSOR_ATTR (in5_input,S_IRUGO , show_in,NULL ,5 ), -SENSOR_ATTR (in6_input,S_IRUGO , show_in,NULL ,6 ), -SENSOR_ATTR (in7_input,S_IRUGO , show_in,NULL ,7 ), -SENSOR_ATTR (in8_input,S_IRUGO , show_in,NULL ,8 ), -SENSOR_ATTR (in9_input,S_IRUGO , show_in,NULL ,9 ), -}; - -static struct sensor_device_attribute sda_in_alarm[] = { -SENSOR_ATTR (in0_alarm,S_IRUGO , show_alarm,NULL ,0 ), -SENSOR_ATTR (in1_alarm,S_IRUGO , show_alarm,NULL ,1 ), -SENSOR_ATTR (in2_alarm,S_IRUGO , show_alarm,NULL ,2 ), -SENSOR_ATTR (in3_alarm,S_IRUGO , show_alarm,NULL ,3 ), -SENSOR_ATTR (in4_alarm,S_IRUGO , show_alarm,NULL ,8 ), -SENSOR_ATTR (in5_alarm,S_IRUGO , show_alarm,NULL ,21 ), -SENSOR_ATTR (in6_alarm,S_IRUGO , show_alarm,NULL ,20 ), -SENSOR_ATTR (in7_alarm,S_IRUGO , show_alarm,NULL ,16 ), -SENSOR_ATTR (in8_alarm,S_IRUGO , show_alarm,NULL ,17 ), -SENSOR_ATTR (in9_alarm,S_IRUGO , show_alarm,NULL ,19 ), -}; - -static struct sensor_device_attribute sda_in_min[] = { -SENSOR_ATTR (in0_min,S_IWUSR |S_IRUGO , show_in_min, store_in_min,0 ), -SENSOR_ATTR (in1_min,S_IWUSR |S_IRUGO , show_in_min, store_in_min,1 ), -SENSOR_ATTR (in2_min,S_IWUSR |S_IRUGO , show_in_min, store_in_min,2 ), -SENSOR_ATTR (in3_min,S_IWUSR |S_IRUGO , show_in_min, store_in_min,3 ), -SENSOR_ATTR (in4_min,S_IWUSR |S_IRUGO , show_in_min, store_in_min,4 ), -SENSOR_ATTR (in5_min,S_IWUSR |S_IRUGO , show_in_min, store_in_min,5 ), -SENSOR_ATTR (in6_min,S_IWUSR |S_IRUGO , show_in_min, store_in_min,6 ), -SENSOR_ATTR (in7_min,S_IWUSR |S_IRUGO , show_in_min, store_in_min,7 ), -SENSOR_ATTR (in8_min,S_IWUSR |S_IRUGO , show_in_min, store_in_min,8 ), -SENSOR_ATTR (in9_min,S_IWUSR |S_IRUGO , show_in_min, store_in_min,9 ), -}; - -static struct sensor_device_attribute sda_in_max[] = { -SENSOR_ATTR (in0_max,S_IWUSR |S_IRUGO , show_in_max, store_in_max,0 ), -SENSOR_ATTR (in1_max,S_IWUSR |S_IRUGO , show_in_max, store_in_max,1 ), -SENSOR_ATTR (in2_max,S_IWUSR |S_IRUGO , show_in_max, store_in_max,2 ), -SENSOR_ATTR (in3_max,S_IWUSR |S_IRUGO , show_in_max, store_in_max,3 ), -SENSOR_ATTR (in4_max,S_IWUSR |S_IRUGO , show_in_max, store_in_max,4 ), -SENSOR_ATTR (in5_max,S_IWUSR |S_IRUGO , show_in_max, store_in_max,5 ), -SENSOR_ATTR (in6_max,S_IWUSR |S_IRUGO , show_in_max, store_in_max,6 ), -SENSOR_ATTR (in7_max,S_IWUSR |S_IRUGO , show_in_max, store_in_max,7 ), -SENSOR_ATTR (in8_max,S_IWUSR |S_IRUGO , show_in_max, store_in_max,8 ), -SENSOR_ATTR (in9_max,S_IWUSR |S_IRUGO , show_in_max, store_in_max,9 ), -}; - -static ssize_t -show_fan (struct device *dev,struct device_attribute *attr,char *buf) -{ -struct w83627ehf_data *data =w83627ehf_update_device (dev); -struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); -int nr = sensor_attr->index; -return sprintf (buf,"%d\n" , data->rpm[nr]); -} - -static ssize_t -show_fan_min (struct device *dev,struct device_attribute *attr,char *buf) -{ -struct w83627ehf_data *data =w83627ehf_update_device (dev); -struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); -int nr = sensor_attr->index; -return sprintf (buf,"%d\n" , - data->fan_from_reg_min (data->fan_min[nr], - data->fan_div[nr])); -} - -static ssize_t -show_fan_div (struct device *dev,struct device_attribute *attr, -char *buf) -{ -struct w83627ehf_data *data =w83627ehf_update_device (dev); -struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); -int nr = sensor_attr->index; -return sprintf (buf,"%u\n" ,div_from_reg (data->fan_div[nr])); -} -static ssize_t store_fan_min (struct device *dev,struct device_attribute *attr,const char *buf,size_t count)
@@ -1151,67 +1054,6 @@ store_fan_min(struct device *dev, struct device_attribute *attr,return count; } -static struct sensor_device_attribute sda_fan_input[] = { -SENSOR_ATTR (fan1_input,S_IRUGO , show_fan,NULL ,0 ), -SENSOR_ATTR (fan2_input,S_IRUGO , show_fan,NULL ,1 ), -SENSOR_ATTR (fan3_input,S_IRUGO , show_fan,NULL ,2 ), -SENSOR_ATTR (fan4_input,S_IRUGO , show_fan,NULL ,3 ), -SENSOR_ATTR (fan5_input,S_IRUGO , show_fan,NULL ,4 ), -}; - -static struct sensor_device_attribute sda_fan_alarm[] = { -SENSOR_ATTR (fan1_alarm,S_IRUGO , show_alarm,NULL ,6 ), -SENSOR_ATTR (fan2_alarm,S_IRUGO , show_alarm,NULL ,7 ), -SENSOR_ATTR (fan3_alarm,S_IRUGO , show_alarm,NULL ,11 ), -SENSOR_ATTR (fan4_alarm,S_IRUGO , show_alarm,NULL ,10 ), -SENSOR_ATTR (fan5_alarm,S_IRUGO , show_alarm,NULL ,23 ), -}; - -static struct sensor_device_attribute sda_fan_min[] = { -SENSOR_ATTR (fan1_min,S_IWUSR |S_IRUGO , show_fan_min, - store_fan_min,0 ), -SENSOR_ATTR (fan2_min,S_IWUSR |S_IRUGO , show_fan_min, - store_fan_min,1 ), -SENSOR_ATTR (fan3_min,S_IWUSR |S_IRUGO , show_fan_min, - store_fan_min,2 ), -SENSOR_ATTR (fan4_min,S_IWUSR |S_IRUGO , show_fan_min, - store_fan_min,3 ), -SENSOR_ATTR (fan5_min,S_IWUSR |S_IRUGO , show_fan_min, - store_fan_min,4 ), -}; - -static struct sensor_device_attribute sda_fan_div[] = { -SENSOR_ATTR (fan1_div,S_IRUGO , show_fan_div,NULL ,0 ), -SENSOR_ATTR (fan2_div,S_IRUGO , show_fan_div,NULL ,1 ), -SENSOR_ATTR (fan3_div,S_IRUGO , show_fan_div,NULL ,2 ), -SENSOR_ATTR (fan4_div,S_IRUGO , show_fan_div,NULL ,3 ), -SENSOR_ATTR (fan5_div,S_IRUGO , show_fan_div,NULL ,4 ), -}; - -static ssize_t -show_temp_label (struct device *dev,struct device_attribute *attr,char *buf) -{ -struct w83627ehf_data *data =w83627ehf_update_device (dev); -struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); -int nr = sensor_attr->index; -return sprintf (buf,"%s\n" , data->temp_label[data->temp_src[nr]]); -} - -#define show_temp_reg (addr, reg) \ -static ssize_t \ -show_##reg(struct device *dev, struct device_attribute *attr, \ - char *buf) \ -{ \ - struct w83627ehf_data *data = w83627ehf_update_device(dev); \ - struct sensor_device_attribute *sensor_attr = \ - to_sensor_dev_attr(attr); \ - int nr = sensor_attr->index; \ - return sprintf(buf, "%d\n", LM75_TEMP_FROM_REG(data->reg[nr])); \ -} -show_temp_reg (reg_temp, temp); -show_temp_reg (reg_temp_over, temp_max); -show_temp_reg (reg_temp_hyst, temp_max_hyst); -#define store_temp_reg (addr, reg) \ static ssize_t \ store_##reg(struct device *dev, struct device_attribute *attr, \
@@ -1235,16 +1077,6 @@ store_##reg(struct device *dev, struct device_attribute *attr, \store_temp_reg (reg_temp_over, temp_max);store_temp_reg (reg_temp_hyst, temp_max_hyst); -static ssize_t -show_temp_offset (struct device *dev,struct device_attribute *attr,char *buf) -{ -struct w83627ehf_data *data =w83627ehf_update_device (dev); -struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); - -return sprintf (buf,"%d\n" , - data->temp_offset[sensor_attr->index] *1000 ); -} -static ssize_t store_temp_offset (struct device *dev,struct device_attribute *attr,const char *buf,size_t count)
@@ -1268,117 +1100,6 @@ store_temp_offset(struct device *dev, struct device_attribute *attr,return count; } -static ssize_t -show_temp_type (struct device *dev,struct device_attribute *attr,char *buf) -{ -struct w83627ehf_data *data =w83627ehf_update_device (dev); -struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); -int nr = sensor_attr->index; -return sprintf (buf,"%d\n" , (int )data->temp_type[nr]); -} - -static struct sensor_device_attribute sda_temp_input[] = { -SENSOR_ATTR (temp1_input,S_IRUGO , show_temp,NULL ,0 ), -SENSOR_ATTR (temp2_input,S_IRUGO , show_temp,NULL ,1 ), -SENSOR_ATTR (temp3_input,S_IRUGO , show_temp,NULL ,2 ), -SENSOR_ATTR (temp4_input,S_IRUGO , show_temp,NULL ,3 ), -SENSOR_ATTR (temp5_input,S_IRUGO , show_temp,NULL ,4 ), -SENSOR_ATTR (temp6_input,S_IRUGO , show_temp,NULL ,5 ), -SENSOR_ATTR (temp7_input,S_IRUGO , show_temp,NULL ,6 ), -SENSOR_ATTR (temp8_input,S_IRUGO , show_temp,NULL ,7 ), -SENSOR_ATTR (temp9_input,S_IRUGO , show_temp,NULL ,8 ), -}; - -static struct sensor_device_attribute sda_temp_label[] = { -SENSOR_ATTR (temp1_label,S_IRUGO , show_temp_label,NULL ,0 ), -SENSOR_ATTR (temp2_label,S_IRUGO , show_temp_label,NULL ,1 ), -SENSOR_ATTR (temp3_label,S_IRUGO , show_temp_label,NULL ,2 ), -SENSOR_ATTR (temp4_label,S_IRUGO , show_temp_label,NULL ,3 ), -SENSOR_ATTR (temp5_label,S_IRUGO , show_temp_label,NULL ,4 ), -SENSOR_ATTR (temp6_label,S_IRUGO , show_temp_label,NULL ,5 ), -SENSOR_ATTR (temp7_label,S_IRUGO , show_temp_label,NULL ,6 ), -SENSOR_ATTR (temp8_label,S_IRUGO , show_temp_label,NULL ,7 ), -SENSOR_ATTR (temp9_label,S_IRUGO , show_temp_label,NULL ,8 ), -}; - -static struct sensor_device_attribute sda_temp_max[] = { -SENSOR_ATTR (temp1_max,S_IRUGO |S_IWUSR , show_temp_max, - store_temp_max,0 ), -SENSOR_ATTR (temp2_max,S_IRUGO |S_IWUSR , show_temp_max, - store_temp_max,1 ), -SENSOR_ATTR (temp3_max,S_IRUGO |S_IWUSR , show_temp_max, - store_temp_max,2 ), -SENSOR_ATTR (temp4_max,S_IRUGO |S_IWUSR , show_temp_max, - store_temp_max,3 ), -SENSOR_ATTR (temp5_max,S_IRUGO |S_IWUSR , show_temp_max, - store_temp_max,4 ), -SENSOR_ATTR (temp6_max,S_IRUGO |S_IWUSR , show_temp_max, - store_temp_max,5 ), -SENSOR_ATTR (temp7_max,S_IRUGO |S_IWUSR , show_temp_max, - store_temp_max,6 ), -SENSOR_ATTR (temp8_max,S_IRUGO |S_IWUSR , show_temp_max, - store_temp_max,7 ), -SENSOR_ATTR (temp9_max,S_IRUGO |S_IWUSR , show_temp_max, - store_temp_max,8 ), -}; - -static struct sensor_device_attribute sda_temp_max_hyst[] = { -SENSOR_ATTR (temp1_max_hyst,S_IRUGO |S_IWUSR , show_temp_max_hyst, - store_temp_max_hyst,0 ), -SENSOR_ATTR (temp2_max_hyst,S_IRUGO |S_IWUSR , show_temp_max_hyst, - store_temp_max_hyst,1 ), -SENSOR_ATTR (temp3_max_hyst,S_IRUGO |S_IWUSR , show_temp_max_hyst, - store_temp_max_hyst,2 ), -SENSOR_ATTR (temp4_max_hyst,S_IRUGO |S_IWUSR , show_temp_max_hyst, - store_temp_max_hyst,3 ), -SENSOR_ATTR (temp5_max_hyst,S_IRUGO |S_IWUSR , show_temp_max_hyst, - store_temp_max_hyst,4 ), -SENSOR_ATTR (temp6_max_hyst,S_IRUGO |S_IWUSR , show_temp_max_hyst, - store_temp_max_hyst,5 ), -SENSOR_ATTR (temp7_max_hyst,S_IRUGO |S_IWUSR , show_temp_max_hyst, - store_temp_max_hyst,6 ), -SENSOR_ATTR (temp8_max_hyst,S_IRUGO |S_IWUSR , show_temp_max_hyst, - store_temp_max_hyst,7 ), -SENSOR_ATTR (temp9_max_hyst,S_IRUGO |S_IWUSR , show_temp_max_hyst, - store_temp_max_hyst,8 ), -}; - -static struct sensor_device_attribute sda_temp_alarm[] = { -SENSOR_ATTR (temp1_alarm,S_IRUGO , show_alarm,NULL ,4 ), -SENSOR_ATTR (temp2_alarm,S_IRUGO , show_alarm,NULL ,5 ), -SENSOR_ATTR (temp3_alarm,S_IRUGO , show_alarm,NULL ,13 ), -}; - -static struct sensor_device_attribute sda_temp_type[] = { -SENSOR_ATTR (temp1_type,S_IRUGO , show_temp_type,NULL ,0 ), -SENSOR_ATTR (temp2_type,S_IRUGO , show_temp_type,NULL ,1 ), -SENSOR_ATTR (temp3_type,S_IRUGO , show_temp_type,NULL ,2 ), -}; - -static struct sensor_device_attribute sda_temp_offset[] = { -SENSOR_ATTR (temp1_offset,S_IRUGO |S_IWUSR , show_temp_offset, - store_temp_offset,0 ), -SENSOR_ATTR (temp2_offset,S_IRUGO |S_IWUSR , show_temp_offset, - store_temp_offset,1 ), -SENSOR_ATTR (temp3_offset,S_IRUGO |S_IWUSR , show_temp_offset, - store_temp_offset,2 ), -}; - -#define show_pwm_reg (reg) \ -static ssize_t show_##reg(struct device *dev, struct device_attribute *attr, \ - char *buf) \ -{ \ - struct w83627ehf_data *data = w83627ehf_update_device(dev); \ - struct sensor_device_attribute *sensor_attr = \ - to_sensor_dev_attr(attr); \ - int nr = sensor_attr->index; \ - return sprintf(buf, "%d\n", data->reg[nr]); \ -} - -show_pwm_reg(pwm_mode) -show_pwm_reg(pwm_enable) -show_pwm_reg(pwm) -static ssize_t store_pwm_mode (struct device *dev,struct device_attribute *attr,const char *buf,size_t count)
@@ -1555,35 +1276,6 @@ store_tolerance(struct device *dev, struct device_attribute *attr,return count; } -static struct sensor_device_attribute sda_pwm[] = { -SENSOR_ATTR (pwm1,S_IWUSR |S_IRUGO , show_pwm, store_pwm,0 ), -SENSOR_ATTR (pwm2,S_IWUSR |S_IRUGO , show_pwm, store_pwm,1 ), -SENSOR_ATTR (pwm3,S_IWUSR |S_IRUGO , show_pwm, store_pwm,2 ), -SENSOR_ATTR (pwm4,S_IWUSR |S_IRUGO , show_pwm, store_pwm,3 ), -}; - -static struct sensor_device_attribute sda_pwm_mode[] = { -SENSOR_ATTR (pwm1_mode,S_IWUSR |S_IRUGO , show_pwm_mode, - store_pwm_mode,0 ), -SENSOR_ATTR (pwm2_mode,S_IWUSR |S_IRUGO , show_pwm_mode, - store_pwm_mode,1 ), -SENSOR_ATTR (pwm3_mode,S_IWUSR |S_IRUGO , show_pwm_mode, - store_pwm_mode,2 ), -SENSOR_ATTR (pwm4_mode,S_IWUSR |S_IRUGO , show_pwm_mode, - store_pwm_mode,3 ), -}; - -static struct sensor_device_attribute sda_pwm_enable[] = { -SENSOR_ATTR (pwm1_enable,S_IWUSR |S_IRUGO , show_pwm_enable, - store_pwm_enable,0 ), -SENSOR_ATTR (pwm2_enable,S_IWUSR |S_IRUGO , show_pwm_enable, - store_pwm_enable,1 ), -SENSOR_ATTR (pwm3_enable,S_IWUSR |S_IRUGO , show_pwm_enable, - store_pwm_enable,2 ), -SENSOR_ATTR (pwm4_enable,S_IWUSR |S_IRUGO , show_pwm_enable, - store_pwm_enable,3 ), -}; -static struct sensor_device_attribute sda_target_temp[] = {SENSOR_ATTR (pwm1_target,S_IWUSR |S_IRUGO , show_target_temp, store_target_temp,0 ),
@@ -1745,6 +1437,7 @@ static struct sensor_device_attribute sda_sf3_max_step_arrays[] = {SENSOR_ATTR (pwm3_step_output,S_IWUSR |S_IRUGO , show_fan_step_output, store_fan_step_output, 2), }; +#endif static ssize_t cpu0_vid_show (struct device *dev,struct device_attribute *attr,char *buf)
@@ -1755,6 +1448,7 @@ cpu0_vid_show(struct device *dev, struct device_attribute *attr, char *buf)static DEVICE_ATTR_RO (cpu0_vid); +#if 0 /* Case open detection */ static ssize_t
@@ -1795,77 +1489,12 @@ static struct sensor_device_attribute_2 sda_caseopen[] = {SENSOR_ATTR_2 (intrusion1_alarm,S_IWUSR |S_IRUGO , show_caseopen, clear_caseopen, 0x40, 0x40), }; +#endif /* * Driver and device management */ -static void w83627ehf_device_remove_files (struct device *dev) -{ -/* -* some entries in the following arrays may not have been used in -* device_create_file(), but device_remove_file() will ignore them -*/ -int i; -struct w83627ehf_data *data =dev_get_drvdata (dev); - -for (i =0 ; i <ARRAY_SIZE (sda_sf3_arrays); i++) -device_remove_file (dev, &sda_sf3_arrays[i].dev_attr); -for (i =0 ; i <ARRAY_SIZE (sda_sf3_max_step_arrays); i++) { -struct sensor_device_attribute *attr = - &sda_sf3_max_step_arrays[i]; -if (data->REG_FAN_STEP_OUTPUT && - data->REG_FAN_STEP_OUTPUT[attr->index] !=0xff ) -device_remove_file (dev, &attr->dev_attr); - } -for (i =0 ; i <ARRAY_SIZE (sda_sf3_arrays_fan3); i++) -device_remove_file (dev, &sda_sf3_arrays_fan3[i].dev_attr); -for (i =0 ; i <ARRAY_SIZE (sda_sf3_arrays_fan4); i++) -device_remove_file (dev, &sda_sf3_arrays_fan4[i].dev_attr); -for (i =0 ; i < data->in_num; i++) { -if ((i ==6 ) && data->in6_skip) -continue ; -device_remove_file (dev, &sda_in_input[i].dev_attr); -device_remove_file (dev, &sda_in_alarm[i].dev_attr); -device_remove_file (dev, &sda_in_min[i].dev_attr); -device_remove_file (dev, &sda_in_max[i].dev_attr); - } -for (i =0 ; i <5 ; i++) { -device_remove_file (dev, &sda_fan_input[i].dev_attr); -device_remove_file (dev, &sda_fan_alarm[i].dev_attr); -device_remove_file (dev, &sda_fan_div[i].dev_attr); -device_remove_file (dev, &sda_fan_min[i].dev_attr); - } -for (i =0 ; i < data->pwm_num; i++) { -device_remove_file (dev, &sda_pwm[i].dev_attr); -device_remove_file (dev, &sda_pwm_mode[i].dev_attr); -device_remove_file (dev, &sda_pwm_enable[i].dev_attr); -device_remove_file (dev, &sda_target_temp[i].dev_attr); -device_remove_file (dev, &sda_tolerance[i].dev_attr); - } -for (i =0 ; i <NUM_REG_TEMP ; i++) { -if (!(data->have_temp & (1 << i))) -continue ; -device_remove_file (dev, &sda_temp_input[i].dev_attr); -device_remove_file (dev, &sda_temp_label[i].dev_attr); -if (i ==2 && data->temp3_val_only) -continue ; -device_remove_file (dev, &sda_temp_max[i].dev_attr); -device_remove_file (dev, &sda_temp_max_hyst[i].dev_attr); -if (i >2 ) -continue ; -device_remove_file (dev, &sda_temp_alarm[i].dev_attr); -device_remove_file (dev, &sda_temp_type[i].dev_attr); -device_remove_file (dev, &sda_temp_offset[i].dev_attr); - } - -device_remove_file (dev, &sda_caseopen[0 ].dev_attr); -device_remove_file (dev, &sda_caseopen[1 ].dev_attr); - -device_remove_file (dev, &dev_attr_name); -device_remove_file (dev, &dev_attr_cpu0_vid); -} -/* Get the monitoring functions started */ static inline void w83627ehf_init_device (struct w83627ehf_data *data,enum kinds kind)
@@ -2035,6 +1664,327 @@ w83627ehf_check_fan_inputs(const struct w83627ehf_sio_data *sio_data, } } +static umode_t +w83627ehf_is_visible (const void *drvdata,enum hwmon_sensor_types type, +u32 attr,int channel) +{ +const struct w83627ehf_data *data = drvdata; +bool is_writable = false; + +switch (type) { +case hwmon_temp: +/* channel 0.., name 1.. */ +if (!(data->have_temp & (1 << channel))) +return 0 ; +if (attr == hwmon_temp_input || attr == hwmon_temp_label) +return S_IRUGO ; +if (channel ==2 && data->temp3_val_only) +return 0 ; +if (attr == hwmon_temp_max) { +if (data->reg_temp_over[channel]) +return S_IRUGO |S_IWUSR ; +else +return 0 ; + } +if (attr == hwmon_temp_max_hyst) { +if (data->reg_temp_hyst[channel]) +return S_IRUGO |S_IWUSR ; +else +return 0 ; + } +if (channel >2 ) +return 0 ; +if (attr == hwmon_temp_alarm || attr == hwmon_temp_type) +return S_IRUGO ; +if (attr == hwmon_temp_offset) { +if (data->have_temp_offset & (1 << channel)) +return S_IRUGO |S_IWUSR ; +else +return 0 ; + } +break ; + +case hwmon_fan: +/* channel 0.., name 1.. */ +if (!(data->has_fan & (1 << channel))) +return 0 ; +if (attr == hwmon_fan_input || attr == hwmon_fan_alarm) +return S_IRUGO ; +if (attr == hwmon_fan_div) { +if (data->kind != nct6776) +return S_IRUGO ; +else +return 0 ; + } +if (attr == hwmon_fan_min) { +if (data->has_fan_min & (1 << channel)) +return S_IRUGO |S_IWUSR ; +else +return 0 ; + } +break ; + +case hwmon_in: +/* channel 0.., name 0.. */ +if (channel >= data->in_num) +return 0 ; +if (channel ==6 && data->in6_skip) +return 0 ; +if (attr == hwmon_in_alarm || attr == hwmon_in_input) +return S_IRUGO ; +if (attr == hwmon_in_min || attr == hwmon_in_max) +return S_IRUGO |S_IWUSR ; +break ; + +case hwmon_pwm: +/* channel 0.., name 1.. */ +if (!(data->has_fan & (1 << channel)) || + channel >= data->pwm_num) +return 0 ; +if (attr == hwmon_pwm_mode || attr == hwmon_pwm_enable || + attr == hwmon_pwm_input) +return S_IRUGO |S_IWUSR ; +/* TODO: More pwm entries */ + +break ; + +/* TODO: intrusion */ + +default :/* Shouldn't happen */ +return 0 ; + } + +return S_IRUGO | (is_writable ?S_IWUSR :0 ); +} + +static int +w83627ehf_do_read_temp (struct w83627ehf_data *data,u32 attr, +int channel,long *val) +{ +switch (attr) { +case hwmon_temp_input: + *val =LM75_TEMP_FROM_REG (data->temp[channel]); +return 0 ; +case hwmon_temp_max: + *val =LM75_TEMP_FROM_REG (data->temp_max[channel]); +return 0 ; +case hwmon_temp_max_hyst: + *val =LM75_TEMP_FROM_REG (data->temp_max_hyst[channel]); +return 0 ; +case hwmon_temp_offset: + *val = data->temp_offset[channel] *1000 ; +return 0 ; +case hwmon_temp_type: + *val = (int )data->temp_type[channel]; +return 0 ; +case hwmon_temp_alarm: +if (channel <3 ) { +int bit[] = {4 ,5 ,13 }; + *val = (data->alarms >> bit[channel]) &1 ; +return 0 ; + } +break ; + +default : +break ; + } + +return -EOPNOTSUPP ; +} + +static int +w83627ehf_do_read_in (struct w83627ehf_data *data,u32 attr, +int channel,long *val) +{ +switch (attr) { +case hwmon_in_input: + *val =in_from_reg (data->in[channel], channel, data->scale_in); +return 0 ; +case hwmon_in_min: + *val =in_from_reg (data->in_min[channel], channel, + data->scale_in); +return 0 ; +case hwmon_in_max: + *val =in_from_reg (data->in_max[channel], channel, + data->scale_in); +return 0 ; +case hwmon_in_alarm: +if (channel <10 ) { +int bit[] = {0 ,1 ,2 ,3 ,8 ,21 ,20 ,16 ,17 ,19 }; + *val = (data->alarms >> bit[channel]) &1 ; +return 0 ; + } +break ; +default : +break ; + } +return -EOPNOTSUPP ; +} + +static int +w83627ehf_do_read_fan (struct w83627ehf_data *data,u32 attr, +int channel,long *val) +{ +switch (attr) { +case hwmon_fan_input: + *val = data->rpm[channel]; +return 0 ; +case hwmon_fan_min: + *val = data->fan_from_reg_min (data->fan_min[channel], + data->fan_div[channel]); +return 0 ; +case hwmon_fan_div: + *val =div_from_reg (data->fan_div[channel]); +return 0 ; +case hwmon_fan_alarm: +if (channel <5 ) { +int bit[] = {6 ,7 ,11 ,10 ,23 }; + *val = (data->alarms >> bit[channel]) &1 ; +return 0 ; + } +break ; +default : +break ; + } +return -EOPNOTSUPP ; +} + +static int +w83627ehf_do_read_pwm (struct w83627ehf_data *data,u32 attr, +int channel,long *val) +{ +switch (attr) { +case hwmon_pwm_input: + *val = data->pwm[channel]; +return 0 ; +case hwmon_pwm_enable: + *val = data->pwm_enable[channel]; +return 0 ; +case hwmon_pwm_mode: + *val = data->pwm_enable[channel]; +return 0 ; +/* TODO: Other PWM entries */ +default : +break ; + } +return -EOPNOTSUPP ; +} +static int +w83627ehf_read (struct device *dev,enum hwmon_sensor_types type, +u32 attr,int channel,long *val) +{ +struct w83627ehf_data *data =w83627ehf_update_device (dev->parent); + +switch (type) { +case hwmon_fan: +return w83627ehf_do_read_fan (data, attr, channel, val); + +case hwmon_in: +return w83627ehf_do_read_in (data, attr, channel, val); + +case hwmon_pwm: +return w83627ehf_do_read_pwm (data, attr, channel, val); + +case hwmon_temp: +return w83627ehf_do_read_temp (data, attr, channel, val); + +/* TODO: Intrusion */ +default : +break ; + } + +return -EOPNOTSUPP ; +} + +static int +w83627ehf_read_string (struct device *dev,enum hwmon_sensor_types type, +u32 attr,int channel,const char **str) +{ +struct w83627ehf_data *data =dev_get_drvdata (dev); + +switch (type) { +case hwmon_temp: +if (attr == hwmon_temp_label) { + *str = data->temp_label[data->temp_src[channel]]; +return 0 ; + } +break ; + +default : +break ; + } +/* Nothing else should be read as a string */ +return -EOPNOTSUPP ; +} + +static int +w83627ehf_write (struct device *dev,enum hwmon_sensor_types type, +u32 attr,int channel,long val) +{ +return -EOPNOTSUPP ;/* TODO */ +} + +static const struct hwmon_ops w83627ehf_ops = { + .is_visible = w83627ehf_is_visible, + .read = w83627ehf_read, + .read_string = w83627ehf_read_string, + .write = w83627ehf_write, +}; + +static const struct hwmon_channel_info *w83627ehf_info[] = { +HWMON_CHANNEL_INFO (fan, +HWMON_F_ALARM |HWMON_F_DIV |HWMON_F_INPUT |HWMON_F_MIN , +HWMON_F_ALARM |HWMON_F_DIV |HWMON_F_INPUT |HWMON_F_MIN , +HWMON_F_ALARM |HWMON_F_DIV |HWMON_F_INPUT |HWMON_F_MIN , +HWMON_F_ALARM |HWMON_F_DIV |HWMON_F_INPUT |HWMON_F_MIN , +HWMON_F_ALARM |HWMON_F_DIV |HWMON_F_INPUT |HWMON_F_MIN ), +HWMON_CHANNEL_INFO (in, +HWMON_I_ALARM |HWMON_I_INPUT |HWMON_I_MAX |HWMON_I_MIN , +HWMON_I_ALARM |HWMON_I_INPUT |HWMON_I_MAX |HWMON_I_MIN , +HWMON_I_ALARM |HWMON_I_INPUT |HWMON_I_MAX |HWMON_I_MIN , +HWMON_I_ALARM |HWMON_I_INPUT |HWMON_I_MAX |HWMON_I_MIN , +HWMON_I_ALARM |HWMON_I_INPUT |HWMON_I_MAX |HWMON_I_MIN , +HWMON_I_ALARM |HWMON_I_INPUT |HWMON_I_MAX |HWMON_I_MIN , +HWMON_I_ALARM |HWMON_I_INPUT |HWMON_I_MAX |HWMON_I_MIN , +HWMON_I_ALARM |HWMON_I_INPUT |HWMON_I_MAX |HWMON_I_MIN , +HWMON_I_ALARM |HWMON_I_INPUT |HWMON_I_MAX |HWMON_I_MIN , +HWMON_I_ALARM |HWMON_I_INPUT |HWMON_I_MAX |HWMON_I_MIN ), +/* TODO: intrusion%d_alarm */ +/* TODO: We've also got {max|start|step|stop}_output, stop_time, target +* and tolerance +*/ +HWMON_CHANNEL_INFO (pwm, +HWMON_PWM_ENABLE |HWMON_PWM_INPUT |HWMON_PWM_MODE , +HWMON_PWM_ENABLE |HWMON_PWM_INPUT |HWMON_PWM_MODE , +HWMON_PWM_ENABLE |HWMON_PWM_INPUT |HWMON_PWM_MODE , +HWMON_PWM_ENABLE |HWMON_PWM_INPUT |HWMON_PWM_MODE ), +HWMON_CHANNEL_INFO (temp, +HWMON_T_ALARM |HWMON_T_INPUT |HWMON_T_LABEL |HWMON_T_MAX | +HWMON_T_MAX_HYST |HWMON_T_OFFSET |HWMON_T_TYPE , +HWMON_T_ALARM |HWMON_T_INPUT |HWMON_T_LABEL |HWMON_T_MAX | +HWMON_T_MAX_HYST |HWMON_T_OFFSET |HWMON_T_TYPE , +HWMON_T_ALARM |HWMON_T_INPUT |HWMON_T_LABEL |HWMON_T_MAX | +HWMON_T_MAX_HYST |HWMON_T_OFFSET |HWMON_T_TYPE , +HWMON_T_ALARM |HWMON_T_INPUT |HWMON_T_LABEL |HWMON_T_MAX | +HWMON_T_MAX_HYST |HWMON_T_OFFSET |HWMON_T_TYPE , +HWMON_T_ALARM |HWMON_T_INPUT |HWMON_T_LABEL |HWMON_T_MAX | +HWMON_T_MAX_HYST |HWMON_T_OFFSET |HWMON_T_TYPE , +HWMON_T_ALARM |HWMON_T_INPUT |HWMON_T_LABEL |HWMON_T_MAX | +HWMON_T_MAX_HYST |HWMON_T_OFFSET |HWMON_T_TYPE , +HWMON_T_ALARM |HWMON_T_INPUT |HWMON_T_LABEL |HWMON_T_MAX | +HWMON_T_MAX_HYST |HWMON_T_OFFSET |HWMON_T_TYPE , +HWMON_T_ALARM |HWMON_T_INPUT |HWMON_T_LABEL |HWMON_T_MAX | +HWMON_T_MAX_HYST |HWMON_T_OFFSET |HWMON_T_TYPE , +HWMON_T_ALARM |HWMON_T_INPUT |HWMON_T_LABEL |HWMON_T_MAX | +HWMON_T_MAX_HYST |HWMON_T_OFFSET |HWMON_T_TYPE ), +NULL +}; + +static const struct hwmon_chip_info w83627ehf_chip_info = { + .ops = &w83627ehf_ops, + .info = w83627ehf_info, +}; +static int w83627ehf_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;
@@ -2043,6 +1993,7 @@ static int w83627ehf_probe(struct platform_device *pdev)struct resource *res;u8 en_vrm10;int i, err =0 ; +struct device *hwmon_dev; res =platform_get_resource (pdev,IORESOURCE_IO ,0 );if (!request_region (res->start,IOREGION_LENGTH ,DRVNAME )) {
@@ -2064,6 +2015,7 @@ static int w83627ehf_probe(struct platform_device *pdev)mutex_init (&data->lock);mutex_init (&data->update_lock); data->name = w83627ehf_device_names[sio_data->kind]; + data->kind = sio_data->kind; data->bank =0xff ;/* Force initial bank selection */ platform_set_drvdata (pdev, data);
@@ -2433,6 +2385,7 @@ static int w83627ehf_probe(struct platform_device *pdev)for (i =0 ; i < data->pwm_num; i++) data->pwm_enable_orig[i] = data->pwm_enable[i]; +#if 0 /* DAG REMOVE! */ /* Register sysfs hooks */ for (i =0 ; i <ARRAY_SIZE (sda_sf3_arrays); i++) { err =device_create_file (dev, &sda_sf3_arrays[i].dev_attr);
@@ -2466,45 +2419,10 @@ static int w83627ehf_probe(struct platform_device *pdev) goto exit_remove; } - for (i = 0; i < data->in_num; i++) { - if ((i == 6) && data->in6_skip) - continue; - if ((err = device_create_file(dev, &sda_in_input[i].dev_attr)) - || (err = device_create_file(dev, - &sda_in_alarm[i].dev_attr)) - || (err = device_create_file(dev, - &sda_in_min[i].dev_attr)) - || (err = device_create_file(dev, - &sda_in_max[i].dev_attr))) - goto exit_remove; - } - for (i = 0; i < 5; i++) { if (data->has_fan & (1 << i)) { - if ((err = device_create_file(dev, - &sda_fan_input[i].dev_attr)) - || (err = device_create_file(dev, - &sda_fan_alarm[i].dev_attr))) - goto exit_remove; - if (sio_data->kind != nct6776) { - err = device_create_file(dev, - &sda_fan_div[i].dev_attr); - if (err) - goto exit_remove; - } - if (data->has_fan_min & (1 << i)) { - err = device_create_file(dev, - &sda_fan_min[i].dev_attr); - if (err) - goto exit_remove; - } if (i < data->pwm_num && - ((err = device_create_file(dev, - &sda_pwm[i].dev_attr)) - || (err = device_create_file(dev, - &sda_pwm_mode[i].dev_attr)) - || (err = device_create_file(dev, - &sda_pwm_enable[i].dev_attr)) + TODO - dag - more pwm || (err = device_create_file(dev, &sda_target_temp[i].dev_attr)) || (err = device_create_file(dev,
@@ -2513,47 +2431,6 @@ static int w83627ehf_probe(struct platform_device *pdev) } } -for (i =0 ; i <NUM_REG_TEMP ; i++) { -if (!(data->have_temp & (1 << i))) -continue ; - err =device_create_file (dev, &sda_temp_input[i].dev_attr); -if (err) - goto exit_remove; -if (data->temp_label) { - err =device_create_file (dev, - &sda_temp_label[i].dev_attr); -if (err) - goto exit_remove; - } -if (i ==2 && data->temp3_val_only) -continue ; -if (data->reg_temp_over[i]) { - err =device_create_file (dev, - &sda_temp_max[i].dev_attr); -if (err) - goto exit_remove; - } -if (data->reg_temp_hyst[i]) { - err =device_create_file (dev, - &sda_temp_max_hyst[i].dev_attr); -if (err) - goto exit_remove; - } -if (i >2 ) -continue ; -if ((err =device_create_file (dev, - &sda_temp_alarm[i].dev_attr)) - || (err =device_create_file (dev, - &sda_temp_type[i].dev_attr))) - goto exit_remove; -if (data->have_temp_offset & (1 << i)) { - err =device_create_file (dev, - &sda_temp_offset[i].dev_attr); -if (err) - goto exit_remove; - } - } - err =device_create_file (dev, &sda_caseopen[0 ].dev_attr);if (err) goto exit_remove;
@@ -2567,17 +2444,16 @@ static int w83627ehf_probe(struct platform_device *pdev) err =device_create_file (dev, &dev_attr_name);if (err) goto exit_remove; +#endif - data->hwmon_dev =hwmon_device_register (dev); -if (IS_ERR (data->hwmon_dev)) { - err =PTR_ERR (data->hwmon_dev); - goto exit_remove; - } + hwmon_dev =devm_hwmon_device_register_with_info (&pdev->dev, + data->name, + data, + &w83627ehf_chip_info, +NULL ); -return 0 ; +return PTR_ERR_OR_ZERO (hwmon_dev); -exit_remove: -w83627ehf_device_remove_files (dev); exit_release:release_region (res->start,IOREGION_LENGTH ); exit:
@@ -2588,8 +2464,6 @@ static int w83627ehf_remove(struct platform_device *pdev) {struct w83627ehf_data *data =platform_get_drvdata (pdev); -hwmon_device_unregister (data->hwmon_dev); -w83627ehf_device_remove_files (&pdev->dev);release_region (data->addr,IOREGION_LENGTH );return 0 ;
Signature · 1 line
2.23.0
Guenter Roeck
maintainerQuoted 6 lines · Dr. David Alan Gilbert
Hi Jean, Guenter,
I'm part way through converting w83627ehf to use thedevm_hwmon_device_register_with_info
interface and had some questions I'd appreciate the answer to. My WIP
code is attached below.
Quoted 9 lines
a) In the existing driver, all the pseudo files are showing up as:
/sys/devices/platform/w83627ehf.656/blah_input
with the rework:
/sys/devices/platform/w83627ehf.656/hwmon/hwmon1/my reading is that the reworked one is correct? Although I guess the change is a pain for people with paths in tools.
No one should have absolute path names like the above in their tools. So far none of the driver conversions caused trouble, so hopefully we should be fine.
Quoted 5 lines
b) The device has an
intrusion0_alarm&intrusion1_alarmthat seems pretty common looking indrivers/hwmon- some other devices have a intrustion%d_beep. Does it make sense to add a newhwmon_intrusiontype tohwmon_sensor_types?
Yes, we should add hwmon_intrusion to hwmon_sensor_types, with _alarm and _beep as supported attributes.
Quoted 9 lines
c) The device has a bunch more pwm variants:
pwm2_max_output,pwm2_start_output,pwm2_step_output,pwm2_stop_output,pwm2_stop_time,pwm2_target,pwm2_tolerancefor each/some of it's outputs. What's the right thing to
do there? Add them all tohwmon_pwm_attr_templates? (Unfortunately it looks like everyone has fun with their own
pwm settings).
We'll have to keep sysfs files for those for the time being, unless there are some which are officially listed in Documentation/hwmon/sysfs-interface.rst.
Quoted 5 lines
For reference, I seem to have a w83667hg on an ASRock P55M Pro.
The current status is that 'reading' seems to work (from what I can tell but not looked at the PWM), and I've not converted the writers yet.
Good start. I would suggest to run your patch through checkpatch. It will tell you, for example, that S_IRUGO et al ran out of favor, and that you are supposed to use octals instead.
Thanks,
Guenter
Quoted 12 lines · * Guenter Roeck ([email protected]) wrote:
Quoted 11 lines · Dr. David Alan Gilbert
Hi Jean, Guenter,
I'm part way through converting w83627ehf to use thedevm_hwmon_device_register_with_info
interface and had some questions I'd appreciate the answer to. My WIP
code is attached below.a) In the existing driver, all the pseudo files are showing up as:
/sys/devices/platform/w83627ehf.656/blah_input with the rework: /sys/devices/platform/w83627ehf.656/hwmon/hwmon1/
Quoted 4 lines
Quoted 4 lines
my reading is that the reworked one is correct? Although I guess the change is a pain for people with paths in tools.
Thanks for the reply.
Quoted 3 lines
No one should have absolute path names like the above in their tools. So far none of the driver conversions caused trouble, so hopefully we should be fine.
OK, great.
Quoted 7 lines
Quoted 5 lines
b) The device has an
intrusion0_alarm&intrusion1_alarmthat seems pretty common looking indrivers/hwmon- some other devices have a intrustion%d_beep. Does it make sense to add a newhwmon_intrusiontype tohwmon_sensor_types?Yes, we should add
hwmon_intrusiontohwmon_sensor_types, with_alarmand_beepas supported attributes.
OK, will do.
Quoted 4 lines
Quoted 4 lines
c) The device has a bunch more pwm variants:
pwm2_max_output,pwm2_start_output,pwm2_step_output,pwm2_stop_output,pwm2_stop_time,pwm2_target,pwm2_tolerance
Quoted 8 lines
Quoted 5 lines
for each/some of it's outputs. What's the right thing to
do there? Add them all tohwmon_pwm_attr_templates? (Unfortunately it looks like everyone has fun with their own
pwm settings).We'll have to keep sysfs files for those for the time being, unless there are some which are officially listed in
Documentation/hwmon/sysfs-interface.rst.
OK, that's a bit messy; so just keep the existing sysfs code - do I need to tweak that to match the new directory path? Would another way be to use @extra_groups on the with_info call?
Quoted 8 lines
Quoted 5 lines
For reference, I seem to have a w83667hg on an ASRock P55M Pro.
The current status is that 'reading' seems to work (from what I can tell but not looked at the PWM), and I've not converted the writers yet.
Good start. I would suggest to run your patch through checkpatch. It will tell you, for example, that
S_IRUGOet al ran out of favor, and that you are supposed to use octals instead.
Yeh I've already done that and used it to get rid of most of my space/tab screwups; I'll fix the remains up before I post the final version.
I should nail the rest of this either this weekend or next.
Thanks again for your comments,
Dave
Quoted 2 lines
Thanks,
Guenter
Signature · 4 lines
-----Open up your eyes, open up your mind, open up your code ------- / Dr. David Alan Gilbert | Running GNU/Linux | Happy \ \ dave @ treblig.org | | In Hex / \ _________________________|_____ http://www.treblig.org |_______/
Guenter Roeck
maintainerQuoted 45 lines · Dr. David Alan Gilbert
Quoted 12 lines · * Guenter Roeck ([email protected]) wrote:
Quoted 11 lines · Dr. David Alan Gilbert
Hi Jean, Guenter,
I'm part way through converting w83627ehf to use thedevm_hwmon_device_register_with_info
interface and had some questions I'd appreciate the answer to. My WIP
code is attached below.a) In the existing driver, all the pseudo files are showing up as:
/sys/devices/platform/w83627ehf.656/blah_input with the rework: /sys/devices/platform/w83627ehf.656/hwmon/hwmon1/Quoted 4 lines
Quoted 4 lines
my reading is that the reworked one is correct? Although I guess the change is a pain for people with paths in tools.
Thanks for the reply.
Quoted 3 lines
No one should have absolute path names like the above in their tools. So far none of the driver conversions caused trouble, so hopefully we should be fine.
OK, great.
Quoted 7 lines
Quoted 5 lines
b) The device has an
intrusion0_alarm&intrusion1_alarmthat seems pretty common looking indrivers/hwmon- some other devices have a intrustion%d_beep. Does it make sense to add a newhwmon_intrusiontype tohwmon_sensor_types?Yes, we should add
hwmon_intrusiontohwmon_sensor_types, with_alarmand_beepas supported attributes.OK, will do.
Quoted 9 lines
Quoted 9 lines
c) The device has a bunch more pwm variants:
pwm2_max_output,pwm2_start_output,pwm2_step_output,pwm2_stop_output,pwm2_stop_time,pwm2_target,pwm2_tolerancefor each/some of it's outputs. What's the right thing to
do there? Add them all tohwmon_pwm_attr_templates? (Unfortunately it looks like everyone has fun with their own
pwm settings).
Quoted 8 lines
Quoted 3 lines
We'll have to keep sysfs files for those for the time being, unless there are some which are officially listed in
Documentation/hwmon/sysfs-interface.rst.OK, that's a bit messy; so just keep the existing sysfs code - do I need to tweak that to match the new directory path? Would another way be to use @extra_groups on the
with_infocall?
Yes, that is what you are supposed to do.
Guenter