[v3] dell-smm-hwmon.c: Additional temperature sensors

Message ID	20181214235758.13360-1-michelesr@autistici.org (mailing list archive)
State	Superseded
Headers	show Return-Path: <linux-hwmon-owner@kernel.org> sender: mikefender@cryptolab.net) by localhost (Postfix) with ESMTPSA id E23C26277D; Sat, 15 Dec 2018 00:04:42 +0000 (UTC) From: Michele Sorcinelli <michelesr@autistici.org> To: Guenter Roeck <linux@roeck-us.net> Cc: =?utf-8?q?Pali_Roh=C3=A1r?= <pali.rohar@gmail.com>, Jean Delvare <jdelvare@suse.com>, linux-hwmon@vger.kernel.org, Michele Sorcinelli <michelesr@autistici.org> Subject: [PATCH v3] dell-smm-hwmon.c: Additional temperature sensors Date: Fri, 14 Dec 2018 23:57:59 +0000 Message-Id: <20181214235758.13360-1-michelesr@autistici.org> In-Reply-To: <20181205091528.ixpitemcg6wnwbyp@pali> References: <20181205091528.ixpitemcg6wnwbyp@pali> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk
Series	[v3] dell-smm-hwmon.c: Additional temperature sensors \| expand [v3] dell-smm-hwmon.c: Additional temperature sensors

Message ID

20181214235758.13360-1-michelesr@autistici.org (mailing list archive)

State

Superseded

Headers

From: Michele Sorcinelli <michelesr@autistici.org>
To: Guenter Roeck <linux@roeck-us.net>
Cc: =?utf-8?q?Pali_Roh=C3=A1r?= <pali.rohar@gmail.com>,
 Jean Delvare <jdelvare@suse.com>, linux-hwmon@vger.kernel.org,
 Michele Sorcinelli <michelesr@autistici.org>
Subject: [PATCH v3] dell-smm-hwmon.c: Additional temperature sensors
Date: Fri, 14 Dec 2018 23:57:59 +0000
Message-Id: <20181214235758.13360-1-michelesr@autistici.org>
In-Reply-To: <20181205091528.ixpitemcg6wnwbyp@pali>
References: <20181205091528.ixpitemcg6wnwbyp@pali>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: linux-hwmon-owner@vger.kernel.org
Precedence: bulk

Series

[v3] dell-smm-hwmon.c: Additional temperature sensors | expand

Commit Message

Michele Sorcinelli Dec. 14, 2018, 11:57 p.m. UTC

The code has been extended to support up to 10 temperature sensors.

Changes from previous patch versions:

- fix wrong index ranges in i8k_is_visible() if conditions
- restore i8k_get_temp_type() as probe method for temp sensors because
  i8k_get_temp() is not reliable (for example it won't work when
  the sensors is turned off)

Signed-off-by: Michele Sorcinelli <michelesr@autistici.org>
---
 drivers/hwmon/dell-smm-hwmon.c | 105 ++++++++++++++++++++++++++++-----
 1 file changed, 90 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 drivers/hwmon/dell-smm-hwmon.c

--
2.20.0

Comments

Guenter Roeck Dec. 21, 2018, 11:40 p.m. UTC | #1

On Fri, Dec 14, 2018 at 11:57:59PM +0000, Michele Sorcinelli wrote:
> The code has been extended to support up to 10 temperature sensors.
> 
> Changes from previous patch versions:
> 
> - fix wrong index ranges in i8k_is_visible() if conditions
> - restore i8k_get_temp_type() as probe method for temp sensors because
>   i8k_get_temp() is not reliable (for example it won't work when
>   the sensors is turned off)
> 
> Signed-off-by: Michele Sorcinelli <michelesr@autistici.org>

Pali, this is waiting for your feedbacck. Any comments ?

Thanks,
Guenter

> ---
>  drivers/hwmon/dell-smm-hwmon.c | 105 ++++++++++++++++++++++++++++-----
>  1 file changed, 90 insertions(+), 15 deletions(-)
>  mode change 100644 => 100755 drivers/hwmon/dell-smm-hwmon.c
> 
> --
> 2.20.0
> 
> diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c
> old mode 100644
> new mode 100755
> index 367a8a617..73a30e3e4
> --- a/drivers/hwmon/dell-smm-hwmon.c
> +++ b/drivers/hwmon/dell-smm-hwmon.c
> @@ -82,9 +82,16 @@ static bool disallow_fan_support;
>  #define I8K_HWMON_HAVE_TEMP2	(1 << 1)
>  #define I8K_HWMON_HAVE_TEMP3	(1 << 2)
>  #define I8K_HWMON_HAVE_TEMP4	(1 << 3)
> -#define I8K_HWMON_HAVE_FAN1	(1 << 4)
> -#define I8K_HWMON_HAVE_FAN2	(1 << 5)
> -#define I8K_HWMON_HAVE_FAN3	(1 << 6)
> +#define I8K_HWMON_HAVE_TEMP5	(1 << 4)
> +#define I8K_HWMON_HAVE_TEMP6	(1 << 5)
> +#define I8K_HWMON_HAVE_TEMP7	(1 << 6)
> +#define I8K_HWMON_HAVE_TEMP8	(1 << 7)
> +#define I8K_HWMON_HAVE_TEMP9	(1 << 8)
> +#define I8K_HWMON_HAVE_TEMP10	(1 << 9)
> +
> +#define I8K_HWMON_HAVE_FAN1	(1 << 10)
> +#define I8K_HWMON_HAVE_FAN2	(1 << 11)
> +#define I8K_HWMON_HAVE_FAN3	(1 << 12)
> 
>  MODULE_AUTHOR("Massimo Dal Zotto (dz@debian.org)");
>  MODULE_AUTHOR("Pali Rohár <pali.rohar@gmail.com>");
> @@ -743,6 +750,25 @@ static SENSOR_DEVICE_ATTR(temp3_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
>  static SENSOR_DEVICE_ATTR(temp4_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 3);
>  static SENSOR_DEVICE_ATTR(temp4_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
>  			  3);
> +static SENSOR_DEVICE_ATTR(temp5_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 4);
> +static SENSOR_DEVICE_ATTR(temp5_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
> +			  4);
> +static SENSOR_DEVICE_ATTR(temp6_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 5);
> +static SENSOR_DEVICE_ATTR(temp6_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
> +			  5);
> +static SENSOR_DEVICE_ATTR(temp7_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 6);
> +static SENSOR_DEVICE_ATTR(temp7_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
> +			  6);
> +static SENSOR_DEVICE_ATTR(temp8_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 7);
> +static SENSOR_DEVICE_ATTR(temp8_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
> +			  7);
> +static SENSOR_DEVICE_ATTR(temp9_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 8);
> +static SENSOR_DEVICE_ATTR(temp9_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
> +			  8);
> +static SENSOR_DEVICE_ATTR(temp10_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 9);
> +static SENSOR_DEVICE_ATTR(temp10_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
> +			  9);
> +
>  static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, i8k_hwmon_show_fan, NULL, 0);
>  static SENSOR_DEVICE_ATTR(fan1_label, S_IRUGO, i8k_hwmon_show_fan_label, NULL,
>  			  0);
> @@ -770,15 +796,27 @@ static struct attribute *i8k_attrs[] = {
>  	&sensor_dev_attr_temp3_label.dev_attr.attr,	/* 5 */
>  	&sensor_dev_attr_temp4_input.dev_attr.attr,	/* 6 */
>  	&sensor_dev_attr_temp4_label.dev_attr.attr,	/* 7 */
> -	&sensor_dev_attr_fan1_input.dev_attr.attr,	/* 8 */
> -	&sensor_dev_attr_fan1_label.dev_attr.attr,	/* 9 */
> -	&sensor_dev_attr_pwm1.dev_attr.attr,		/* 10 */
> -	&sensor_dev_attr_fan2_input.dev_attr.attr,	/* 11 */
> -	&sensor_dev_attr_fan2_label.dev_attr.attr,	/* 12 */
> -	&sensor_dev_attr_pwm2.dev_attr.attr,		/* 13 */
> -	&sensor_dev_attr_fan3_input.dev_attr.attr,	/* 14 */
> -	&sensor_dev_attr_fan3_label.dev_attr.attr,	/* 15 */
> -	&sensor_dev_attr_pwm3.dev_attr.attr,		/* 16 */
> +	&sensor_dev_attr_temp5_input.dev_attr.attr,	/* 8 */
> +	&sensor_dev_attr_temp5_label.dev_attr.attr,	/* 9 */
> +	&sensor_dev_attr_temp6_input.dev_attr.attr,	/* 10 */
> +	&sensor_dev_attr_temp6_label.dev_attr.attr,	/* 11 */
> +	&sensor_dev_attr_temp7_input.dev_attr.attr,	/* 12 */
> +	&sensor_dev_attr_temp7_label.dev_attr.attr,	/* 13 */
> +	&sensor_dev_attr_temp8_input.dev_attr.attr,	/* 14 */
> +	&sensor_dev_attr_temp8_label.dev_attr.attr,	/* 15 */
> +	&sensor_dev_attr_temp9_input.dev_attr.attr,	/* 16 */
> +	&sensor_dev_attr_temp9_label.dev_attr.attr,	/* 17 */
> +	&sensor_dev_attr_temp10_input.dev_attr.attr,	/* 18 */
> +	&sensor_dev_attr_temp10_label.dev_attr.attr,	/* 19 */
> +	&sensor_dev_attr_fan1_input.dev_attr.attr,	/* 20 */
> +	&sensor_dev_attr_fan1_label.dev_attr.attr,	/* 21 */
> +	&sensor_dev_attr_pwm1.dev_attr.attr,		/* 22 */
> +	&sensor_dev_attr_fan2_input.dev_attr.attr,	/* 23 */
> +	&sensor_dev_attr_fan2_label.dev_attr.attr,	/* 24 */
> +	&sensor_dev_attr_pwm2.dev_attr.attr,		/* 25 */
> +	&sensor_dev_attr_fan3_input.dev_attr.attr,	/* 26 */
> +	&sensor_dev_attr_fan3_label.dev_attr.attr,	/* 27 */
> +	&sensor_dev_attr_pwm3.dev_attr.attr,		/* 28 */
>  	NULL
>  };
> 
> @@ -802,13 +840,32 @@ static umode_t i8k_is_visible(struct kobject *kobj, struct attribute *attr,
>  	if (index >= 6 && index <= 7 &&
>  	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP4))
>  		return 0;
> -	if (index >= 8 && index <= 10 &&
> +	if (index >= 8 && index <= 9 &&
> +	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP5))
> +		return 0;
> +	if (index >= 10 && index <= 11 &&
> +	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP6))
> +		return 0;
> +	if (index >= 12 && index <= 13 &&
> +	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP7))
> +		return 0;
> +	if (index >= 14 && index <= 15 &&
> +	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP8))
> +		return 0;
> +	if (index >= 16 && index <= 17 &&
> +	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP9))
> +		return 0;
> +	if (index >= 18 && index <= 19 &&
> +	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP10))
> +		return 0;
> +
> +	if (index >= 20 && index <= 22 &&
>  	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN1))
>  		return 0;
> -	if (index >= 11 && index <= 13 &&
> +	if (index >= 23 && index <= 25 &&
>  	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN2))
>  		return 0;
> -	if (index >= 14 && index <= 16 &&
> +	if (index >= 26 && index <= 28 &&
>  	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN3))
>  		return 0;
> 
> @@ -841,6 +898,24 @@ static int __init i8k_init_hwmon(void)
>  	err = i8k_get_temp_type(3);
>  	if (err >= 0)
>  		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP4;
> +	err = i8k_get_temp_type(4);
> +	if (err >= 0)
> +		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP5;
> +	err = i8k_get_temp_type(5);
> +	if (err >= 0)
> +		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP6;
> +	err = i8k_get_temp_type(6);
> +	if (err >= 0)
> +		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP7;
> +	err = i8k_get_temp_type(7);
> +	if (err >= 0)
> +		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP8;
> +	err = i8k_get_temp_type(8);
> +	if (err >= 0)
> +		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP9;
> +	err = i8k_get_temp_type(9);
> +	if (err >= 0)
> +		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP10;
> 
>  	/* First fan attributes, if fan status or type is OK */
>  	err = i8k_get_fan_status(0);

Pali Rohár Dec. 22, 2018, 12:50 p.m. UTC | #2

On Friday 21 December 2018 15:40:32 Guenter Roeck wrote:
> On Fri, Dec 14, 2018 at 11:57:59PM +0000, Michele Sorcinelli wrote:
> > The code has been extended to support up to 10 temperature sensors.
> > 
> > Changes from previous patch versions:
> > 
> > - fix wrong index ranges in i8k_is_visible() if conditions
> > - restore i8k_get_temp_type() as probe method for temp sensors because
> >   i8k_get_temp() is not reliable (for example it won't work when
> >   the sensors is turned off)
> > 
> > Signed-off-by: Michele Sorcinelli <michelesr@autistici.org>
> 
> Pali, this is waiting for your feedbacck. Any comments ?
> 
> Thanks,
> Guenter

Hi! Sorry for delay.

> > ---
> >  drivers/hwmon/dell-smm-hwmon.c | 105 ++++++++++++++++++++++++++++-----
> >  1 file changed, 90 insertions(+), 15 deletions(-)
> >  mode change 100644 => 100755 drivers/hwmon/dell-smm-hwmon.c

This change is wrong, source code files should not be executable.

Otherwise looks good. After removing executable bit, you can add my
Reviewed-by: Pali Rohár <pali.rohar@gmail.com>

> > 
> > --
> > 2.20.0
> > 
> > diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c
> > old mode 100644
> > new mode 100755
> > index 367a8a617..73a30e3e4
> > --- a/drivers/hwmon/dell-smm-hwmon.c
> > +++ b/drivers/hwmon/dell-smm-hwmon.c
> > @@ -82,9 +82,16 @@ static bool disallow_fan_support;
> >  #define I8K_HWMON_HAVE_TEMP2	(1 << 1)
> >  #define I8K_HWMON_HAVE_TEMP3	(1 << 2)
> >  #define I8K_HWMON_HAVE_TEMP4	(1 << 3)
> > -#define I8K_HWMON_HAVE_FAN1	(1 << 4)
> > -#define I8K_HWMON_HAVE_FAN2	(1 << 5)
> > -#define I8K_HWMON_HAVE_FAN3	(1 << 6)
> > +#define I8K_HWMON_HAVE_TEMP5	(1 << 4)
> > +#define I8K_HWMON_HAVE_TEMP6	(1 << 5)
> > +#define I8K_HWMON_HAVE_TEMP7	(1 << 6)
> > +#define I8K_HWMON_HAVE_TEMP8	(1 << 7)
> > +#define I8K_HWMON_HAVE_TEMP9	(1 << 8)
> > +#define I8K_HWMON_HAVE_TEMP10	(1 << 9)
> > +
> > +#define I8K_HWMON_HAVE_FAN1	(1 << 10)
> > +#define I8K_HWMON_HAVE_FAN2	(1 << 11)
> > +#define I8K_HWMON_HAVE_FAN3	(1 << 12)
> > 
> >  MODULE_AUTHOR("Massimo Dal Zotto (dz@debian.org)");
> >  MODULE_AUTHOR("Pali Rohár <pali.rohar@gmail.com>");
> > @@ -743,6 +750,25 @@ static SENSOR_DEVICE_ATTR(temp3_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
> >  static SENSOR_DEVICE_ATTR(temp4_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 3);
> >  static SENSOR_DEVICE_ATTR(temp4_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
> >  			  3);
> > +static SENSOR_DEVICE_ATTR(temp5_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 4);
> > +static SENSOR_DEVICE_ATTR(temp5_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
> > +			  4);
> > +static SENSOR_DEVICE_ATTR(temp6_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 5);
> > +static SENSOR_DEVICE_ATTR(temp6_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
> > +			  5);
> > +static SENSOR_DEVICE_ATTR(temp7_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 6);
> > +static SENSOR_DEVICE_ATTR(temp7_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
> > +			  6);
> > +static SENSOR_DEVICE_ATTR(temp8_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 7);
> > +static SENSOR_DEVICE_ATTR(temp8_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
> > +			  7);
> > +static SENSOR_DEVICE_ATTR(temp9_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 8);
> > +static SENSOR_DEVICE_ATTR(temp9_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
> > +			  8);
> > +static SENSOR_DEVICE_ATTR(temp10_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 9);
> > +static SENSOR_DEVICE_ATTR(temp10_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
> > +			  9);
> > +
> >  static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, i8k_hwmon_show_fan, NULL, 0);
> >  static SENSOR_DEVICE_ATTR(fan1_label, S_IRUGO, i8k_hwmon_show_fan_label, NULL,
> >  			  0);
> > @@ -770,15 +796,27 @@ static struct attribute *i8k_attrs[] = {
> >  	&sensor_dev_attr_temp3_label.dev_attr.attr,	/* 5 */
> >  	&sensor_dev_attr_temp4_input.dev_attr.attr,	/* 6 */
> >  	&sensor_dev_attr_temp4_label.dev_attr.attr,	/* 7 */
> > -	&sensor_dev_attr_fan1_input.dev_attr.attr,	/* 8 */
> > -	&sensor_dev_attr_fan1_label.dev_attr.attr,	/* 9 */
> > -	&sensor_dev_attr_pwm1.dev_attr.attr,		/* 10 */
> > -	&sensor_dev_attr_fan2_input.dev_attr.attr,	/* 11 */
> > -	&sensor_dev_attr_fan2_label.dev_attr.attr,	/* 12 */
> > -	&sensor_dev_attr_pwm2.dev_attr.attr,		/* 13 */
> > -	&sensor_dev_attr_fan3_input.dev_attr.attr,	/* 14 */
> > -	&sensor_dev_attr_fan3_label.dev_attr.attr,	/* 15 */
> > -	&sensor_dev_attr_pwm3.dev_attr.attr,		/* 16 */
> > +	&sensor_dev_attr_temp5_input.dev_attr.attr,	/* 8 */
> > +	&sensor_dev_attr_temp5_label.dev_attr.attr,	/* 9 */
> > +	&sensor_dev_attr_temp6_input.dev_attr.attr,	/* 10 */
> > +	&sensor_dev_attr_temp6_label.dev_attr.attr,	/* 11 */
> > +	&sensor_dev_attr_temp7_input.dev_attr.attr,	/* 12 */
> > +	&sensor_dev_attr_temp7_label.dev_attr.attr,	/* 13 */
> > +	&sensor_dev_attr_temp8_input.dev_attr.attr,	/* 14 */
> > +	&sensor_dev_attr_temp8_label.dev_attr.attr,	/* 15 */
> > +	&sensor_dev_attr_temp9_input.dev_attr.attr,	/* 16 */
> > +	&sensor_dev_attr_temp9_label.dev_attr.attr,	/* 17 */
> > +	&sensor_dev_attr_temp10_input.dev_attr.attr,	/* 18 */
> > +	&sensor_dev_attr_temp10_label.dev_attr.attr,	/* 19 */
> > +	&sensor_dev_attr_fan1_input.dev_attr.attr,	/* 20 */
> > +	&sensor_dev_attr_fan1_label.dev_attr.attr,	/* 21 */
> > +	&sensor_dev_attr_pwm1.dev_attr.attr,		/* 22 */
> > +	&sensor_dev_attr_fan2_input.dev_attr.attr,	/* 23 */
> > +	&sensor_dev_attr_fan2_label.dev_attr.attr,	/* 24 */
> > +	&sensor_dev_attr_pwm2.dev_attr.attr,		/* 25 */
> > +	&sensor_dev_attr_fan3_input.dev_attr.attr,	/* 26 */
> > +	&sensor_dev_attr_fan3_label.dev_attr.attr,	/* 27 */
> > +	&sensor_dev_attr_pwm3.dev_attr.attr,		/* 28 */
> >  	NULL
> >  };
> > 
> > @@ -802,13 +840,32 @@ static umode_t i8k_is_visible(struct kobject *kobj, struct attribute *attr,
> >  	if (index >= 6 && index <= 7 &&
> >  	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP4))
> >  		return 0;
> > -	if (index >= 8 && index <= 10 &&
> > +	if (index >= 8 && index <= 9 &&
> > +	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP5))
> > +		return 0;
> > +	if (index >= 10 && index <= 11 &&
> > +	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP6))
> > +		return 0;
> > +	if (index >= 12 && index <= 13 &&
> > +	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP7))
> > +		return 0;
> > +	if (index >= 14 && index <= 15 &&
> > +	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP8))
> > +		return 0;
> > +	if (index >= 16 && index <= 17 &&
> > +	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP9))
> > +		return 0;
> > +	if (index >= 18 && index <= 19 &&
> > +	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP10))
> > +		return 0;
> > +
> > +	if (index >= 20 && index <= 22 &&
> >  	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN1))
> >  		return 0;
> > -	if (index >= 11 && index <= 13 &&
> > +	if (index >= 23 && index <= 25 &&
> >  	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN2))
> >  		return 0;
> > -	if (index >= 14 && index <= 16 &&
> > +	if (index >= 26 && index <= 28 &&
> >  	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN3))
> >  		return 0;
> > 
> > @@ -841,6 +898,24 @@ static int __init i8k_init_hwmon(void)
> >  	err = i8k_get_temp_type(3);
> >  	if (err >= 0)
> >  		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP4;
> > +	err = i8k_get_temp_type(4);
> > +	if (err >= 0)
> > +		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP5;
> > +	err = i8k_get_temp_type(5);
> > +	if (err >= 0)
> > +		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP6;
> > +	err = i8k_get_temp_type(6);
> > +	if (err >= 0)
> > +		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP7;
> > +	err = i8k_get_temp_type(7);
> > +	if (err >= 0)
> > +		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP8;
> > +	err = i8k_get_temp_type(8);
> > +	if (err >= 0)
> > +		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP9;
> > +	err = i8k_get_temp_type(9);
> > +	if (err >= 0)
> > +		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP10;
> > 
> >  	/* First fan attributes, if fan status or type is OK */
> >  	err = i8k_get_fan_status(0);

diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c
old mode 100644
new mode 100755
index 367a8a617..73a30e3e4
--- a/drivers/hwmon/dell-smm-hwmon.c
+++ b/drivers/hwmon/dell-smm-hwmon.c
@@ -82,9 +82,16 @@  static bool disallow_fan_support;
 #define I8K_HWMON_HAVE_TEMP2	(1 << 1)
 #define I8K_HWMON_HAVE_TEMP3	(1 << 2)
 #define I8K_HWMON_HAVE_TEMP4	(1 << 3)
-#define I8K_HWMON_HAVE_FAN1	(1 << 4)
-#define I8K_HWMON_HAVE_FAN2	(1 << 5)
-#define I8K_HWMON_HAVE_FAN3	(1 << 6)
+#define I8K_HWMON_HAVE_TEMP5	(1 << 4)
+#define I8K_HWMON_HAVE_TEMP6	(1 << 5)
+#define I8K_HWMON_HAVE_TEMP7	(1 << 6)
+#define I8K_HWMON_HAVE_TEMP8	(1 << 7)
+#define I8K_HWMON_HAVE_TEMP9	(1 << 8)
+#define I8K_HWMON_HAVE_TEMP10	(1 << 9)
+
+#define I8K_HWMON_HAVE_FAN1	(1 << 10)
+#define I8K_HWMON_HAVE_FAN2	(1 << 11)
+#define I8K_HWMON_HAVE_FAN3	(1 << 12)

 MODULE_AUTHOR("Massimo Dal Zotto (dz@debian.org)");
 MODULE_AUTHOR("Pali Rohár <pali.rohar@gmail.com>");
@@ -743,6 +750,25 @@  static SENSOR_DEVICE_ATTR(temp3_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
 static SENSOR_DEVICE_ATTR(temp4_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 3);
 static SENSOR_DEVICE_ATTR(temp4_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
 			  3);
+static SENSOR_DEVICE_ATTR(temp5_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 4);
+static SENSOR_DEVICE_ATTR(temp5_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
+			  4);
+static SENSOR_DEVICE_ATTR(temp6_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 5);
+static SENSOR_DEVICE_ATTR(temp6_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
+			  5);
+static SENSOR_DEVICE_ATTR(temp7_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 6);
+static SENSOR_DEVICE_ATTR(temp7_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
+			  6);
+static SENSOR_DEVICE_ATTR(temp8_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 7);
+static SENSOR_DEVICE_ATTR(temp8_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
+			  7);
+static SENSOR_DEVICE_ATTR(temp9_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 8);
+static SENSOR_DEVICE_ATTR(temp9_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
+			  8);
+static SENSOR_DEVICE_ATTR(temp10_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 9);
+static SENSOR_DEVICE_ATTR(temp10_label, S_IRUGO, i8k_hwmon_show_temp_label, NULL,
+			  9);
+
 static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, i8k_hwmon_show_fan, NULL, 0);
 static SENSOR_DEVICE_ATTR(fan1_label, S_IRUGO, i8k_hwmon_show_fan_label, NULL,
 			  0);
@@ -770,15 +796,27 @@  static struct attribute *i8k_attrs[] = {
 	&sensor_dev_attr_temp3_label.dev_attr.attr,	/* 5 */
 	&sensor_dev_attr_temp4_input.dev_attr.attr,	/* 6 */
 	&sensor_dev_attr_temp4_label.dev_attr.attr,	/* 7 */
-	&sensor_dev_attr_fan1_input.dev_attr.attr,	/* 8 */
-	&sensor_dev_attr_fan1_label.dev_attr.attr,	/* 9 */
-	&sensor_dev_attr_pwm1.dev_attr.attr,		/* 10 */
-	&sensor_dev_attr_fan2_input.dev_attr.attr,	/* 11 */
-	&sensor_dev_attr_fan2_label.dev_attr.attr,	/* 12 */
-	&sensor_dev_attr_pwm2.dev_attr.attr,		/* 13 */
-	&sensor_dev_attr_fan3_input.dev_attr.attr,	/* 14 */
-	&sensor_dev_attr_fan3_label.dev_attr.attr,	/* 15 */
-	&sensor_dev_attr_pwm3.dev_attr.attr,		/* 16 */
+	&sensor_dev_attr_temp5_input.dev_attr.attr,	/* 8 */
+	&sensor_dev_attr_temp5_label.dev_attr.attr,	/* 9 */
+	&sensor_dev_attr_temp6_input.dev_attr.attr,	/* 10 */
+	&sensor_dev_attr_temp6_label.dev_attr.attr,	/* 11 */
+	&sensor_dev_attr_temp7_input.dev_attr.attr,	/* 12 */
+	&sensor_dev_attr_temp7_label.dev_attr.attr,	/* 13 */
+	&sensor_dev_attr_temp8_input.dev_attr.attr,	/* 14 */
+	&sensor_dev_attr_temp8_label.dev_attr.attr,	/* 15 */
+	&sensor_dev_attr_temp9_input.dev_attr.attr,	/* 16 */
+	&sensor_dev_attr_temp9_label.dev_attr.attr,	/* 17 */
+	&sensor_dev_attr_temp10_input.dev_attr.attr,	/* 18 */
+	&sensor_dev_attr_temp10_label.dev_attr.attr,	/* 19 */
+	&sensor_dev_attr_fan1_input.dev_attr.attr,	/* 20 */
+	&sensor_dev_attr_fan1_label.dev_attr.attr,	/* 21 */
+	&sensor_dev_attr_pwm1.dev_attr.attr,		/* 22 */
+	&sensor_dev_attr_fan2_input.dev_attr.attr,	/* 23 */
+	&sensor_dev_attr_fan2_label.dev_attr.attr,	/* 24 */
+	&sensor_dev_attr_pwm2.dev_attr.attr,		/* 25 */
+	&sensor_dev_attr_fan3_input.dev_attr.attr,	/* 26 */
+	&sensor_dev_attr_fan3_label.dev_attr.attr,	/* 27 */
+	&sensor_dev_attr_pwm3.dev_attr.attr,		/* 28 */
 	NULL
 };

@@ -802,13 +840,32 @@  static umode_t i8k_is_visible(struct kobject *kobj, struct attribute *attr,
 	if (index >= 6 && index <= 7 &&
 	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP4))
 		return 0;
-	if (index >= 8 && index <= 10 &&
+	if (index >= 8 && index <= 9 &&
+	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP5))
+		return 0;
+	if (index >= 10 && index <= 11 &&
+	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP6))
+		return 0;
+	if (index >= 12 && index <= 13 &&
+	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP7))
+		return 0;
+	if (index >= 14 && index <= 15 &&
+	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP8))
+		return 0;
+	if (index >= 16 && index <= 17 &&
+	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP9))
+		return 0;
+	if (index >= 18 && index <= 19 &&
+	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP10))
+		return 0;
+
+	if (index >= 20 && index <= 22 &&
 	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN1))
 		return 0;
-	if (index >= 11 && index <= 13 &&
+	if (index >= 23 && index <= 25 &&
 	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN2))
 		return 0;
-	if (index >= 14 && index <= 16 &&
+	if (index >= 26 && index <= 28 &&
 	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN3))
 		return 0;

@@ -841,6 +898,24 @@  static int __init i8k_init_hwmon(void)
 	err = i8k_get_temp_type(3);
 	if (err >= 0)
 		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP4;
+	err = i8k_get_temp_type(4);
+	if (err >= 0)
+		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP5;
+	err = i8k_get_temp_type(5);
+	if (err >= 0)
+		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP6;
+	err = i8k_get_temp_type(6);
+	if (err >= 0)
+		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP7;
+	err = i8k_get_temp_type(7);
+	if (err >= 0)
+		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP8;
+	err = i8k_get_temp_type(8);
+	if (err >= 0)
+		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP9;
+	err = i8k_get_temp_type(9);
+	if (err >= 0)
+		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP10;

 	/* First fan attributes, if fan status or type is OK */
 	err = i8k_get_fan_status(0);

[v3] dell-smm-hwmon.c: Additional temperature sensors

Commit Message

Comments

Patch