Skip to contentSkip to conversation

iio: humidity: ens210: Fix missing I2C functionality checks

PATCH Superseded Salah Triki 2 participants 2 messages May 6 IIO

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 iio: humidity: ens210: Fix missing I2C functionality checks

The ENS210 driver uses SMBus transactions (such as byte, word, and block data reads/writes) during the probe and measurement phases. However, the initial functionality check only validated a subset of these capabilities, which could lead to loading failures on adapters requiring SMBus emulation or native-only controllers.

To ensure compatibility across a wide range of I2C adapters, modify the functionality check to verify if the adapter supports the required native operations or, failing that, supports the SMBus emulation layer.

Fixes c524fbca672e ("iio: humidity: Add support for ENS210")

---
Changes since v3:
- Fixed the alignment and indentation of the I2C functionality check per Andy's review.

Changes since v2:
- Fixed the alignment and indentation of the I2C functionality check per Maxime's review.

Changes since v1:
- Updated the I2C functionality test to check for both required native operations and SMBus emulation (I2C_FUNC_SMBUS_EMUL) to prevent loading issues on controllers lacking the emulation flag.

 drivers/iio/humidity/ens210.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/iio/humidity/ens210.c +6 -3
index 77418d97f30d..96076b0391a7 100644
@@ -202,9 +202,12 @@ static int ens210_probe(struct i2c_client *client)
 	int ret;
 
 	if (!i2c_check_functionality(client->adapter,
-				     I2C_FUNC_SMBUS_WRITE_BYTE_DATA |
-				     I2C_FUNC_SMBUS_WRITE_BYTE |
-				     I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
+				I2C_FUNC_SMBUS_WRITE_BYTE_DATA |
+				I2C_FUNC_SMBUS_WRITE_BYTE |
+				I2C_FUNC_SMBUS_READ_BYTE_DATA |
+				I2C_FUNC_SMBUS_READ_WORD_DATA |
+				I2C_FUNC_SMBUS_READ_I2C_BLOCK) &&
+	    !i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_EMUL)) {
 		return dev_err_probe(&client->dev, -EOPNOTSUPP,
 			"adapter does not support some i2c transactions\n");
 	}
Signature · 1 line
2.43.0
#1 lore raw
Quoted 9 lines · Salah Triki

The ENS210 driver uses SMBus transactions (such as byte, word, and block data reads/writes) during the probe and measurement phases. However, the initial functionality check only validated a subset of these capabilities, which could lead to loading failures on adapters requiring SMBus emulation or native-only controllers.

To ensure compatibility across a wide range of I2C adapters, modify the functionality check to verify if the adapter supports the required native operations or, failing that, supports the SMBus emulation layer.

...

drivers/iio/humidity/ens210.c static int ens210_probe(struct i2c_client *client) · line 209

Quoted 10 lines
drivers/iio/humidity/ens210.c +5 -3
 	if (!i2c_check_functionality(client->adapter,
 
-				     I2C_FUNC_SMBUS_WRITE_BYTE_DATA |
-				     I2C_FUNC_SMBUS_WRITE_BYTE |
-				     I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
+				I2C_FUNC_SMBUS_WRITE_BYTE_DATA |
+				I2C_FUNC_SMBUS_WRITE_BYTE |
+				I2C_FUNC_SMBUS_READ_BYTE_DATA |
+				I2C_FUNC_SMBUS_READ_WORD_DATA |
+				I2C_FUNC_SMBUS_READ_I2C_BLOCK) &&

No, the above is FINE as is, you need to adjust the new added lines accordingly.

Quoted 4 lines
drivers/iio/humidity/ens210.c +1 -0
+	    !i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_EMUL)) {
 		return dev_err_probe(&client->dev, -EOPNOTSUPP,
 			"adapter does not support some i2c transactions\n");
 	}
Signature · 2 lines
With Best Regards,
Andy Shevchenko