lkml.org 
[lkml]   [2014]   [Oct]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/14] net: dsa: Add support for hardware monitoring
    Date
    Some Marvell switches provide chip temperature data.
    Add support for reporting it to the dsa infrastructure.

    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    ---
    include/net/dsa.h | 6 +++
    net/dsa/dsa.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
    2 files changed, 117 insertions(+)

    diff --git a/include/net/dsa.h b/include/net/dsa.h
    index b765592..d8b3057 100644
    --- a/include/net/dsa.h
    +++ b/include/net/dsa.h
    @@ -242,6 +242,12 @@ struct dsa_switch_driver {
    struct ethtool_eee *e);
    int (*get_eee)(struct dsa_switch *ds, int port,
    struct ethtool_eee *e);
    +
    + /* Hardware monitoring */
    + int (*get_temp)(struct dsa_switch *ds, int *temp);
    + int (*get_temp_limit)(struct dsa_switch *ds, int *temp);
    + int (*set_temp_limit)(struct dsa_switch *ds, int temp);
    + int (*get_temp_alarm)(struct dsa_switch *ds, bool *alarm);
    };

    void register_switch_driver(struct dsa_switch_driver *type);
    diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
    index 22f34cf..6567c8e 100644
    --- a/net/dsa/dsa.c
    +++ b/net/dsa/dsa.c
    @@ -9,6 +9,8 @@
    * (at your option) any later version.
    */

    +#include <linux/device.h>
    +#include <linux/hwmon.h>
    #include <linux/list.h>
    #include <linux/platform_device.h>
    #include <linux/slab.h>
    @@ -17,6 +19,7 @@
    #include <linux/of.h>
    #include <linux/of_mdio.h>
    #include <linux/of_platform.h>
    +#include <linux/sysfs.h>
    #include "dsa_priv.h"

    char dsa_driver_version[] = "0.1";
    @@ -71,6 +74,104 @@ dsa_switch_probe(struct device *host_dev, int sw_addr, char **_name)
    return ret;
    }

    +/* hwmon support ************************************************************/
    +
    +#if defined(CONFIG_HWMON) || (defined(MODULE) && defined(CONFIG_HWMON_MODULE))
    +
    +static ssize_t temp1_input_show(struct device *dev,
    + struct device_attribute *attr, char *buf)
    +{
    + struct dsa_switch *ds = dev_get_drvdata(dev);
    + int temp, ret;
    +
    + ret = ds->drv->get_temp(ds, &temp);
    + if (ret < 0)
    + return ret;
    +
    + return sprintf(buf, "%d\n", temp * 1000);
    +}
    +static DEVICE_ATTR_RO(temp1_input);
    +
    +static ssize_t temp1_max_show(struct device *dev,
    + struct device_attribute *attr, char *buf)
    +{
    + struct dsa_switch *ds = dev_get_drvdata(dev);
    + int temp, ret;
    +
    + ret = ds->drv->get_temp_limit(ds, &temp);
    + if (ret < 0)
    + return ret;
    +
    + return sprintf(buf, "%d\n", temp * 1000);
    +}
    +
    +static ssize_t temp1_max_store(struct device *dev,
    + struct device_attribute *attr, const char *buf,
    + size_t count)
    +{
    + struct dsa_switch *ds = dev_get_drvdata(dev);
    + int temp, ret;
    +
    + ret = kstrtoint(buf, 0, &temp);
    + if (ret < 0)
    + return ret;
    +
    + ret = ds->drv->set_temp_limit(ds, DIV_ROUND_CLOSEST(temp, 1000));
    + if (ret < 0)
    + return ret;
    +
    + return count;
    +}
    +static DEVICE_ATTR(temp1_max, S_IRUGO, temp1_max_show, temp1_max_store);
    +
    +static ssize_t temp1_max_alarm_show(struct device *dev,
    + struct device_attribute *attr, char *buf)
    +{
    + struct dsa_switch *ds = dev_get_drvdata(dev);
    + bool alarm;
    + int ret;
    +
    + ret = ds->drv->get_temp_alarm(ds, &alarm);
    + if (ret < 0)
    + return ret;
    +
    + return sprintf(buf, "%d\n", alarm);
    +}
    +static DEVICE_ATTR_RO(temp1_max_alarm);
    +
    +static struct attribute *dsa_hwmon_attrs[] = {
    + &dev_attr_temp1_input.attr, /* 0 */
    + &dev_attr_temp1_max.attr, /* 1 */
    + &dev_attr_temp1_max_alarm.attr, /* 2 */
    + NULL
    +};
    +
    +static umode_t dsa_hwmon_attrs_visible(struct kobject *kobj,
    + struct attribute *attr, int index)
    +{
    + struct device *dev = container_of(kobj, struct device, kobj);
    + struct dsa_switch *ds = dev_get_drvdata(dev);
    + struct dsa_switch_driver *drv = ds->drv;
    + umode_t mode = attr->mode;
    +
    + if (index == 1) {
    + if (!drv->get_temp_limit)
    + mode = 0;
    + else if (drv->set_temp_limit)
    + mode |= S_IWUSR;
    + } else if (index == 2 && !drv->get_temp_alarm) {
    + mode = 0;
    + }
    + return mode;
    +}
    +
    +static const struct attribute_group dsa_hwmon_group = {
    + .attrs = dsa_hwmon_attrs,
    + .is_visible = dsa_hwmon_attrs_visible,
    +};
    +__ATTRIBUTE_GROUPS(dsa_hwmon);
    +
    +#endif /* CONFIG_HWMON */

    /* basic switch operations **************************************************/
    static struct dsa_switch *
    @@ -225,6 +326,16 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index,
    ds->ports[i] = slave_dev;
    }

    +#if defined(CONFIG_HWMON) || (defined(MODULE) && defined(CONFIG_HWMON_MODULE))
    + /* If the switch provides a temperature sensor,
    + * register with hardware monitoring subsystem.
    + * Treat registration error as non-fatal and ignore it.
    + */
    + if (drv->get_temp)
    + devm_hwmon_device_register_with_groups(parent, "dsa", ds,
    + dsa_hwmon_groups);
    +#endif
    +
    return ds;

    out_free:
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-10-23 06:41    [W:4.129 / U:0.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site