i2c: designware: fix master is holding SCL low while ENABLE bit is disabled
Subsystems (3)
PATCH v7 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.
---V6->V7:
1. add Subject versioning [PATCH v7]
2. change fsleep(25) to usleep_range(25, 250)
3. Add macro definition DW_iC_ENABLE_ENABLE to fix compile errors
4. base: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=masterV5->V6: restore i2c_dw_is_master_idling() function checkingV4->V5: delete master idling checkingV3->V4:
1. update commit messages and add patch version and changelog
2. move print the error message in i2c_dw_xferV2->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 | 12 ++++++++++++ drivers/i2c/busses/i2c-designware-core.h | 1 + drivers/i2c/busses/i2c-designware-master.c | 22 ++++++++++++++++++++++ 3 files changed, 35 insertions(+)
drivers/i2c/busses/i2c-designware-common.c +12 -0
@@ -453,6 +453,18 @@ 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 ; +/* +* Need two ic_clk delay when enabling the I2C to ensure ENABLE bit +* is already set. Wait 10 times the signaling period of the highest +* I2C transfer supported by the driver(for 400KHz this is 25us) +* as described in the DesignWare I2C databook. +*/ +usleep_range (25 ,250 ); + } +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,
drivers/i2c/busses/i2c-designware-core.h +1 -0
@@ -109,6 +109,7 @@ DW_IC_INTR_RX_UNDER | \ DW_IC_INTR_RD_REQ) +#define DW_IC_ENABLE_ENABLE BIT(0)#define DW_IC_ENABLE_ABORT BIT(1)#define DW_IC_STATUS_ACTIVITY BIT(0)
drivers/i2c/busses/i2c-designware-master.c +22 -0
@@ -253,6 +253,19 @@ static void i2c_dw_xfer_init(struct dw_i2c_dev *dev)__i2c_dw_write_intr_mask (dev,DW_IC_INTR_MASTER_MASK ); } +static bool i2c_dw_is_master_idling (struct dw_i2c_dev *dev) +{ +u32 status; + +regmap_read (dev->map,DW_IC_STATUS , &status); +if (!(status &DW_IC_STATUS_MASTER_ACTIVITY )) +return true; + +return !regmap_read_poll_timeout (dev->map,DW_IC_STATUS , status, + !(status &DW_IC_STATUS_MASTER_ACTIVITY ), +1100 ,20000 ); +} +static int i2c_dw_check_stopbit (struct dw_i2c_dev *dev) {u32 val;
@@ -788,6 +801,15 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) goto done; } +/* +* This happens rarely and is hard to reproduce. Debug trace +* showed that IC_STATUS had value of 0x23 when STOP_DET occurred, +* if disable IC_ENABLE.ENABLE immediately that can result in +* IC_RAW_INTR_STAT.MASTER_ON_HOLD holding SCL low. +*/ +if (!i2c_dw_is_master_idling (dev)) +dev_err (dev->dev,"I2C master not idling\n" ); +/* * We must disable the adapter before returning and signaling the end * of the current transfer. Otherwise the hardware might continue
Signature · 1 line
2.17.1
Hi Kimriver,
Quoted 9 lines · Kimriver Liu
It was observed issuing ABORT
bit(IC_ENABLE[1])will not work whenIC_ENABLEis 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.Signed-off-by Kimriver Liu <[email protected]>
You forgot:
Quoted 6 lines
---
V6->V7:
1. add Subject versioning [PATCH v7]
2. change fsleep(25) tousleep_range(25, 250)
3. Add macro definitionDW_iC_ENABLE_ENABLEto fix compile errors
4. base: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=master
Thanks a lot for following up! :-)
Quoted 11 lines
V5->V6: restorei2c_dw_is_master_idling()function checkingV4->V5: delete master idling checkingV3->V4:
1. update commit messages and add patch version and changelog
2. move print the error message ini2c_dw_xferV2->V3: change (!enable) to (!(enable &DW_IC_ENABLE_ENABLE))V1->V2: used standard words in function names and addressed review commentslink to V1:
https://lore.kernel.org/lkml/[email protected]/
---
...
Quoted 6 lines
drivers/i2c/busses/i2c-designware-common.c +0
-0@@ -453,6 +453,18 @@ void __i2c_dw_disable(struct dw_i2c_dev *dev) abort_needed = raw_intr_stats &DW_IC_INTR_MST_ON_HOLD ;if (abort_needed) {
drivers/i2c/busses/i2c-designware-common.c void __i2c_dw_disable(struct dw_i2c_dev *dev) · line 465
Quoted 10 lines
drivers/i2c/busses/i2c-designware-common.c +10
-0+if (!(enable &DW_IC_ENABLE_ENABLE )) { +regmap_write (dev->map,DW_IC_ENABLE ,DW_IC_ENABLE_ENABLE ); + enable |=DW_IC_ENABLE_ENABLE ; +/* +* Need two ic_clk delay when enabling the I2C to ensure ENABLE bit +* is already set. Wait 10 times the signaling period of the highest +* I2C transfer supported by the driver(for 400KHz this is 25us) +* as described in the DesignWare I2C databook. +*/ +usleep_range (25 ,250 );
I think there is a misunderstanding here. Andy asked you to use flseep and improve the calculation: "Please, calculate this delay based on the actual speed in use (or about to be in use)."[*]
Andy can you please clarify with Kimriver here?
Thanks,
Andi
[*] Message-ID: <[email protected]>