On Mon, May 29, 2017 at 10:16:01AM +0530, Shilpasri G Bhat wrote:
> OCC provides historical minimum and maximum value for the sensor
> readings. This patch exports them as highest and lowest attributes
> for the inband sensors copied by OCC to main memory.
>
> Signed-off-by: Shilpasri G Bhat <shilpa.b...@linux.vnet.ibm.com>
Applied to hwmon-next.
Thanks,
Guenter
> ---
> Changes from V4:
> - Got rid of 'len' variable in populate_attr_groups
>
> drivers/hwmon/ibmpowernv.c | 68
> +++++++++++++++++++++++++++++++++++++++++-----
> 1 file changed, 61 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/hwmon/ibmpowernv.c b/drivers/hwmon/ibmpowernv.c
> index 6d2e660..b562323 100644
> --- a/drivers/hwmon/ibmpowernv.c
> +++ b/drivers/hwmon/ibmpowernv.c
> @@ -298,10 +298,14 @@ static int populate_attr_groups(struct platform_device
> *pdev)
> sensor_groups[type].attr_count++;
>
> /*
> - * add a new attribute for labels
> + * add attributes for labels, min and max
> */
> if (!of_property_read_string(np, "label", &label))
> sensor_groups[type].attr_count++;
> + if (of_find_property(np, "sensor-data-min", NULL))
> + sensor_groups[type].attr_count++;
> + if (of_find_property(np, "sensor-data-max", NULL))
> + sensor_groups[type].attr_count++;
> }
>
> of_node_put(opal);
> @@ -337,6 +341,41 @@ static void create_hwmon_attr(struct sensor_data *sdata,
> const char *attr_name,
> sdata->dev_attr.show = show;
> }
>
> +static void populate_sensor(struct sensor_data *sdata, int od, int hd, int
> sid,
> + const char *attr_name, enum sensors type,
> + const struct attribute_group *pgroup,
> + ssize_t (*show)(struct device *dev,
> + struct device_attribute *attr,
> + char *buf))
> +{
> + sdata->id = sid;
> + sdata->type = type;
> + sdata->opal_index = od;
> + sdata->hwmon_index = hd;
> + create_hwmon_attr(sdata, attr_name, show);
> + pgroup->attrs[sensor_groups[type].attr_count++] = &sdata->dev_attr.attr;
> +}
> +
> +static char *get_max_attr(enum sensors type)
> +{
> + switch (type) {
> + case POWER_INPUT:
> + return "input_highest";
> + default:
> + return "highest";
> + }
> +}
> +
> +static char *get_min_attr(enum sensors type)
> +{
> + switch (type) {
> + case POWER_INPUT:
> + return "input_lowest";
> + default:
> + return "lowest";
> + }
> +}
> +
> /*
> * Iterate through the device tree for each child of 'sensors' node, create
> * a sysfs attribute file, the file is named by translating the DT node name
> @@ -417,16 +456,31 @@ static int create_device_attrs(struct platform_device
> *pdev)
> * attribute. They are related to the same
> * sensor.
> */
> - sdata[count].type = type;
> - sdata[count].opal_index = sdata[count - 1].opal_index;
> - sdata[count].hwmon_index = sdata[count - 1].hwmon_index;
>
> make_sensor_label(np, &sdata[count], label);
> + populate_sensor(&sdata[count], opal_index,
> + sdata[count - 1].hwmon_index,
> + sensor_id, "label", type, pgroups[type],
> + show_label);
> + count++;
> + }
>
> - create_hwmon_attr(&sdata[count], "label", show_label);
> + 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,
> + sensor_id, attr_name, type,
> + pgroups[type], show_sensor);
> + count++;
> + }
>
> - pgroups[type]->attrs[sensor_groups[type].attr_count++] =
> - &sdata[count++].dev_attr.attr;
> + 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,
> + sensor_id, attr_name, type,
> + pgroups[type], show_sensor);
> + count++;
> }
> }
>
