hwmon (occ): Add sensor attributes and register hwmon device
Setup the sensor attributes for every OCC sensor found by the first poll response. Register the attributes with hwmon. Signed-off-by: Eddie James <eajames@linux.ibm.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Eddie James
Guenter Roeck
Родитель
c10e753d43
Коммит
54076cb3b5
|
|
@ -1,11 +1,13 @@
|
|||
// SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
#include <linux/device.h>
|
||||
#include <linux/hwmon.h>
|
||||
#include <linux/hwmon-sysfs.h>
|
||||
#include <linux/jiffies.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/math64.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/sysfs.h>
|
||||
#include <asm/unaligned.h>
|
||||
|
||||
#include "common.h"
|
||||
|
|
@ -641,6 +643,324 @@ static ssize_t occ_show_extended(struct device *dev,
|
|||
return rc;
|
||||
}
|
||||
|
||||
/*
|
||||
* Some helper macros to make it easier to define an occ_attribute. Since these
|
||||
* are dynamically allocated, we shouldn't use the existing kernel macros which
|
||||
* stringify the name argument.
|
||||
*/
|
||||
#define ATTR_OCC(_name, _mode, _show, _store) { \
|
||||
.attr = { \
|
||||
.name = _name, \
|
||||
.mode = VERIFY_OCTAL_PERMISSIONS(_mode), \
|
||||
}, \
|
||||
.show = _show, \
|
||||
.store = _store, \
|
||||
}
|
||||
|
||||
#define SENSOR_ATTR_OCC(_name, _mode, _show, _store, _nr, _index) { \
|
||||
.dev_attr = ATTR_OCC(_name, _mode, _show, _store), \
|
||||
.index = _index, \
|
||||
.nr = _nr, \
|
||||
}
|
||||
|
||||
#define OCC_INIT_ATTR(_name, _mode, _show, _store, _nr, _index) \
|
||||
((struct sensor_device_attribute_2) \
|
||||
SENSOR_ATTR_OCC(_name, _mode, _show, _store, _nr, _index))
|
||||
|
||||
/*
|
||||
* Allocate and instatiate sensor_device_attribute_2s. It's most efficient to
|
||||
* use our own instead of the built-in hwmon attribute types.
|
||||
*/
|
||||
static int occ_setup_sensor_attrs(struct occ *occ)
|
||||
{
|
||||
unsigned int i, s, num_attrs = 0;
|
||||
struct device *dev = occ->bus_dev;
|
||||
struct occ_sensors *sensors = &occ->sensors;
|
||||
struct occ_attribute *attr;
|
||||
struct temp_sensor_2 *temp;
|
||||
ssize_t (*show_temp)(struct device *, struct device_attribute *,
|
||||
char *) = occ_show_temp_1;
|
||||
ssize_t (*show_freq)(struct device *, struct device_attribute *,
|
||||
char *) = occ_show_freq_1;
|
||||
ssize_t (*show_power)(struct device *, struct device_attribute *,
|
||||
char *) = occ_show_power_1;
|
||||
ssize_t (*show_caps)(struct device *, struct device_attribute *,
|
||||
char *) = occ_show_caps_1_2;
|
||||
|
||||
switch (sensors->temp.version) {
|
||||
case 1:
|
||||
num_attrs += (sensors->temp.num_sensors * 2);
|
||||
break;
|
||||
case 2:
|
||||
num_attrs += (sensors->temp.num_sensors * 4);
|
||||
show_temp = occ_show_temp_2;
|
||||
break;
|
||||
default:
|
||||
sensors->temp.num_sensors = 0;
|
||||
}
|
||||
|
||||
switch (sensors->freq.version) {
|
||||
case 2:
|
||||
show_freq = occ_show_freq_2;
|
||||
/* fall through */
|
||||
case 1:
|
||||
num_attrs += (sensors->freq.num_sensors * 2);
|
||||
break;
|
||||
default:
|
||||
sensors->freq.num_sensors = 0;
|
||||
}
|
||||
|
||||
switch (sensors->power.version) {
|
||||
case 2:
|
||||
show_power = occ_show_power_2;
|
||||
/* fall through */
|
||||
case 1:
|
||||
num_attrs += (sensors->power.num_sensors * 4);
|
||||
break;
|
||||
case 0xA0:
|
||||
num_attrs += (sensors->power.num_sensors * 16);
|
||||
show_power = occ_show_power_a0;
|
||||
break;
|
||||
default:
|
||||
sensors->power.num_sensors = 0;
|
||||
}
|
||||
|
||||
switch (sensors->caps.version) {
|
||||
case 1:
|
||||
num_attrs += (sensors->caps.num_sensors * 7);
|
||||
break;
|
||||
case 3:
|
||||
show_caps = occ_show_caps_3;
|
||||
/* fall through */
|
||||
case 2:
|
||||
num_attrs += (sensors->caps.num_sensors * 8);
|
||||
break;
|
||||
default:
|
||||
sensors->caps.num_sensors = 0;
|
||||
}
|
||||
|
||||
switch (sensors->extended.version) {
|
||||
case 1:
|
||||
num_attrs += (sensors->extended.num_sensors * 3);
|
||||
break;
|
||||
default:
|
||||
sensors->extended.num_sensors = 0;
|
||||
}
|
||||
|
||||
occ->attrs = devm_kzalloc(dev, sizeof(*occ->attrs) * num_attrs,
|
||||
GFP_KERNEL);
|
||||
if (!occ->attrs)
|
||||
return -ENOMEM;
|
||||
|
||||
/* null-terminated list */
|
||||
occ->group.attrs = devm_kzalloc(dev, sizeof(*occ->group.attrs) *
|
||||
num_attrs + 1, GFP_KERNEL);
|
||||
if (!occ->group.attrs)
|
||||
return -ENOMEM;
|
||||
|
||||
attr = occ->attrs;
|
||||
|
||||
for (i = 0; i < sensors->temp.num_sensors; ++i) {
|
||||
s = i + 1;
|
||||
temp = ((struct temp_sensor_2 *)sensors->temp.data) + i;
|
||||
|
||||
snprintf(attr->name, sizeof(attr->name), "temp%d_label", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444, show_temp, NULL,
|
||||
0, i);
|
||||
attr++;
|
||||
|
||||
if (sensors->temp.version > 1 &&
|
||||
temp->fru_type == OCC_FRU_TYPE_VRM) {
|
||||
snprintf(attr->name, sizeof(attr->name),
|
||||
"temp%d_alarm", s);
|
||||
} else {
|
||||
snprintf(attr->name, sizeof(attr->name),
|
||||
"temp%d_input", s);
|
||||
}
|
||||
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444, show_temp, NULL,
|
||||
1, i);
|
||||
attr++;
|
||||
|
||||
if (sensors->temp.version > 1) {
|
||||
snprintf(attr->name, sizeof(attr->name),
|
||||
"temp%d_fru_type", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444,
|
||||
show_temp, NULL, 2, i);
|
||||
attr++;
|
||||
|
||||
snprintf(attr->name, sizeof(attr->name),
|
||||
"temp%d_fault", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444,
|
||||
show_temp, NULL, 3, i);
|
||||
attr++;
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < sensors->freq.num_sensors; ++i) {
|
||||
s = i + 1;
|
||||
|
||||
snprintf(attr->name, sizeof(attr->name), "freq%d_label", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444, show_freq, NULL,
|
||||
0, i);
|
||||
attr++;
|
||||
|
||||
snprintf(attr->name, sizeof(attr->name), "freq%d_input", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444, show_freq, NULL,
|
||||
1, i);
|
||||
attr++;
|
||||
}
|
||||
|
||||
if (sensors->power.version == 0xA0) {
|
||||
/*
|
||||
* Special case for many-attribute power sensor. Split it into
|
||||
* a sensor number per power type, emulating several sensors.
|
||||
*/
|
||||
for (i = 0; i < sensors->power.num_sensors; ++i) {
|
||||
unsigned int j;
|
||||
unsigned int nr = 0;
|
||||
|
||||
s = (i * 4) + 1;
|
||||
|
||||
for (j = 0; j < 4; ++j) {
|
||||
snprintf(attr->name, sizeof(attr->name),
|
||||
"power%d_label", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444,
|
||||
show_power, NULL,
|
||||
nr++, i);
|
||||
attr++;
|
||||
|
||||
snprintf(attr->name, sizeof(attr->name),
|
||||
"power%d_average", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444,
|
||||
show_power, NULL,
|
||||
nr++, i);
|
||||
attr++;
|
||||
|
||||
snprintf(attr->name, sizeof(attr->name),
|
||||
"power%d_average_interval", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444,
|
||||
show_power, NULL,
|
||||
nr++, i);
|
||||
attr++;
|
||||
|
||||
snprintf(attr->name, sizeof(attr->name),
|
||||
"power%d_input", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444,
|
||||
show_power, NULL,
|
||||
nr++, i);
|
||||
attr++;
|
||||
|
||||
s++;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (i = 0; i < sensors->power.num_sensors; ++i) {
|
||||
s = i + 1;
|
||||
|
||||
snprintf(attr->name, sizeof(attr->name),
|
||||
"power%d_label", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444,
|
||||
show_power, NULL, 0, i);
|
||||
attr++;
|
||||
|
||||
snprintf(attr->name, sizeof(attr->name),
|
||||
"power%d_average", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444,
|
||||
show_power, NULL, 1, i);
|
||||
attr++;
|
||||
|
||||
snprintf(attr->name, sizeof(attr->name),
|
||||
"power%d_average_interval", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444,
|
||||
show_power, NULL, 2, i);
|
||||
attr++;
|
||||
|
||||
snprintf(attr->name, sizeof(attr->name),
|
||||
"power%d_input", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444,
|
||||
show_power, NULL, 3, i);
|
||||
attr++;
|
||||
}
|
||||
}
|
||||
|
||||
if (sensors->caps.num_sensors >= 1) {
|
||||
s = sensors->power.num_sensors + 1;
|
||||
|
||||
snprintf(attr->name, sizeof(attr->name), "power%d_label", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444, show_caps, NULL,
|
||||
0, 0);
|
||||
attr++;
|
||||
|
||||
snprintf(attr->name, sizeof(attr->name), "power%d_cap", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444, show_caps, NULL,
|
||||
1, 0);
|
||||
attr++;
|
||||
|
||||
snprintf(attr->name, sizeof(attr->name), "power%d_input", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444, show_caps, NULL,
|
||||
2, 0);
|
||||
attr++;
|
||||
|
||||
snprintf(attr->name, sizeof(attr->name),
|
||||
"power%d_cap_not_redundant", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444, show_caps, NULL,
|
||||
3, 0);
|
||||
attr++;
|
||||
|
||||
snprintf(attr->name, sizeof(attr->name), "power%d_cap_max", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444, show_caps, NULL,
|
||||
4, 0);
|
||||
attr++;
|
||||
|
||||
snprintf(attr->name, sizeof(attr->name), "power%d_cap_min", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444, show_caps, NULL,
|
||||
5, 0);
|
||||
attr++;
|
||||
|
||||
snprintf(attr->name, sizeof(attr->name), "power%d_cap_user",
|
||||
s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0644, show_caps,
|
||||
occ_store_caps_user, 6, 0);
|
||||
attr++;
|
||||
|
||||
if (sensors->caps.version > 1) {
|
||||
snprintf(attr->name, sizeof(attr->name),
|
||||
"power%d_cap_user_source", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444,
|
||||
show_caps, NULL, 7, 0);
|
||||
attr++;
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < sensors->extended.num_sensors; ++i) {
|
||||
s = i + 1;
|
||||
|
||||
snprintf(attr->name, sizeof(attr->name), "extn%d_label", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444,
|
||||
occ_show_extended, NULL, 0, i);
|
||||
attr++;
|
||||
|
||||
snprintf(attr->name, sizeof(attr->name), "extn%d_flags", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444,
|
||||
occ_show_extended, NULL, 1, i);
|
||||
attr++;
|
||||
|
||||
snprintf(attr->name, sizeof(attr->name), "extn%d_input", s);
|
||||
attr->sensor = OCC_INIT_ATTR(attr->name, 0444,
|
||||
occ_show_extended, NULL, 2, i);
|
||||
attr++;
|
||||
}
|
||||
|
||||
/* put the sensors in the group */
|
||||
for (i = 0; i < num_attrs; ++i) {
|
||||
sysfs_attr_init(&occ->attrs[i].sensor.dev_attr.attr);
|
||||
occ->group.attrs[i] = &occ->attrs[i].sensor.dev_attr.attr;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* only need to do this once at startup, as OCC won't change sensors on us */
|
||||
static void occ_parse_poll_response(struct occ *occ)
|
||||
{
|
||||
|
|
@ -704,6 +1024,7 @@ int occ_setup(struct occ *occ, const char *name)
|
|||
int rc;
|
||||
|
||||
mutex_init(&occ->lock);
|
||||
occ->groups[0] = &occ->group;
|
||||
|
||||
/* no need to lock */
|
||||
rc = occ_poll(occ);
|
||||
|
|
@ -718,5 +1039,21 @@ int occ_setup(struct occ *occ, const char *name)
|
|||
|
||||
occ_parse_poll_response(occ);
|
||||
|
||||
rc = occ_setup_sensor_attrs(occ);
|
||||
if (rc) {
|
||||
dev_err(occ->bus_dev, "failed to setup sensor attrs: %d\n",
|
||||
rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
occ->hwmon = devm_hwmon_device_register_with_groups(occ->bus_dev, name,
|
||||
occ, occ->groups);
|
||||
if (IS_ERR(occ->hwmon)) {
|
||||
rc = PTR_ERR(occ->hwmon);
|
||||
dev_err(occ->bus_dev, "failed to register hwmon device: %d\n",
|
||||
rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,9 @@
|
|||
#ifndef OCC_COMMON_H
|
||||
#define OCC_COMMON_H
|
||||
|
||||
#include <linux/hwmon-sysfs.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/sysfs.h>
|
||||
|
||||
struct device;
|
||||
|
||||
|
|
@ -76,6 +78,15 @@ struct occ_sensors {
|
|||
struct occ_sensor extended;
|
||||
};
|
||||
|
||||
/*
|
||||
* Use our own attribute struct so we can dynamically allocate space for the
|
||||
* name.
|
||||
*/
|
||||
struct occ_attribute {
|
||||
char name[32];
|
||||
struct sensor_device_attribute_2 sensor;
|
||||
};
|
||||
|
||||
struct occ {
|
||||
struct device *bus_dev;
|
||||
|
||||
|
|
@ -88,6 +99,11 @@ struct occ {
|
|||
|
||||
unsigned long last_update;
|
||||
struct mutex lock; /* lock OCC access */
|
||||
|
||||
struct device *hwmon;
|
||||
struct occ_attribute *attrs;
|
||||
struct attribute_group group;
|
||||
const struct attribute_group *groups[2];
|
||||
};
|
||||
|
||||
int occ_setup(struct occ *occ, const char *name);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче