Re: [lm-sensors] [PATCH 2/2] Need ADT7462_PIN29_SHIFT for pin_cfg[3] linux-2.6.30 adt7462 hwmon driver

[Jean Delvare <khali@linux-fr.org>]

On Wed, 16 Dec 2009 10:08:51 -0800, Ray Copeland wrote:
> From: Ray Copeland <ray.copeland@aprius.com>
> Date: Wed, 16 Dec 2009
> Subject: [PATCH 2/2] Need ADT7462_PIN29_SHIFT for pin_cfg[3] linux-2.6.30 adt7462 hwmon driver
> 
> Description:
> 
> The driver uses the following expression (parentheses added for clarity) 
> to test if the +1.5V ICH/3GPIO voltages are configured:
> 
> if (((data->pin_cfg[3] >> ADT7462_PIN28_SHIFT) == ADT7462_PIN28_VOLT) &&
> !(data->pin_cfg[0] & ADT7462_VID_INPUT))
> 
> With "#define ADT7462_PIN28_SHIFT 6" this will never equate to "#define
> ADT7462_PIN28_VOLT 5" because that shifts in only the PIN28 +1.5V ICH value 
> and misses the PIN29 +1.5V 3GPIO value.  It is the combination of both these 
> values that equates to 5 if the voltages are configured. 
> 
> Note the logic is essentially correct in that both these voltages must
> be configured together, meaning you can't set one to +1.5V and have the 
> other be something else.  Also, I think the logic just got a little confused 
> thinking that pin 28 comes first (bit-position wise) in the pin_cfg[3], but 
> actually the order of bits from ms to ls is pin28/29 not pin 29/28.
> 
> Signed-off-by: Ray Copeland <ray.copeland@aprius.com>

I've just picked Roger Blofeld's patch:
http://lists.lm-sensors.org/pipermail/lm-sensors/2009-December/027503.html

which AFAICT fixes the same bug in fewer lines.

> 
> Diff with changes vs. original adt7462.c 2.6.30 version:
> 
> --- adt7462.c	2009-12-15 15:57:47.000000000 -0800
> +++ adt7462.c.orig	2009-12-15 15:51:05.000000000 -0800
> @@ -97,7 +97,6 @@
>  #define		ADT7462_PIN24_SHIFT		6
>  #define		ADT7462_PIN26_VOLT_INPUT	0x08
>  #define		ADT7462_PIN25_VOLT_INPUT	0x20
> -#define		ADT7462_PIN29_SHIFT		4	/* cfg3 */
>  #define		ADT7462_PIN28_SHIFT		6	/* cfg3 */
>  #define		ADT7462_PIN28_VOLT		0x5
>  
> @@ -183,7 +182,7 @@
>   *
>   * Some, but not all, of these voltages have low/high limits.
>   */
> -#define ADT7462_VOLT_COUNT	13
> +#define ADT7462_VOLT_COUNT	12
>  
>  #define ADT7462_VENDOR		0x41
>  #define ADT7462_DEVICE		0x62
> @@ -325,13 +324,13 @@
>  	case 10:
>  		return 0x6A;
>  	case 11:
> -		if (data->pin_cfg[3] >> ADT7462_PIN29_SHIFT ==
> +		if (data->pin_cfg[3] >> ADT7462_PIN28_SHIFT ==
>  					ADT7462_PIN28_VOLT &&
>  		    !(data->pin_cfg[0] & ADT7462_VID_INPUT))
>  			return 0x50;
>  		break;
>  	case 12:
> -		if (data->pin_cfg[3] >> ADT7462_PIN29_SHIFT ==
> +		if (data->pin_cfg[3] >> ADT7462_PIN28_SHIFT ==
>  					ADT7462_PIN28_VOLT &&
>  		    !(data->pin_cfg[0] & ADT7462_VID_INPUT))
>  			return 0x4C;
> @@ -384,13 +383,13 @@
>  	case 10:
>  		return 0x73;
>  	case 11:
> -		if (data->pin_cfg[3] >> ADT7462_PIN29_SHIFT ==
> +		if (data->pin_cfg[3] >> ADT7462_PIN28_SHIFT ==
>  					ADT7462_PIN28_VOLT &&
>  		    !(data->pin_cfg[0] & ADT7462_VID_INPUT))
>  			return 0x76;
>  		break;
>  	case 12:
> -		if (data->pin_cfg[3] >> ADT7462_PIN29_SHIFT ==
> +		if (data->pin_cfg[3] >> ADT7462_PIN28_SHIFT ==
>  					ADT7462_PIN28_VOLT &&
>  		    !(data->pin_cfg[0] & ADT7462_VID_INPUT))
>  			return 0x77;
> @@ -443,13 +442,13 @@
>  	case 10:
>  		return 0x91;
>  	case 11:
> -		if (data->pin_cfg[3] >> ADT7462_PIN29_SHIFT ==
> +		if (data->pin_cfg[3] >> ADT7462_PIN28_SHIFT ==
>  					ADT7462_PIN28_VOLT &&
>  		    !(data->pin_cfg[0] & ADT7462_VID_INPUT))
>  			return 0x94;
>  		break;
>  	case 12:
> -		if (data->pin_cfg[3] >> ADT7462_PIN29_SHIFT ==
> +		if (data->pin_cfg[3] >> ADT7462_PIN28_SHIFT ==
>  					ADT7462_PIN28_VOLT &&
>  		    !(data->pin_cfg[0] & ADT7462_VID_INPUT))
>  			return 0x95;
> @@ -535,13 +534,13 @@
>  			return "+1.5";
>  		}
>  	case 11:
> -		if (data->pin_cfg[3] >> ADT7462_PIN29_SHIFT ==
> +		if (data->pin_cfg[3] >> ADT7462_PIN28_SHIFT ==
>  					ADT7462_PIN28_VOLT &&
>  		    !(data->pin_cfg[0] & ADT7462_VID_INPUT))
>  			return "+1.5V ICH";
>  		break;
>  	case 12:
> -		if (data->pin_cfg[3] >> ADT7462_PIN29_SHIFT ==
> +		if (data->pin_cfg[3] >> ADT7462_PIN28_SHIFT ==
>  					ADT7462_PIN28_VOLT &&
>  		    !(data->pin_cfg[0] & ADT7462_VID_INPUT))
>  			return "+1.5V 3GPIO";
> @@ -630,7 +629,7 @@
>  		}
>  	case 11:
>  	case 12:
> -		if (data->pin_cfg[3] >> ADT7462_PIN29_SHIFT ==
> +		if (data->pin_cfg[3] >> ADT7462_PIN28_SHIFT ==
>  					ADT7462_PIN28_VOLT &&
>  		    !(data->pin_cfg[0] & ADT7462_VID_INPUT))
>  			return 7800;
> 
> 
> 


-- 
Jean Delvare