This patch series adds new attribute to enable or disable a sensor in
runtime.
v2 : https://lkml.org/lkml/2018/7/4/263
v1 : https://lkml.org/lkml/2018/3/22/214
Shilpasri G Bhat (3):
powernv:opal-sensor-groups: Add support to enable sensor groups
hwmon: ibmpowernv: Add attributes to enable/disable sensor groups
hwmon: Document the sensor enable attribute and update ibmpowernv
Documentation/hwmon/ibmpowernv | 35 +++-
Documentation/hwmon/sysfs-interface | 82 +++++++++
arch/powerpc/include/asm/opal-api.h | 1 +
arch/powerpc/include/asm/opal.h | 2 +
.../powerpc/platforms/powernv/opal-sensor-groups.c | 28 ++++
arch/powerpc/platforms/powernv/opal-wrappers.S | 1 +
drivers/hwmon/ibmpowernv.c | 184 +++++++++++++++++----
7 files changed, 302 insertions(+), 31 deletions(-)
--
1.8.3.1
Signed-off-by: Shilpasri G Bhat <[email protected]>
---
Documentation/hwmon/ibmpowernv | 35 +++++++++++++++-
Documentation/hwmon/sysfs-interface | 82 +++++++++++++++++++++++++++++++++++++
2 files changed, 115 insertions(+), 2 deletions(-)
diff --git a/Documentation/hwmon/ibmpowernv b/Documentation/hwmon/ibmpowernv
index 8826ba2..77ddba7 100644
--- a/Documentation/hwmon/ibmpowernv
+++ b/Documentation/hwmon/ibmpowernv
@@ -33,9 +33,40 @@ fanX_input Measured RPM value.
fanX_min Threshold RPM for alert generation.
fanX_fault 0: No fail condition
1: Failing fan
+
tempX_input Measured ambient temperature.
tempX_max Threshold ambient temperature for alert generation.
-inX_input Measured power supply voltage
+tempX_highest Historical maximum temperature
+tempX_lowest Historical minimum temperature
+temp1_enable Enable/disable all temperature sensors
+ 1: Enable
+ 0: Disable
+temp[2-N]_enable State of the sensor (enabled/disabled)
+
+inX_input Measured power supply voltage (millivolt)
inX_fault 0: No fail condition.
1: Failing power supply.
-power1_input System power consumption (microWatt)
+inX_highest Historical maximum voltage
+inX_lowest Historical minimum voltage
+in1_enable Enable/disable all voltage sensors
+ 1: Enable
+ 0: Disable
+in[2-N]_enable State of the sensor (enabled/disabled)
+
+powerX_input Power consumption (microWatt)
+powerX_input_highest Historical maximum power
+powerX_input_lowest Historical minimum power
+power1_enable Enable/disable all power sensors
+ 1: Enable
+ 0: Disable
+power[2-N]_enable State of the sensor (enabled/disabled)
+
+currX_input Measured current (milliampere)
+currX_highest Historical maximum current
+currX_lowest Historical minimum current
+curr1_enable Enable/disable all current sensors
+ 1: Enable
+ 0: Disable
+curr[2-N]_enable State of the sensor (enabled/disabled)
+
+energyX_input Cumulative energy (microJoule)
diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface
index fc337c3..d81109c 100644
--- a/Documentation/hwmon/sysfs-interface
+++ b/Documentation/hwmon/sysfs-interface
@@ -171,6 +171,17 @@ in[0-*]_label Suggested voltage channel label.
user-space.
RO
+in[0-*]_enable
+ Enable or disable the sensor.
+ When disabled the sensor read will return -ENODATA. For chips
+ which do not have the capability to disable/enable single sensor
+ but have support for sensor-group disable/enable, will only have
+ the first attribute with write permission. In such cases write
+ to the first attribute will affect all the sensors of this type.
+ 1: Enable
+ 0: Disable
+ RW/RO
+
cpu[0-*]_vid CPU core reference voltage.
Unit: millivolt
RO
@@ -236,6 +247,17 @@ fan[1-*]_label Suggested fan channel label.
In all other cases, the label is provided by user-space.
RO
+fan[1-*]_enable
+ Enable or disable the sensor.
+ When disabled the sensor read will return -ENODATA. For chips
+ which do not have the capability to disable/enable single sensor
+ but have support for sensor-group disable/enable, will only have
+ the first attribute with write permission. In such cases write
+ to the first attribute will affect all the sensors of this type.
+ 1: Enable
+ 0: Disable
+ RW/RO
+
Also see the Alarms section for status flags associated with fans.
@@ -409,6 +431,17 @@ temp_reset_history
Reset temp_lowest and temp_highest for all sensors
WO
+temp[1-*]_enable
+ Enable or disable the sensor.
+ When disabled the sensor read will return -ENODATA. For chips
+ which do not have the capability to disable/enable single sensor
+ but have support for sensor-group disable/enable, will only have
+ the first attribute with write permission. In such cases write
+ to the first attribute will affect all the sensors of this type.
+ 1: Enable
+ 0: Disable
+ RW/RO
+
Some chips measure temperature using external thermistors and an ADC, and
report the temperature measurement as a voltage. Converting this voltage
back to a temperature (or the other way around for limits) requires
@@ -468,6 +501,17 @@ curr_reset_history
Reset currX_lowest and currX_highest for all sensors
WO
+curr[1-*]_enable
+ Enable or disable the sensor.
+ When disabled the sensor read will return -ENODATA. For chips
+ which do not have the capability to disable/enable single sensor
+ but have support for sensor-group disable/enable, will only have
+ the first attribute with write permission. In such cases write
+ to the first attribute will affect all the sensors of this type.
+ 1: Enable
+ 0: Disable
+ RW/RO
+
Also see the Alarms section for status flags associated with currents.
*********
@@ -566,6 +610,19 @@ power[1-*]_crit Critical maximum power.
Unit: microWatt
RW
+power[1-*]_enable Enable or disable the sensor.
+ When disabled the sensor read will return
+ -ENODATA. For chips which do not have the
+ capability to disable/enable single sensor but
+ have support for sensor-group disable/enable,
+ will only have the first attribute with write
+ permission. In such cases write to the first
+ attribute will affect all the sensors of this
+ type.
+ 1: Enable
+ 0: Disable
+ RW/RO
+
Also see the Alarms section for status flags associated with power readings.
**********
@@ -576,6 +633,18 @@ energy[1-*]_input Cumulative energy use
Unit: microJoule
RO
+energy[1-*]_enable Enable or disable the sensor.
+ When disabled the sensor read will return
+ -ENODATA. For chips which do not have the
+ capability to disable/enable single sensor but
+ have support for sensor-group disable/enable,
+ will only have the first attribute with write
+ permission. In such cases write to the first
+ attribute will affect all the sensors of this
+ type.
+ 1: Enable
+ 0: Disable
+ RW/RO
************
* Humidity *
@@ -586,6 +655,19 @@ humidity[1-*]_input Humidity
RO
+humidity[1-*]_enable Enable or disable the sensor.
+ When disabled the sensor read will return
+ -ENODATA. For chips which do not have the
+ capability to disable/enable single sensor but
+ have support for sensor-group disable/enable,
+ will only have the first attribute with write
+ permission. In such cases write to the first
+ attribute will affect all the sensors of this
+ type.
+ 1: Enable
+ 0: Disable
+ RW/RO
+
**********
* Alarms *
**********
--
1.8.3.1
On-Chip-Controller(OCC) is an embedded micro-processor in POWER9 chip
which measures various system and chip level sensors. These sensors
comprises of environmental sensors (like power, temperature, current
and voltage) and performance sensors (like utilization, frequency).
All these sensors are copied to main memory at a regular interval of
100ms. OCC provides a way to select a group of sensors that is copied
to the main memory to increase the update frequency of selected sensor
groups. When a sensor-group is disabled, OCC will not copy it to main
memory and those sensors read 0 values.
This patch provides support for enabling/disabling the sensor groups
like power, temperature, current and voltage. This patch adds new
per-senor sysfs attribute to disable and enable them.
Signed-off-by: Shilpasri G Bhat <[email protected]>
---
Changes from v2:
- Writes to first 'enable' attribute of the sensor group will affect all the
sensors in the group
- Removed global mutex and made it per sensor-group
drivers/hwmon/ibmpowernv.c | 184 ++++++++++++++++++++++++++++++++++++++-------
1 file changed, 155 insertions(+), 29 deletions(-)
diff --git a/drivers/hwmon/ibmpowernv.c b/drivers/hwmon/ibmpowernv.c
index f829dad..9c6adee 100644
--- a/drivers/hwmon/ibmpowernv.c
+++ b/drivers/hwmon/ibmpowernv.c
@@ -73,6 +73,10 @@ enum sensors {
struct attribute_group group;
u32 attr_count;
u32 hwmon_index;
+ struct mutex mutex;
+ u32 *gid;
+ u32 nr_gid;
+ bool enable;
} sensor_groups[] = {
{ "fan" },
{ "temp" },
@@ -105,6 +109,9 @@ static ssize_t show_sensor(struct device *dev, struct device_attribute *devattr,
ssize_t ret;
u64 x;
+ if (!sensor_groups[sdata->type].enable)
+ return -ENODATA;
+
ret = opal_get_sensor_data_u64(sdata->id, &x);
if (ret)
@@ -120,6 +127,46 @@ static ssize_t show_sensor(struct device *dev, struct device_attribute *devattr,
return sprintf(buf, "%llu\n", x);
}
+static ssize_t show_enable(struct device *dev,
+ struct device_attribute *devattr, char *buf)
+{
+ struct sensor_data *sdata = container_of(devattr, struct sensor_data,
+ dev_attr);
+
+ return sprintf(buf, "%u\n", sensor_groups[sdata->type].enable);
+}
+
+static ssize_t store_enable(struct device *dev,
+ struct device_attribute *devattr,
+ const char *buf, size_t count)
+{
+ struct sensor_data *sdata = container_of(devattr, struct sensor_data,
+ dev_attr);
+ struct sensor_group *sg = &sensor_groups[sdata->type];
+ int ret, i;
+ bool data;
+
+ ret = kstrtobool(buf, &data);
+ if (ret)
+ return ret;
+
+ ret = mutex_lock_interruptible(&sg->mutex);
+ if (ret)
+ return ret;
+
+ if (data != sg->enable)
+ for (i = 0; i < sg->nr_gid && !ret; i++)
+ ret = sensor_group_enable(sg->gid[i], data);
+
+ if (!ret) {
+ sg->enable = data;
+ ret = count;
+ }
+
+ mutex_unlock(&sg->mutex);
+ return ret;
+}
+
static ssize_t show_label(struct device *dev, struct device_attribute *devattr,
char *buf)
{
@@ -292,13 +339,68 @@ static u32 get_sensor_hwmon_index(struct sensor_data *sdata,
return ++sensor_groups[sdata->type].hwmon_index;
}
+static int init_sensor_group_data(struct platform_device *pdev)
+{
+ struct device_node *groups, *sg;
+ enum sensors type;
+ int ret = 0, i;
+
+ for (i = 0; i < MAX_SENSOR_TYPE; i++) {
+ sensor_groups[i].nr_gid = 0;
+ sensor_groups[i].enable = true;
+ }
+
+ groups = of_find_node_by_path("/ibm,opal/sensor-groups");
+ if (!groups)
+ return ret;
+
+ for (i = 0; i < MAX_SENSOR_TYPE; i++) {
+ u32 gid[256];
+ u32 id, size;
+
+ for_each_child_of_node(groups, sg) {
+ type = get_sensor_type(sg);
+ if (type != i)
+ continue;
+
+ if (of_property_read_u32(sg, "sensor-group-id", &id))
+ continue;
+
+ gid[sensor_groups[i].nr_gid++] = id;
+ }
+
+ if (!sensor_groups[i].nr_gid)
+ continue;
+
+ size = sensor_groups[i].nr_gid * sizeof(u32);
+ sensor_groups[i].gid = devm_kzalloc(&pdev->dev, size,
+ GFP_KERNEL);
+ if (!sensor_groups[i].gid) {
+ ret = -ENOMEM;
+ break;
+ }
+
+ memcpy(sensor_groups[i].gid, gid, size);
+ sensor_groups[i].enable = false;
+ mutex_init(&sensor_groups[i].mutex);
+ }
+
+ of_node_put(groups);
+ return ret;
+}
+
static int populate_attr_groups(struct platform_device *pdev)
{
struct platform_data *pdata = platform_get_drvdata(pdev);
const struct attribute_group **pgroups = pdata->attr_groups;
struct device_node *opal, *np;
+ int ret;
enum sensors type;
+ ret = init_sensor_group_data(pdev);
+ if (ret)
+ return ret;
+
opal = of_find_node_by_path("/ibm,opal/sensors");
for_each_child_of_node(opal, np) {
const char *label;
@@ -313,7 +415,7 @@ static int populate_attr_groups(struct platform_device *pdev)
sensor_groups[type].attr_count++;
/*
- * add attributes for labels, min and max
+ * add attributes for labels, min, max and enable
*/
if (!of_property_read_string(np, "label", &label))
sensor_groups[type].attr_count++;
@@ -321,6 +423,8 @@ static int populate_attr_groups(struct platform_device *pdev)
sensor_groups[type].attr_count++;
if (of_find_property(np, "sensor-data-max", NULL))
sensor_groups[type].attr_count++;
+ if (sensor_groups[type].nr_gid)
+ sensor_groups[type].attr_count++;
}
of_node_put(opal);
@@ -344,7 +448,10 @@ static int populate_attr_groups(struct platform_device *pdev)
static void create_hwmon_attr(struct sensor_data *sdata, const char *attr_name,
ssize_t (*show)(struct device *dev,
struct device_attribute *attr,
- char *buf))
+ char *buf),
+ ssize_t (*store)(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count))
{
snprintf(sdata->name, MAX_ATTR_LEN, "%s%d_%s",
sensor_groups[sdata->type].name, sdata->hwmon_index,
@@ -352,8 +459,13 @@ static void create_hwmon_attr(struct sensor_data *sdata, const char *attr_name,
sysfs_attr_init(&sdata->dev_attr.attr);
sdata->dev_attr.attr.name = sdata->name;
- sdata->dev_attr.attr.mode = S_IRUGO;
sdata->dev_attr.show = show;
+ if (store) {
+ sdata->dev_attr.store = store;
+ sdata->dev_attr.attr.mode = 0664;
+ } else {
+ sdata->dev_attr.attr.mode = 0444;
+ }
}
static void populate_sensor(struct sensor_data *sdata, int od, int hd, int sid,
@@ -361,13 +473,16 @@ static void populate_sensor(struct sensor_data *sdata, int od, int hd, int sid,
const struct attribute_group *pgroup,
ssize_t (*show)(struct device *dev,
struct device_attribute *attr,
- char *buf))
+ char *buf),
+ ssize_t (*store)(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count))
{
sdata->id = sid;
sdata->type = type;
sdata->opal_index = od;
sdata->hwmon_index = hd;
- create_hwmon_attr(sdata, attr_name, show);
+ create_hwmon_attr(sdata, attr_name, show, store);
pgroup->attrs[sensor_groups[type].attr_count++] = &sdata->dev_attr.attr;
}
@@ -408,18 +523,16 @@ static int create_device_attrs(struct platform_device *pdev)
u32 count = 0;
int err = 0;
- opal = of_find_node_by_path("/ibm,opal/sensors");
sdata = devm_kcalloc(&pdev->dev,
pdata->sensors_count, sizeof(*sdata),
GFP_KERNEL);
- if (!sdata) {
- err = -ENOMEM;
- goto exit_put_node;
- }
+ if (!sdata)
+ return -ENOMEM;
+ opal = of_find_node_by_path("/ibm,opal/sensors");
for_each_child_of_node(opal, np) {
const char *attr_name;
- u32 opal_index;
+ u32 opal_index, hw_id;
const char *label;
if (np->name == NULL)
@@ -456,14 +569,11 @@ static int create_device_attrs(struct platform_device *pdev)
opal_index = INVALID_INDEX;
}
- sdata[count].opal_index = opal_index;
- sdata[count].hwmon_index =
- get_sensor_hwmon_index(&sdata[count], sdata, count);
-
- create_hwmon_attr(&sdata[count], attr_name, show_sensor);
-
- pgroups[type]->attrs[sensor_groups[type].attr_count++] =
- &sdata[count++].dev_attr.attr;
+ hw_id = get_sensor_hwmon_index(&sdata[count], sdata, count);
+ populate_sensor(&sdata[count], opal_index, hw_id, sensor_id,
+ attr_name, type, pgroups[type], show_sensor,
+ NULL);
+ count++;
if (!of_property_read_string(np, "label", &label)) {
/*
@@ -474,33 +584,49 @@ static int create_device_attrs(struct platform_device *pdev)
*/
make_sensor_label(np, &sdata[count], label);
- populate_sensor(&sdata[count], opal_index,
- sdata[count - 1].hwmon_index,
+ populate_sensor(&sdata[count], opal_index, hw_id,
sensor_id, "label", type, pgroups[type],
- show_label);
+ show_label, NULL);
count++;
}
if (!of_property_read_u32(np, "sensor-data-max", &sensor_id)) {
attr_name = get_max_attr(type);
- populate_sensor(&sdata[count], opal_index,
- sdata[count - 1].hwmon_index,
+ populate_sensor(&sdata[count], opal_index, hw_id,
sensor_id, attr_name, type,
- pgroups[type], show_sensor);
+ pgroups[type], show_sensor, NULL);
count++;
}
if (!of_property_read_u32(np, "sensor-data-min", &sensor_id)) {
attr_name = get_min_attr(type);
- populate_sensor(&sdata[count], opal_index,
- sdata[count - 1].hwmon_index,
+ populate_sensor(&sdata[count], opal_index, hw_id,
sensor_id, attr_name, type,
- pgroups[type], show_sensor);
+ pgroups[type], show_sensor, NULL);
count++;
}
+
+ if (sensor_groups[type].nr_gid) {
+ ssize_t (*store)(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count);
+
+ if (!sensor_groups[type].enable) {
+ sensor_groups[type].enable = true;
+ store = store_enable;
+ } else {
+ store = NULL;
+ }
+
+ sensor_groups[type].enable = true;
+ populate_sensor(&sdata[count], opal_index, hw_id,
+ sensor_id, "enable", type,
+ pgroups[type], show_enable, store);
+ count++;
+ }
+
}
-exit_put_node:
of_node_put(opal);
return err;
}
--
1.8.3.1
Adds support to enable/disable a sensor group at runtime. This
can be used to select the sensor groups that needs to be copied to
main memory by OCC. Sensor groups like power, temperature, current,
voltage, frequency, utilization can be enabled/disabled at runtime.
Signed-off-by: Shilpasri G Bhat <[email protected]>
---
No changes from v2.
arch/powerpc/include/asm/opal-api.h | 1 +
arch/powerpc/include/asm/opal.h | 2 ++
.../powerpc/platforms/powernv/opal-sensor-groups.c | 28 ++++++++++++++++++++++
arch/powerpc/platforms/powernv/opal-wrappers.S | 1 +
4 files changed, 32 insertions(+)
diff --git a/arch/powerpc/include/asm/opal-api.h b/arch/powerpc/include/asm/opal-api.h
index 3bab299..56a94a1 100644
--- a/arch/powerpc/include/asm/opal-api.h
+++ b/arch/powerpc/include/asm/opal-api.h
@@ -206,6 +206,7 @@
#define OPAL_NPU_SPA_CLEAR_CACHE 160
#define OPAL_NPU_TL_SET 161
#define OPAL_SENSOR_READ_U64 162
+#define OPAL_SENSOR_GROUP_ENABLE 163
#define OPAL_PCI_GET_PBCQ_TUNNEL_BAR 164
#define OPAL_PCI_SET_PBCQ_TUNNEL_BAR 165
#define OPAL_LAST 165
diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h
index e1b2910..fc0550e 100644
--- a/arch/powerpc/include/asm/opal.h
+++ b/arch/powerpc/include/asm/opal.h
@@ -292,6 +292,7 @@ int64_t opal_imc_counters_init(uint32_t type, uint64_t address,
int opal_get_power_shift_ratio(u32 handle, int token, u32 *psr);
int opal_set_power_shift_ratio(u32 handle, int token, u32 psr);
int opal_sensor_group_clear(u32 group_hndl, int token);
+int opal_sensor_group_enable(u32 group_hndl, int token, bool enable);
s64 opal_signal_system_reset(s32 cpu);
s64 opal_quiesce(u64 shutdown_type, s32 cpu);
@@ -326,6 +327,7 @@ extern int opal_async_wait_response_interruptible(uint64_t token,
struct opal_msg *msg);
extern int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data);
extern int opal_get_sensor_data_u64(u32 sensor_hndl, u64 *sensor_data);
+extern int sensor_group_enable(u32 grp_hndl, bool enable);
struct rtc_time;
extern time64_t opal_get_boot_time(void);
diff --git a/arch/powerpc/platforms/powernv/opal-sensor-groups.c b/arch/powerpc/platforms/powernv/opal-sensor-groups.c
index 541c9ea..f7d04b6 100644
--- a/arch/powerpc/platforms/powernv/opal-sensor-groups.c
+++ b/arch/powerpc/platforms/powernv/opal-sensor-groups.c
@@ -32,6 +32,34 @@ struct sg_attr {
struct sg_attr *sgattrs;
} *sgs;
+int sensor_group_enable(u32 handle, bool enable)
+{
+ struct opal_msg msg;
+ int token, ret;
+
+ token = opal_async_get_token_interruptible();
+ if (token < 0)
+ return token;
+
+ ret = opal_sensor_group_enable(handle, token, enable);
+ if (ret == OPAL_ASYNC_COMPLETION) {
+ ret = opal_async_wait_response(token, &msg);
+ if (ret) {
+ pr_devel("Failed to wait for the async response\n");
+ ret = -EIO;
+ goto out;
+ }
+ ret = opal_error_code(opal_get_async_rc(msg));
+ } else {
+ ret = opal_error_code(ret);
+ }
+
+out:
+ opal_async_release_token(token);
+ return ret;
+}
+EXPORT_SYMBOL_GPL(sensor_group_enable);
+
static ssize_t sg_store(struct kobject *kobj, struct kobj_attribute *attr,
const char *buf, size_t count)
{
diff --git a/arch/powerpc/platforms/powernv/opal-wrappers.S b/arch/powerpc/platforms/powernv/opal-wrappers.S
index a8d9b40..8268a1e 100644
--- a/arch/powerpc/platforms/powernv/opal-wrappers.S
+++ b/arch/powerpc/platforms/powernv/opal-wrappers.S
@@ -327,3 +327,4 @@ OPAL_CALL(opal_npu_tl_set, OPAL_NPU_TL_SET);
OPAL_CALL(opal_pci_get_pbcq_tunnel_bar, OPAL_PCI_GET_PBCQ_TUNNEL_BAR);
OPAL_CALL(opal_pci_set_pbcq_tunnel_bar, OPAL_PCI_SET_PBCQ_TUNNEL_BAR);
OPAL_CALL(opal_sensor_read_u64, OPAL_SENSOR_READ_U64);
+OPAL_CALL(opal_sensor_group_enable, OPAL_SENSOR_GROUP_ENABLE);
--
1.8.3.1
On 07/05/2018 06:51 AM, Shilpasri G Bhat wrote:
> Signed-off-by: Shilpasri G Bhat <[email protected]>
> ---
> Documentation/hwmon/ibmpowernv | 35 +++++++++++++++-
> Documentation/hwmon/sysfs-interface | 82 +++++++++++++++++++++++++++++++++++++
I guess I wasn't specific enough. The sysfs ABI change must be a separate patch,
independent of the driver (and driver documentation) changes. If you want to document
the driver changes with the same patch as the driver or in a separate patch is up
to you, but I'll want the ABI changes in a separate patch.
Guenter
> 2 files changed, 115 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/hwmon/ibmpowernv b/Documentation/hwmon/ibmpowernv
> index 8826ba2..77ddba7 100644
> --- a/Documentation/hwmon/ibmpowernv
> +++ b/Documentation/hwmon/ibmpowernv
> @@ -33,9 +33,40 @@ fanX_input Measured RPM value.
> fanX_min Threshold RPM for alert generation.
> fanX_fault 0: No fail condition
> 1: Failing fan
> +
> tempX_input Measured ambient temperature.
> tempX_max Threshold ambient temperature for alert generation.
> -inX_input Measured power supply voltage
> +tempX_highest Historical maximum temperature
> +tempX_lowest Historical minimum temperature
> +temp1_enable Enable/disable all temperature sensors
> + 1: Enable
> + 0: Disable
> +temp[2-N]_enable State of the sensor (enabled/disabled)
> +
> +inX_input Measured power supply voltage (millivolt)
> inX_fault 0: No fail condition.
> 1: Failing power supply.
> -power1_input System power consumption (microWatt)
> +inX_highest Historical maximum voltage
> +inX_lowest Historical minimum voltage
> +in1_enable Enable/disable all voltage sensors
> + 1: Enable
> + 0: Disable
> +in[2-N]_enable State of the sensor (enabled/disabled)
> +
> +powerX_input Power consumption (microWatt)
> +powerX_input_highest Historical maximum power
> +powerX_input_lowest Historical minimum power
> +power1_enable Enable/disable all power sensors
> + 1: Enable
> + 0: Disable
> +power[2-N]_enable State of the sensor (enabled/disabled)
> +
> +currX_input Measured current (milliampere)
> +currX_highest Historical maximum current
> +currX_lowest Historical minimum current
> +curr1_enable Enable/disable all current sensors
> + 1: Enable
> + 0: Disable
> +curr[2-N]_enable State of the sensor (enabled/disabled)
> +
> +energyX_input Cumulative energy (microJoule)
> diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface
> index fc337c3..d81109c 100644
> --- a/Documentation/hwmon/sysfs-interface
> +++ b/Documentation/hwmon/sysfs-interface
> @@ -171,6 +171,17 @@ in[0-*]_label Suggested voltage channel label.
> user-space.
> RO
>
> +in[0-*]_enable
> + Enable or disable the sensor.
> + When disabled the sensor read will return -ENODATA. For chips
> + which do not have the capability to disable/enable single sensor
> + but have support for sensor-group disable/enable, will only have
> + the first attribute with write permission. In such cases write
> + to the first attribute will affect all the sensors of this type.
> + 1: Enable
> + 0: Disable
> + RW/RO
> +
> cpu[0-*]_vid CPU core reference voltage.
> Unit: millivolt
> RO
> @@ -236,6 +247,17 @@ fan[1-*]_label Suggested fan channel label.
> In all other cases, the label is provided by user-space.
> RO
>
> +fan[1-*]_enable
> + Enable or disable the sensor.
> + When disabled the sensor read will return -ENODATA. For chips
> + which do not have the capability to disable/enable single sensor
> + but have support for sensor-group disable/enable, will only have
> + the first attribute with write permission. In such cases write
> + to the first attribute will affect all the sensors of this type.
> + 1: Enable
> + 0: Disable
> + RW/RO
> +
> Also see the Alarms section for status flags associated with fans.
>
>
> @@ -409,6 +431,17 @@ temp_reset_history
> Reset temp_lowest and temp_highest for all sensors
> WO
>
> +temp[1-*]_enable
> + Enable or disable the sensor.
> + When disabled the sensor read will return -ENODATA. For chips
> + which do not have the capability to disable/enable single sensor
> + but have support for sensor-group disable/enable, will only have
> + the first attribute with write permission. In such cases write
> + to the first attribute will affect all the sensors of this type.
> + 1: Enable
> + 0: Disable
> + RW/RO
> +
> Some chips measure temperature using external thermistors and an ADC, and
> report the temperature measurement as a voltage. Converting this voltage
> back to a temperature (or the other way around for limits) requires
> @@ -468,6 +501,17 @@ curr_reset_history
> Reset currX_lowest and currX_highest for all sensors
> WO
>
> +curr[1-*]_enable
> + Enable or disable the sensor.
> + When disabled the sensor read will return -ENODATA. For chips
> + which do not have the capability to disable/enable single sensor
> + but have support for sensor-group disable/enable, will only have
> + the first attribute with write permission. In such cases write
> + to the first attribute will affect all the sensors of this type.
> + 1: Enable
> + 0: Disable
> + RW/RO
> +
> Also see the Alarms section for status flags associated with currents.
>
> *********
> @@ -566,6 +610,19 @@ power[1-*]_crit Critical maximum power.
> Unit: microWatt
> RW
>
> +power[1-*]_enable Enable or disable the sensor.
> + When disabled the sensor read will return
> + -ENODATA. For chips which do not have the
> + capability to disable/enable single sensor but
> + have support for sensor-group disable/enable,
> + will only have the first attribute with write
> + permission. In such cases write to the first
> + attribute will affect all the sensors of this
> + type.
> + 1: Enable
> + 0: Disable
> + RW/RO
> +
> Also see the Alarms section for status flags associated with power readings.
>
> **********
> @@ -576,6 +633,18 @@ energy[1-*]_input Cumulative energy use
> Unit: microJoule
> RO
>
> +energy[1-*]_enable Enable or disable the sensor.
> + When disabled the sensor read will return
> + -ENODATA. For chips which do not have the
> + capability to disable/enable single sensor but
> + have support for sensor-group disable/enable,
> + will only have the first attribute with write
> + permission. In such cases write to the first
> + attribute will affect all the sensors of this
> + type.
> + 1: Enable
> + 0: Disable
> + RW/RO
>
> ************
> * Humidity *
> @@ -586,6 +655,19 @@ humidity[1-*]_input Humidity
> RO
>
>
> +humidity[1-*]_enable Enable or disable the sensor.
> + When disabled the sensor read will return
> + -ENODATA. For chips which do not have the
> + capability to disable/enable single sensor but
> + have support for sensor-group disable/enable,
> + will only have the first attribute with write
> + permission. In such cases write to the first
> + attribute will affect all the sensors of this
> + type.
> + 1: Enable
> + 0: Disable
> + RW/RO
> +
> **********
> * Alarms *
> **********
>
On 07/05/2018 06:51 AM, Shilpasri G Bhat wrote:
> On-Chip-Controller(OCC) is an embedded micro-processor in POWER9 chip
> which measures various system and chip level sensors. These sensors
> comprises of environmental sensors (like power, temperature, current
> and voltage) and performance sensors (like utilization, frequency).
> All these sensors are copied to main memory at a regular interval of
> 100ms. OCC provides a way to select a group of sensors that is copied
> to the main memory to increase the update frequency of selected sensor
> groups. When a sensor-group is disabled, OCC will not copy it to main
> memory and those sensors read 0 values.
>
> This patch provides support for enabling/disabling the sensor groups
> like power, temperature, current and voltage. This patch adds new
> per-senor sysfs attribute to disable and enable them.
>
> Signed-off-by: Shilpasri G Bhat <[email protected]>
> ---
> Changes from v2:
> - Writes to first 'enable' attribute of the sensor group will affect all the
> sensors in the group
> - Removed global mutex and made it per sensor-group
>
> drivers/hwmon/ibmpowernv.c | 184 ++++++++++++++++++++++++++++++++++++++-------
> 1 file changed, 155 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/hwmon/ibmpowernv.c b/drivers/hwmon/ibmpowernv.c
> index f829dad..9c6adee 100644
> --- a/drivers/hwmon/ibmpowernv.c
> +++ b/drivers/hwmon/ibmpowernv.c
> @@ -73,6 +73,10 @@ enum sensors {
> struct attribute_group group;
> u32 attr_count;
> u32 hwmon_index;
> + struct mutex mutex;
> + u32 *gid;
> + u32 nr_gid;
> + bool enable;
> } sensor_groups[] = {
> { "fan" },
> { "temp" },
> @@ -105,6 +109,9 @@ static ssize_t show_sensor(struct device *dev, struct device_attribute *devattr,
> ssize_t ret;
> u64 x;
>
> + if (!sensor_groups[sdata->type].enable)
> + return -ENODATA;
> +
> ret = opal_get_sensor_data_u64(sdata->id, &x);
>
> if (ret)
> @@ -120,6 +127,46 @@ static ssize_t show_sensor(struct device *dev, struct device_attribute *devattr,
> return sprintf(buf, "%llu\n", x);
> }
>
> +static ssize_t show_enable(struct device *dev,
> + struct device_attribute *devattr, char *buf)
> +{
> + struct sensor_data *sdata = container_of(devattr, struct sensor_data,
> + dev_attr);
> +
> + return sprintf(buf, "%u\n", sensor_groups[sdata->type].enable);
> +}
> +
> +static ssize_t store_enable(struct device *dev,
> + struct device_attribute *devattr,
> + const char *buf, size_t count)
> +{
> + struct sensor_data *sdata = container_of(devattr, struct sensor_data,
> + dev_attr);
> + struct sensor_group *sg = &sensor_groups[sdata->type];
> + int ret, i;
> + bool data;
> +
> + ret = kstrtobool(buf, &data);
> + if (ret)
> + return ret;
> +
> + ret = mutex_lock_interruptible(&sg->mutex);
> + if (ret)
> + return ret;
> +
> + if (data != sg->enable)
> + for (i = 0; i < sg->nr_gid && !ret; i++)
> + ret = sensor_group_enable(sg->gid[i], data);
> +
Wouldn't it be better to have a separate attribute for each of the
affected groups if there can be more than one ? Just wondering.
The idea was to widen the scope to a point where there is a 1:1 match
between the hardware capabilities and attributes. Clearly having
a separate attribute for all sensors was inappropriate, but the code
above now suggests that a single attribute for all sensors may have
widened the scope too much (because the hardware can do better than
this).
Thanks,
Guenter
> + if (!ret) {
> + sg->enable = data;
> + ret = count;
> + }
> +
> + mutex_unlock(&sg->mutex);
> + return ret;
> +}
> +
> static ssize_t show_label(struct device *dev, struct device_attribute *devattr,
> char *buf)
> {
> @@ -292,13 +339,68 @@ static u32 get_sensor_hwmon_index(struct sensor_data *sdata,
> return ++sensor_groups[sdata->type].hwmon_index;
> }
>
> +static int init_sensor_group_data(struct platform_device *pdev)
> +{
> + struct device_node *groups, *sg;
> + enum sensors type;
> + int ret = 0, i;
> +
> + for (i = 0; i < MAX_SENSOR_TYPE; i++) {
> + sensor_groups[i].nr_gid = 0;
> + sensor_groups[i].enable = true;
> + }
> +
> + groups = of_find_node_by_path("/ibm,opal/sensor-groups");
> + if (!groups)
> + return ret;
> +
> + for (i = 0; i < MAX_SENSOR_TYPE; i++) {
> + u32 gid[256];
> + u32 id, size;
> +
> + for_each_child_of_node(groups, sg) {
> + type = get_sensor_type(sg);
> + if (type != i)
> + continue;
> +
> + if (of_property_read_u32(sg, "sensor-group-id", &id))
> + continue;
> +
> + gid[sensor_groups[i].nr_gid++] = id;
> + }
> +
> + if (!sensor_groups[i].nr_gid)
> + continue;
> +
> + size = sensor_groups[i].nr_gid * sizeof(u32);
> + sensor_groups[i].gid = devm_kzalloc(&pdev->dev, size,
> + GFP_KERNEL);
> + if (!sensor_groups[i].gid) {
> + ret = -ENOMEM;
> + break;
> + }
> +
> + memcpy(sensor_groups[i].gid, gid, size);
> + sensor_groups[i].enable = false;
> + mutex_init(&sensor_groups[i].mutex);
> + }
> +
> + of_node_put(groups);
> + return ret;
> +}
> +
> static int populate_attr_groups(struct platform_device *pdev)
> {
> struct platform_data *pdata = platform_get_drvdata(pdev);
> const struct attribute_group **pgroups = pdata->attr_groups;
> struct device_node *opal, *np;
> + int ret;
> enum sensors type;
>
> + ret = init_sensor_group_data(pdev);
> + if (ret)
> + return ret;
> +
> opal = of_find_node_by_path("/ibm,opal/sensors");
> for_each_child_of_node(opal, np) {
> const char *label;
> @@ -313,7 +415,7 @@ static int populate_attr_groups(struct platform_device *pdev)
> sensor_groups[type].attr_count++;
>
> /*
> - * add attributes for labels, min and max
> + * add attributes for labels, min, max and enable
> */
> if (!of_property_read_string(np, "label", &label))
> sensor_groups[type].attr_count++;
> @@ -321,6 +423,8 @@ static int populate_attr_groups(struct platform_device *pdev)
> sensor_groups[type].attr_count++;
> if (of_find_property(np, "sensor-data-max", NULL))
> sensor_groups[type].attr_count++;
> + if (sensor_groups[type].nr_gid)
> + sensor_groups[type].attr_count++;
> }
>
> of_node_put(opal);
> @@ -344,7 +448,10 @@ static int populate_attr_groups(struct platform_device *pdev)
> static void create_hwmon_attr(struct sensor_data *sdata, const char *attr_name,
> ssize_t (*show)(struct device *dev,
> struct device_attribute *attr,
> - char *buf))
> + char *buf),
> + ssize_t (*store)(struct device *dev,
> + struct device_attribute *attr,
> + const char *buf, size_t count))
> {
> snprintf(sdata->name, MAX_ATTR_LEN, "%s%d_%s",
> sensor_groups[sdata->type].name, sdata->hwmon_index,
> @@ -352,8 +459,13 @@ static void create_hwmon_attr(struct sensor_data *sdata, const char *attr_name,
>
> sysfs_attr_init(&sdata->dev_attr.attr);
> sdata->dev_attr.attr.name = sdata->name;
> - sdata->dev_attr.attr.mode = S_IRUGO;
> sdata->dev_attr.show = show;
> + if (store) {
> + sdata->dev_attr.store = store;
> + sdata->dev_attr.attr.mode = 0664;
> + } else {
> + sdata->dev_attr.attr.mode = 0444;
> + }
> }
>
> static void populate_sensor(struct sensor_data *sdata, int od, int hd, int sid,
> @@ -361,13 +473,16 @@ static void populate_sensor(struct sensor_data *sdata, int od, int hd, int sid,
> const struct attribute_group *pgroup,
> ssize_t (*show)(struct device *dev,
> struct device_attribute *attr,
> - char *buf))
> + char *buf),
> + ssize_t (*store)(struct device *dev,
> + struct device_attribute *attr,
> + const char *buf, size_t count))
> {
> sdata->id = sid;
> sdata->type = type;
> sdata->opal_index = od;
> sdata->hwmon_index = hd;
> - create_hwmon_attr(sdata, attr_name, show);
> + create_hwmon_attr(sdata, attr_name, show, store);
> pgroup->attrs[sensor_groups[type].attr_count++] = &sdata->dev_attr.attr;
> }
>
> @@ -408,18 +523,16 @@ static int create_device_attrs(struct platform_device *pdev)
> u32 count = 0;
> int err = 0;
>
> - opal = of_find_node_by_path("/ibm,opal/sensors");
> sdata = devm_kcalloc(&pdev->dev,
> pdata->sensors_count, sizeof(*sdata),
> GFP_KERNEL);
> - if (!sdata) {
> - err = -ENOMEM;
> - goto exit_put_node;
> - }
> + if (!sdata)
> + return -ENOMEM;
>
> + opal = of_find_node_by_path("/ibm,opal/sensors");
> for_each_child_of_node(opal, np) {
> const char *attr_name;
> - u32 opal_index;
> + u32 opal_index, hw_id;
> const char *label;
>
> if (np->name == NULL)
> @@ -456,14 +569,11 @@ static int create_device_attrs(struct platform_device *pdev)
> opal_index = INVALID_INDEX;
> }
>
> - sdata[count].opal_index = opal_index;
> - sdata[count].hwmon_index =
> - get_sensor_hwmon_index(&sdata[count], sdata, count);
> -
> - create_hwmon_attr(&sdata[count], attr_name, show_sensor);
> -
> - pgroups[type]->attrs[sensor_groups[type].attr_count++] =
> - &sdata[count++].dev_attr.attr;
> + hw_id = get_sensor_hwmon_index(&sdata[count], sdata, count);
> + populate_sensor(&sdata[count], opal_index, hw_id, sensor_id,
> + attr_name, type, pgroups[type], show_sensor,
> + NULL);
> + count++;
>
> if (!of_property_read_string(np, "label", &label)) {
> /*
> @@ -474,33 +584,49 @@ static int create_device_attrs(struct platform_device *pdev)
> */
>
> make_sensor_label(np, &sdata[count], label);
> - populate_sensor(&sdata[count], opal_index,
> - sdata[count - 1].hwmon_index,
> + populate_sensor(&sdata[count], opal_index, hw_id,
> sensor_id, "label", type, pgroups[type],
> - show_label);
> + show_label, NULL);
> count++;
> }
>
> if (!of_property_read_u32(np, "sensor-data-max", &sensor_id)) {
> attr_name = get_max_attr(type);
> - populate_sensor(&sdata[count], opal_index,
> - sdata[count - 1].hwmon_index,
> + populate_sensor(&sdata[count], opal_index, hw_id,
> sensor_id, attr_name, type,
> - pgroups[type], show_sensor);
> + pgroups[type], show_sensor, NULL);
> count++;
> }
>
> if (!of_property_read_u32(np, "sensor-data-min", &sensor_id)) {
> attr_name = get_min_attr(type);
> - populate_sensor(&sdata[count], opal_index,
> - sdata[count - 1].hwmon_index,
> + populate_sensor(&sdata[count], opal_index, hw_id,
> sensor_id, attr_name, type,
> - pgroups[type], show_sensor);
> + pgroups[type], show_sensor, NULL);
> count++;
> }
> +
> + if (sensor_groups[type].nr_gid) {
> + ssize_t (*store)(struct device *dev,
> + struct device_attribute *attr,
> + const char *buf, size_t count);
> +
> + if (!sensor_groups[type].enable) {
> + sensor_groups[type].enable = true;
> + store = store_enable;
> + } else {
> + store = NULL;
> + }
> +
> + sensor_groups[type].enable = true;
> + populate_sensor(&sdata[count], opal_index, hw_id,
> + sensor_id, "enable", type,
> + pgroups[type], show_enable, store);
> + count++;
> + }
> +
> }
>
> -exit_put_node:
> of_node_put(opal);
> return err;
> }
>
Hi,
On 07/05/2018 09:07 PM, Guenter Roeck wrote:
> On 07/05/2018 06:51 AM, Shilpasri G Bhat wrote:
>> On-Chip-Controller(OCC) is an embedded micro-processor in POWER9 chip
>> which measures various system and chip level sensors. These sensors
>> comprises of environmental sensors (like power, temperature, current
>> and voltage) and performance sensors (like utilization, frequency).
>> All these sensors are copied to main memory at a regular interval of
>> 100ms. OCC provides a way to select a group of sensors that is copied
>> to the main memory to increase the update frequency of selected sensor
>> groups. When a sensor-group is disabled, OCC will not copy it to main
>> memory and those sensors read 0 values.
>>
>> This patch provides support for enabling/disabling the sensor groups
>> like power, temperature, current and voltage. This patch adds new
>> per-senor sysfs attribute to disable and enable them.
>>
>> Signed-off-by: Shilpasri G Bhat <[email protected]>
>> ---
>> Changes from v2:
>> - Writes to first 'enable' attribute of the sensor group will affect all the
>> sensors in the group
>> - Removed global mutex and made it per sensor-group
>>
>> drivers/hwmon/ibmpowernv.c | 184 ++++++++++++++++++++++++++++++++++++++-------
>> 1 file changed, 155 insertions(+), 29 deletions(-)
>>
>> diff --git a/drivers/hwmon/ibmpowernv.c b/drivers/hwmon/ibmpowernv.c
>> index f829dad..9c6adee 100644
>> --- a/drivers/hwmon/ibmpowernv.c
>> +++ b/drivers/hwmon/ibmpowernv.c
>> @@ -73,6 +73,10 @@ enum sensors {
>> struct attribute_group group;
>> u32 attr_count;
>> u32 hwmon_index;
>> + struct mutex mutex;
>> + u32 *gid;
>> + u32 nr_gid;
>> + bool enable;
>> } sensor_groups[] = {
>> { "fan" },
>> { "temp" },
>> @@ -105,6 +109,9 @@ static ssize_t show_sensor(struct device *dev, struct
>> device_attribute *devattr,
>> ssize_t ret;
>> u64 x;
>> + if (!sensor_groups[sdata->type].enable)
>> + return -ENODATA;
>> +
>> ret = opal_get_sensor_data_u64(sdata->id, &x);
>> if (ret)
>> @@ -120,6 +127,46 @@ static ssize_t show_sensor(struct device *dev, struct
>> device_attribute *devattr,
>> return sprintf(buf, "%llu\n", x);
>> }
>> +static ssize_t show_enable(struct device *dev,
>> + struct device_attribute *devattr, char *buf)
>> +{
>> + struct sensor_data *sdata = container_of(devattr, struct sensor_data,
>> + dev_attr);
>> +
>> + return sprintf(buf, "%u\n", sensor_groups[sdata->type].enable);
>> +}
>> +
>> +static ssize_t store_enable(struct device *dev,
>> + struct device_attribute *devattr,
>> + const char *buf, size_t count)
>> +{
>> + struct sensor_data *sdata = container_of(devattr, struct sensor_data,
>> + dev_attr);
>> + struct sensor_group *sg = &sensor_groups[sdata->type];
>> + int ret, i;
>> + bool data;
>> +
>> + ret = kstrtobool(buf, &data);
>> + if (ret)
>> + return ret;
>> +
>> + ret = mutex_lock_interruptible(&sg->mutex);
>> + if (ret)
>> + return ret;
>> +
>> + if (data != sg->enable)
>> + for (i = 0; i < sg->nr_gid && !ret; i++)
>> + ret = sensor_group_enable(sg->gid[i], data);
>> +
>
> Wouldn't it be better to have a separate attribute for each of the
> affected groups if there can be more than one ? Just wondering.
>
> The idea was to widen the scope to a point where there is a 1:1 match
> between the hardware capabilities and attributes. Clearly having
> a separate attribute for all sensors was inappropriate, but the code
> above now suggests that a single attribute for all sensors may have
> widened the scope too much (because the hardware can do better than
> this).
>
Yup it would be better to have 'enable' attribute for each sub-group.
Thanks and Regards,
Shilpa
> Thanks,
> Guenter
>
>> + if (!ret) {
>> + sg->enable = data;
>> + ret = count;
>> + }
>> +
>> + mutex_unlock(&sg->mutex);
>> + return ret;
>> +}
>> +
>> static ssize_t show_label(struct device *dev, struct device_attribute *devattr,
>> char *buf)
>> {
>> @@ -292,13 +339,68 @@ static u32 get_sensor_hwmon_index(struct sensor_data
>> *sdata,
>> return ++sensor_groups[sdata->type].hwmon_index;
>> }
>> +static int init_sensor_group_data(struct platform_device *pdev)
>> +{
>> + struct device_node *groups, *sg;
>> + enum sensors type;
>> + int ret = 0, i;
>> +
>> + for (i = 0; i < MAX_SENSOR_TYPE; i++) {
>> + sensor_groups[i].nr_gid = 0;
>> + sensor_groups[i].enable = true;
>> + }
>> +
>> + groups = of_find_node_by_path("/ibm,opal/sensor-groups");
>> + if (!groups)
>> + return ret;
>> +
>> + for (i = 0; i < MAX_SENSOR_TYPE; i++) {
>> + u32 gid[256];
>> + u32 id, size;
>> +
>> + for_each_child_of_node(groups, sg) {
>> + type = get_sensor_type(sg);
>> + if (type != i)
>> + continue;
>> +
>> + if (of_property_read_u32(sg, "sensor-group-id", &id))
>> + continue;
>> +
>> + gid[sensor_groups[i].nr_gid++] = id;
>> + }
>> +
>> + if (!sensor_groups[i].nr_gid)
>> + continue;
>> +
>> + size = sensor_groups[i].nr_gid * sizeof(u32);
>> + sensor_groups[i].gid = devm_kzalloc(&pdev->dev, size,
>> + GFP_KERNEL);
>> + if (!sensor_groups[i].gid) {
>> + ret = -ENOMEM;
>> + break;
>> + }
>> +
>> + memcpy(sensor_groups[i].gid, gid, size);
>> + sensor_groups[i].enable = false;
>> + mutex_init(&sensor_groups[i].mutex);
>> + }
>> +
>> + of_node_put(groups);
>> + return ret;
>> +}
>> +
>> static int populate_attr_groups(struct platform_device *pdev)
>> {
>> struct platform_data *pdata = platform_get_drvdata(pdev);
>> const struct attribute_group **pgroups = pdata->attr_groups;
>> struct device_node *opal, *np;
>> + int ret;
>> enum sensors type;
>> + ret = init_sensor_group_data(pdev);
>> + if (ret)
>> + return ret;
>> +
>> opal = of_find_node_by_path("/ibm,opal/sensors");
>> for_each_child_of_node(opal, np) {
>> const char *label;
>> @@ -313,7 +415,7 @@ static int populate_attr_groups(struct platform_device *pdev)
>> sensor_groups[type].attr_count++;
>> /*
>> - * add attributes for labels, min and max
>> + * add attributes for labels, min, max and enable
>> */
>> if (!of_property_read_string(np, "label", &label))
>> sensor_groups[type].attr_count++;
>> @@ -321,6 +423,8 @@ static int populate_attr_groups(struct platform_device *pdev)
>> sensor_groups[type].attr_count++;
>> if (of_find_property(np, "sensor-data-max", NULL))
>> sensor_groups[type].attr_count++;
>> + if (sensor_groups[type].nr_gid)
>> + sensor_groups[type].attr_count++;
>> }
>> of_node_put(opal);
>> @@ -344,7 +448,10 @@ static int populate_attr_groups(struct platform_device
>> *pdev)
>> static void create_hwmon_attr(struct sensor_data *sdata, const char *attr_name,
>> ssize_t (*show)(struct device *dev,
>> struct device_attribute *attr,
>> - char *buf))
>> + char *buf),
>> + ssize_t (*store)(struct device *dev,
>> + struct device_attribute *attr,
>> + const char *buf, size_t count))
>> {
>> snprintf(sdata->name, MAX_ATTR_LEN, "%s%d_%s",
>> sensor_groups[sdata->type].name, sdata->hwmon_index,
>> @@ -352,8 +459,13 @@ static void create_hwmon_attr(struct sensor_data *sdata,
>> const char *attr_name,
>> sysfs_attr_init(&sdata->dev_attr.attr);
>> sdata->dev_attr.attr.name = sdata->name;
>> - sdata->dev_attr.attr.mode = S_IRUGO;
>> sdata->dev_attr.show = show;
>> + if (store) {
>> + sdata->dev_attr.store = store;
>> + sdata->dev_attr.attr.mode = 0664;
>> + } else {
>> + sdata->dev_attr.attr.mode = 0444;
>> + }
>> }
>> static void populate_sensor(struct sensor_data *sdata, int od, int hd, int
>> sid,
>> @@ -361,13 +473,16 @@ static void populate_sensor(struct sensor_data *sdata,
>> int od, int hd, int sid,
>> const struct attribute_group *pgroup,
>> ssize_t (*show)(struct device *dev,
>> struct device_attribute *attr,
>> - char *buf))
>> + char *buf),
>> + ssize_t (*store)(struct device *dev,
>> + struct device_attribute *attr,
>> + const char *buf, size_t count))
>> {
>> sdata->id = sid;
>> sdata->type = type;
>> sdata->opal_index = od;
>> sdata->hwmon_index = hd;
>> - create_hwmon_attr(sdata, attr_name, show);
>> + create_hwmon_attr(sdata, attr_name, show, store);
>> pgroup->attrs[sensor_groups[type].attr_count++] = &sdata->dev_attr.attr;
>> }
>> @@ -408,18 +523,16 @@ static int create_device_attrs(struct platform_device
>> *pdev)
>> u32 count = 0;
>> int err = 0;
>> - opal = of_find_node_by_path("/ibm,opal/sensors");
>> sdata = devm_kcalloc(&pdev->dev,
>> pdata->sensors_count, sizeof(*sdata),
>> GFP_KERNEL);
>> - if (!sdata) {
>> - err = -ENOMEM;
>> - goto exit_put_node;
>> - }
>> + if (!sdata)
>> + return -ENOMEM;
>> + opal = of_find_node_by_path("/ibm,opal/sensors");
>> for_each_child_of_node(opal, np) {
>> const char *attr_name;
>> - u32 opal_index;
>> + u32 opal_index, hw_id;
>> const char *label;
>> if (np->name == NULL)
>> @@ -456,14 +569,11 @@ static int create_device_attrs(struct platform_device
>> *pdev)
>> opal_index = INVALID_INDEX;
>> }
>> - sdata[count].opal_index = opal_index;
>> - sdata[count].hwmon_index =
>> - get_sensor_hwmon_index(&sdata[count], sdata, count);
>> -
>> - create_hwmon_attr(&sdata[count], attr_name, show_sensor);
>> -
>> - pgroups[type]->attrs[sensor_groups[type].attr_count++] =
>> - &sdata[count++].dev_attr.attr;
>> + hw_id = get_sensor_hwmon_index(&sdata[count], sdata, count);
>> + populate_sensor(&sdata[count], opal_index, hw_id, sensor_id,
>> + attr_name, type, pgroups[type], show_sensor,
>> + NULL);
>> + count++;
>> if (!of_property_read_string(np, "label", &label)) {
>> /*
>> @@ -474,33 +584,49 @@ static int create_device_attrs(struct platform_device
>> *pdev)
>> */
>> make_sensor_label(np, &sdata[count], label);
>> - populate_sensor(&sdata[count], opal_index,
>> - sdata[count - 1].hwmon_index,
>> + populate_sensor(&sdata[count], opal_index, hw_id,
>> sensor_id, "label", type, pgroups[type],
>> - show_label);
>> + show_label, NULL);
>> count++;
>> }
>> if (!of_property_read_u32(np, "sensor-data-max", &sensor_id)) {
>> attr_name = get_max_attr(type);
>> - populate_sensor(&sdata[count], opal_index,
>> - sdata[count - 1].hwmon_index,
>> + populate_sensor(&sdata[count], opal_index, hw_id,
>> sensor_id, attr_name, type,
>> - pgroups[type], show_sensor);
>> + pgroups[type], show_sensor, NULL);
>> count++;
>> }
>> if (!of_property_read_u32(np, "sensor-data-min", &sensor_id)) {
>> attr_name = get_min_attr(type);
>> - populate_sensor(&sdata[count], opal_index,
>> - sdata[count - 1].hwmon_index,
>> + populate_sensor(&sdata[count], opal_index, hw_id,
>> sensor_id, attr_name, type,
>> - pgroups[type], show_sensor);
>> + pgroups[type], show_sensor, NULL);
>> count++;
>> }
>> +
>> + if (sensor_groups[type].nr_gid) {
>> + ssize_t (*store)(struct device *dev,
>> + struct device_attribute *attr,
>> + const char *buf, size_t count);
>> +
>> + if (!sensor_groups[type].enable) {
>> + sensor_groups[type].enable = true;
>> + store = store_enable;
>> + } else {
>> + store = NULL;
>> + }
>> +
>> + sensor_groups[type].enable = true;
>> + populate_sensor(&sdata[count], opal_index, hw_id,
>> + sensor_id, "enable", type,
>> + pgroups[type], show_enable, store);
>> + count++;
>> + }
>> +
>> }
>> -exit_put_node:
>> of_node_put(opal);
>> return err;
>> }
>>
>