Skip to content

Commit cb10066

Browse files
tamng-amperegregkh
authored andcommitted
i2c: designware: Disable TX_EMPTY irq while waiting for block length byte
commit e8183fa upstream. During SMBus block data read process, we have seen high interrupt rate because of TX_EMPTY irq status while waiting for block length byte (the first data byte after the address phase). The interrupt handler does not do anything because the internal state is kept as STATUS_WRITE_IN_PROGRESS. Hence, we should disable TX_EMPTY IRQ until I2C DesignWare receives first data byte from I2C device, then re-enable it to resume SMBus transaction. It takes 0.789 ms for host to receive data length from slave. Without the patch, i2c_dw_isr() is called 99 times by TX_EMPTY interrupt. And it is none after applying the patch. Cc: [email protected] Co-developed-by: Chuong Tran <[email protected]> Signed-off-by: Chuong Tran <[email protected]> Signed-off-by: Tam Nguyen <[email protected]> Acked-by: Jarkko Nikula <[email protected]> Reviewed-by: Serge Semin <[email protected]> Signed-off-by: Wolfram Sang <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 8e29eeb commit cb10066

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

drivers/i2c/busses/i2c-designware-master.c

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,10 +362,16 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev)
362362

363363
/*
364364
* Because we don't know the buffer length in the
365-
* I2C_FUNC_SMBUS_BLOCK_DATA case, we can't stop
366-
* the transaction here.
365+
* I2C_FUNC_SMBUS_BLOCK_DATA case, we can't stop the
366+
* transaction here. Also disable the TX_EMPTY IRQ
367+
* while waiting for the data length byte to avoid the
368+
* bogus interrupts flood.
367369
*/
368-
if (buf_len > 0 || flags & I2C_M_RECV_LEN) {
370+
if (flags & I2C_M_RECV_LEN) {
371+
dev->status |= STATUS_WRITE_IN_PROGRESS;
372+
intr_mask &= ~DW_IC_INTR_TX_EMPTY;
373+
break;
374+
} else if (buf_len > 0) {
369375
/* more bytes to be written */
370376
dev->status |= STATUS_WRITE_IN_PROGRESS;
371377
break;
@@ -401,6 +407,13 @@ i2c_dw_recv_len(struct dw_i2c_dev *dev, u8 len)
401407
msgs[dev->msg_read_idx].len = len;
402408
msgs[dev->msg_read_idx].flags &= ~I2C_M_RECV_LEN;
403409

410+
/*
411+
* Received buffer length, re-enable TX_EMPTY interrupt
412+
* to resume the SMBUS transaction.
413+
*/
414+
regmap_update_bits(dev->map, DW_IC_INTR_MASK, DW_IC_INTR_TX_EMPTY,
415+
DW_IC_INTR_TX_EMPTY);
416+
404417
return len;
405418
}
406419

0 commit comments

Comments
 (0)