From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eddie Huang Subject: [PATCH 2/2] i2c: mediatek: Fixup i2c ack error interrupt handling Date: Tue, 4 Aug 2015 19:44:53 +0800 Message-ID: <1438688693-60275-3-git-send-email-eddie.huang@mediatek.com> References: <1438688693-60275-1-git-send-email-eddie.huang@mediatek.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <1438688693-60275-1-git-send-email-eddie.huang@mediatek.com> Sender: linux-kernel-owner@vger.kernel.org To: Wolfram Sang Cc: srv_heupstream@mediatek.com, Matthias Brugger , Liguo Zhang , Xudong Chen , Sascha Hauer , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Eddie Huang List-Id: linux-i2c@vger.kernel.org When occur i2c ack error, mtk_i2c_irq is called twice, first is the ack error interrupt, then the complete interrupt. i2c interrupt handler should keep the two interrupt value, and only call complete() for the complete interrupt. Signed-off-by: Liguo Zhang Signed-off-by: Eddie Huang --- drivers/i2c/busses/i2c-mt65xx.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c index 055159d..12ce7f8 100644 --- a/drivers/i2c/busses/i2c-mt65xx.c +++ b/drivers/i2c/busses/i2c-mt65xx.c @@ -558,16 +558,20 @@ err_exit: static irqreturn_t mtk_i2c_irq(int irqno, void *dev_id) { struct mtk_i2c *i2c = dev_id; - u16 restart_flag = 0; + u16 intr_stat = 0; - if (i2c->dev_comp->auto_restart) - restart_flag = I2C_RS_TRANSFER; + intr_stat = readw(i2c->base + OFFSET_INTR_STAT); + writew(intr_stat, i2c->base + OFFSET_INTR_STAT); - i2c->irq_stat = readw(i2c->base + OFFSET_INTR_STAT); - writew(restart_flag | I2C_HS_NACKERR | I2C_ACKERR - | I2C_TRANSAC_COMP, i2c->base + OFFSET_INTR_STAT); + /* + * when occurs i2c ack error, mtk_i2c_irq is called twice, + * first is the ack error interrupt, then the complete interrupt, + * i2c->irq_stat need keep the two interrupt value. + */ + i2c->irq_stat |= intr_stat; - complete(&i2c->msg_complete); + if (i2c->irq_stat & I2C_TRANSAC_COMP) + complete(&i2c->msg_complete); return IRQ_HANDLED; } -- 1.7.9.5