From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bh-25.webhostbox.net (bh-25.webhostbox.net [208.91.199.152]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3wcnrv0c4RzDq5x for ; Wed, 31 May 2017 08:11:58 +1000 (AEST) Date: Tue, 30 May 2017 15:11:53 -0700 From: Guenter Roeck To: Shilpasri G Bhat Cc: jdelvare@suse.com, paulus@samba.org, mpe@ellerman.id.au, linux-hwmon@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, svaidy@linux.vnet.ibm.com, ego@linux.vnet.ibm.com, akshay.adiga@linux.vnet.ibm.com, andrew@aj.id.au, clg@kaod.org Subject: Re: [V5] hwmon: (ibmpowernv) Add highest/lowest attributes to sensors Message-ID: <20170530221153.GA9428@roeck-us.net> References: <1496033161-9244-1-git-send-email-shilpa.bhat@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1496033161-9244-1-git-send-email-shilpa.bhat@linux.vnet.ibm.com> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 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++; > } > } >