linux-kernel - Re: [PATCH] hwmon: (occ) Fix P10 VRM temp sensors

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20211002113602.GA894333@roeck-us.net>
Date:   Sat, 2 Oct 2021 04:36:02 -0700
From:   Guenter Roeck <linux@...ck-us.net>
To:     Eddie James <eajames@...ux.ibm.com>
Cc:     jdelvare@...e.com, linux-hwmon@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH] hwmon: (occ) Fix P10 VRM temp sensors

On Wed, Sep 29, 2021 at 10:36:04AM -0500, Eddie James wrote:
> The P10 (temp sensor version 0x10) doesn't do the same VRM status
> reporting that was used on P9. It just reports the temperature, so
> drop the check for VRM fru type in the sysfs show function, and don't
> set the name to "alarm".
> 
> Fixes: db4919ec86 ("hwmon: (occ) Add new temperature sensor type")
> Signed-off-by: Eddie James <eajames@...ux.ibm.com>

Applied.

Thanks,
Guenter

> ---
>  drivers/hwmon/occ/common.c | 17 +++++------------
>  1 file changed, 5 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/hwmon/occ/common.c b/drivers/hwmon/occ/common.c
> index 0d68a78be980..ae664613289c 100644
> --- a/drivers/hwmon/occ/common.c
> +++ b/drivers/hwmon/occ/common.c
> @@ -340,18 +340,11 @@ static ssize_t occ_show_temp_10(struct device *dev,
>  		if (val == OCC_TEMP_SENSOR_FAULT)
>  			return -EREMOTEIO;
>  
> -		/*
> -		 * VRM doesn't return temperature, only alarm bit. This
> -		 * attribute maps to tempX_alarm instead of tempX_input for
> -		 * VRM
> -		 */
> -		if (temp->fru_type != OCC_FRU_TYPE_VRM) {
> -			/* sensor not ready */
> -			if (val == 0)
> -				return -EAGAIN;
> +		/* sensor not ready */
> +		if (val == 0)
> +			return -EAGAIN;
>  
> -			val *= 1000;
> -		}
> +		val *= 1000;
>  		break;
>  	case 2:
>  		val = temp->fru_type;
> @@ -886,7 +879,7 @@ static int occ_setup_sensor_attrs(struct occ *occ)
>  					     0, i);
>  		attr++;
>  
> -		if (sensors->temp.version > 1 &&
> +		if (sensors->temp.version == 2 &&
>  		    temp->fru_type == OCC_FRU_TYPE_VRM) {
>  			snprintf(attr->name, sizeof(attr->name),
>  				 "temp%d_alarm", s);