Skip to contentSkip to conversation

hwmon: (nct7904) Fix the incorrect value of vsen_mask in nct7904_data struct.

PATCH Superseded [email protected] 2 participants 2 messages Sep 16, 2019 – Sep 17, 2019 Hardware monitoring

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 hwmon: (nct7904) Fix the incorrect value of vsen_mask in nct7904_data struct.

From: "amy.shih" <[email protected]>

Voltage sensors overlap with external temperature sensors. Detect the multi-function of voltage, thermal diode and thermistor from register VT_ADC_MD_REG to set value of vsen_mask in nct7904_data struct.

---
Changes in v2:
- Moved the if statement to outside.

 drivers/hwmon/nct7904.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/hwmon/nct7904.c +2 -0
index 95b447cfa24c..e2b3ec74491a 100644
@@ -921,6 +921,8 @@ static int nct7904_probe(struct i2c_client *client,
 			data->tcpu_mask &= ~bit;
 		else if (val == 0x1 || val == 0x2)
 			data->temp_mode |= bit;
+		if (val != 0)
+			data->vsen_mask &= ~(0x06 << (i * 2));
 	}
 
 	/* PECI */
Signature · 1 line
2.17.1
maintainer
#1 lore raw
Quoted 19 lines · On Mon, Sep 16, 2019 at 11:41:11AM +0800, [email protected] wrote:

From: "amy.shih" <[email protected]>

Voltage sensors overlap with external temperature sensors. Detect the multi-function of voltage, thermal diode and thermistor from register VT_ADC_MD_REG to set value of vsen_mask in nct7904_data struct.

---
Changes in v2:
- Moved the if statement to outside.

 drivers/hwmon/nct7904.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/hwmon/nct7904.c +0 -0
index 95b447cfa24c..e2b3ec74491a 100644

drivers/hwmon/nct7904.c static int nct7904_probe(struct i2c_client *client, · line 925

Quoted 5 lines
drivers/hwmon/nct7904.c +2 -0
@@ -921,6 +921,8 @@ static int nct7904_probe(struct i2c_client *client,
 			data->tcpu_mask &= ~bit;
 		else if (val == 0x1 || val == 0x2)
 			data->temp_mode |= bit;
+		if (val != 0)
+			data->vsen_mask &= ~(0x06 << (i * 2));

This is a slight change in semantics, since val != 0 includes 3. Should this maybe be as foillows ?

               if (val == 0) {
                        data->tcpu_mask &= ~bit;
                else {
			if (val == 0x1 || val == 0x2)
                        	data->temp_mode |= bit;
			data->vsen_mask &= ~(0x06 << (i * 2));
		}

Also, please you have a look at the code further above.

		val = (ret & (0x03 << i)) >> (i * 2);

Should that possibly be as follows ?

		val = (ret & (0x03 << i * 2)) >> (i * 2);
		                      ^^^^^

or, somewhat simplified,

		val = (ret >> i * 2) & 0x03;

Thanks,
Guenter