@@ -57,6 +57,8 @@
#define PMBUS_NAME_SIZE 24
+static const char * const coeff_name[] = {"m", "b", "R"};
+
struct pmbus_sensor {
struct pmbus_sensor *next;
char name[PMBUS_NAME_SIZE]; /* sysfs sensor name */
@@ -98,12 +100,13 @@ struct pmbus_data {
int exponent[PMBUS_PAGES];
/* linear mode: exponent for output voltages */
- const struct pmbus_driver_info *info;
+ struct pmbus_driver_info *info;
int max_attributes;
int num_attributes;
struct attribute_group group;
- const struct attribute_group *groups[2];
+ const struct attribute_group *groups[3];
+ struct attribute_group group_coeff;
struct dentry *debugfs; /* debugfs device directory */
struct pmbus_sensor *sensors;
@@ -2011,6 +2014,95 @@ static int pmbus_add_samples_attributes(struct i2c_client *client,
return 0;
}
+static struct attribute *pmbus_init_coeff_attr(struct pmbus_data *data,
+ const char *prefix,
+ const char *coeff, int *target)
+{
+ struct dev_ext_attribute *ext_attr;
+ char *name;
+
+ ext_attr = devm_kzalloc(data->dev, sizeof(*ext_attr), GFP_KERNEL);
+ if (!ext_attr)
+ return NULL;
+
+ name = devm_kasprintf(data->dev, GFP_KERNEL, "%s_%s", prefix, coeff);
+ if (!name)
+ return NULL;
+
+ pmbus_dev_attr_init(&ext_attr->attr, name, (S_IWUSR | S_IRUGO),
+ device_show_int, device_store_int);
+ ext_attr->var = target;
+
+ return &ext_attr->attr.attr;
+}
+
+static int pmbus_add_coeff_attributes_class(struct pmbus_data *data,
+ const char *prefix,
+ enum pmbus_sensor_classes class,
+ struct attribute **attrs)
+{
+ int *coeff_val[] = {data->info->m, data->info->b, data->info->R};
+ struct attribute *ret;
+ int i, count = 0;
+
+ for (i = 0; i < ARRAY_SIZE(coeff_name); i++) {
+ ret = pmbus_init_coeff_attr(data, prefix, coeff_name[i],
+ coeff_val[i]);
+ if (!ret)
+ return -ENOMEM;
+ attrs[count++] = ret;
+ }
+
+ return count;
+}
+
+static const char * const classes_names[] = {
+ [PSC_VOLTAGE_IN] = "vin",
+ [PSC_VOLTAGE_OUT] = "vout",
+ [PSC_CURRENT_IN] = "iin",
+ [PSC_CURRENT_OUT] = "iout",
+ [PSC_POWER] = "power",
+ [PSC_TEMPERATURE] = "temp",
+};
+
+static int pmbus_add_coeff_attributes(struct i2c_client *client,
+ struct pmbus_data *data)
+{
+ struct attribute **attrs;
+ int i, n = 0, ret = 0;
+
+ attrs = kcalloc(ARRAY_SIZE(coeff_name) * ARRAY_SIZE(classes_names) + 1,
+ sizeof(void *), GFP_KERNEL);
+ if (!attrs)
+ return -ENOMEM;
+
+ for (i = 0; i < ARRAY_SIZE(classes_names); i++) {
+ if (classes_names[i] == NULL)
+ continue;
+
+ if (data->info->format[i] != direct)
+ continue;
+
+ ret = pmbus_add_coeff_attributes_class(data, classes_names[i],
+ i, &attrs[n]);
+ if (ret < 0) {
+ kfree(attrs);
+ return ret;
+ }
+
+ n += ret;
+ }
+
+ if (n) {
+ data->group_coeff.name = "coefficients";
+ data->group_coeff.attrs = attrs;
+ } else {
+ kfree(attrs);
+ }
+
+ return 0;
+}
+
static int pmbus_find_attributes(struct i2c_client *client,
struct pmbus_data *data)
{
@@ -2046,6 +2138,10 @@ static int pmbus_find_attributes(struct i2c_client *client,
return ret;
ret = pmbus_add_samples_attributes(client, data);
+ if (ret)
+ return ret;
+
+ ret = pmbus_add_coeff_attributes(client, data);
return ret;
}
@@ -2460,6 +2556,8 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,
}
data->groups[0] = &data->group;
+ if (data->group_coeff.attrs)
+ data->groups[1] = &data->group_coeff;
data->hwmon_dev = hwmon_device_register_with_groups(dev, client->name,
data, data->groups);
if (IS_ERR(data->hwmon_dev)) {
@@ -2482,6 +2580,7 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,
hwmon_device_unregister(data->hwmon_dev);
out_kfree:
kfree(data->group.attrs);
+ kfree(data->group_coeff.attrs);
return ret;
}
EXPORT_SYMBOL_GPL(pmbus_do_probe);
@@ -2494,6 +2593,7 @@ int pmbus_do_remove(struct i2c_client *client)
hwmon_device_unregister(data->hwmon_dev);
kfree(data->group.attrs);
+ kfree(data->group_coeff.attrs);
return 0;
}
EXPORT_SYMBOL_GPL(pmbus_do_remove);
PMBUS devices report values in real-world units. Those using direct format require conversion using standarised coefficients and formula. This operation is already done by pmbus_core and the default values for coefficients are configured by chip drivers. However those default values are not allways suitable as they depend on the value of sense register and environment used. For that reason, in order to get values that make sense or just to get best accuracy, in it may be required to tweak coefficient values. The proper values may be measured during device production (to get best accuracy, they might be callibrated for each individual unit) and stored as calibration values in some place (like EEPROM or even a file). To support wide range of possible use cases, lets export those to user space via sysfs attributes so that it can implement its own policies about them. All those attributes are put into separate attribute_group struct so that we can set its name to group all of them in a "coefficients" subdirectory in sysfs. Signed-off-by: Krzysztof Adamski <krzysztof.adamski@nokia.com> --- drivers/hwmon/pmbus/pmbus_core.c | 104 ++++++++++++++++++++++++++++++- 1 file changed, 102 insertions(+), 2 deletions(-)