Skip to contentSkip to conversation

i2c: designware: fix master is holding SCL low while ENABLE bit is disabled

PATCH In review Kimriver Liu 3 participants 3 messages Sep 6, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i2c: designware: fix master is holding SCL low while ENABLE bit is disabled

It was observed issuing ABORT bit(IC_ENABLE[1]) will not work when IC_ENABLE is already disabled.

Check if ENABLE bit(IC_ENABLE[0]) is disabled when the master is holding SCL low. If ENABLE bit is disabled, the software need enable it before trying to issue ABORT bit. otherwise, the controller ignores any write to ABORT bit.

---
V4->V5: delete master idling checking
V3->V4:
1. update commit messages and add patch version and changelog
2. move print the error message in i2c_dw_xfer
V2->V3: change (!enable) to (!(enable & DW_IC_ENABLE_ENABLE)) V1->V2: used standard words in function names and addressed review comments

link to V1:
https://lore.kernel.org/lkml/[email protected]/

---
 drivers/i2c/busses/i2c-designware-common.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
drivers/i2c/busses/i2c-designware-common.c +11 -0
index e8a688d04aee..2b3398cd4382 100644
@@ -453,6 +453,17 @@ void __i2c_dw_disable(struct dw_i2c_dev *dev)
 
 	abort_needed = raw_intr_stats & DW_IC_INTR_MST_ON_HOLD;
 	if (abort_needed) {
+		if (!(enable & DW_IC_ENABLE_ENABLE)) {
+			regmap_write(dev->map, DW_IC_ENABLE, DW_IC_ENABLE_ENABLE);
+			enable |= DW_IC_ENABLE_ENABLE;
+			/*
+			 * Wait two ic_clk delay when enabling the I2C to ensure ENABLE bit
+			 * is already set by the driver (for 400KHz this is 25us)
+			 * as described in the DesignWare I2C databook.
+			 */
+			fsleep(25);
+		}
+
 		regmap_write(dev->map, DW_IC_ENABLE, enable | DW_IC_ENABLE_ABORT);
 		ret = regmap_read_poll_timeout(dev->map, DW_IC_ENABLE, enable,
 					       !(enable & DW_IC_ENABLE_ABORT), 10,
Signature · 1 line
2.17.1
maintainer
#1 lore raw
Quoted 8 lines · Kimriver Liu

It was observed issuing ABORT bit(IC_ENABLE[1]) will not work when IC_ENABLE is already disabled.

Check if ENABLE bit(IC_ENABLE[0]) is disabled when the master is holding SCL low. If ENABLE bit is disabled, the software need enable it before trying to issue ABORT bit. otherwise, the controller ignores any write to ABORT bit.

Quoted 4 lines

---
V4->V5: delete master idling checking

Hm, why did you do that? I suggested to consolidate the two into one function (if possible) not drop it.

#2 lore raw
In reply to Kimriver Liu
Quoted 2 lines · Kimriver Liu

---
V4->V5: delete master idling checking

Please, slow down, read Submitting Patches and Submitting Patches Checklist documentation, make sure you understand versioning of the patches (this still is v1 formally), address as many comments as you can (the rest should be replied to the reviewers and explaining why
you can't / won't satisfy them). Only *after* that send a new version.

Signature · 2 lines
With Best Regards,
Andy Shevchenko