From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jisheng Zhang Subject: [PATCH] i2c: designware: Don't mask TX_EMPTY if write is in progress Date: Fri, 30 Oct 2015 15:37:29 +0800 Message-ID: <1446190649-1318-1-git-send-email-jszhang@marvell.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: andriy.shevchenko@linux.intel.com, jarkko.nikula@linux.intel.com, mika.westerberg@linux.intel.com, wsa@the-dreams.de Cc: Jisheng Zhang , linux-i2c@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org List-Id: linux-i2c@vger.kernel.org Currently when i2c_msg index search is completed, TX_EMPTY interrupt will be masked. But if the size of i2c_msg data is longer than the size of the tx buffer, we still need TX_EMPTY interrupt, otherwise we will get "controller timed out" error. This patch fixes this issue by only masking TX_EMPTY if i2c_msg index search is completed and write is not in progress. Signed-off-by: Jisheng Zhang --- drivers/i2c/busses/i2c-designware-core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-core.c b/drivers/i2c/busses/i2c-designware-core.c index 7441cdc..a2eb212 100644 --- a/drivers/i2c/busses/i2c-designware-core.c +++ b/drivers/i2c/busses/i2c-designware-core.c @@ -542,10 +542,11 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev) } /* - * If i2c_msg index search is completed, we don't need TX_EMPTY - * interrupt any more. + * If i2c_msg index search is completed and writing is not in progress, + * we don't need TX_EMPTY interrupt any more. */ - if (dev->msg_write_idx == dev->msgs_num) + if (dev->msg_write_idx == dev->msgs_num && + !(dev->status & STATUS_WRITE_IN_PROGRESS)) intr_mask &= ~DW_IC_INTR_TX_EMPTY; if (dev->msg_err) -- 2.6.2