From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Burton Subject: [PATCH 1/2] i2c: octeon: Fix register access Date: Mon, 7 Nov 2016 20:09:20 +0000 Message-ID: <20161107200921.30284-1-paul.burton@imgtec.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from mailapp01.imgtec.com ([195.59.15.196]:62981 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752008AbcKGUJm (ORCPT ); Mon, 7 Nov 2016 15:09:42 -0500 Sender: linux-i2c-owner@vger.kernel.org List-Id: linux-i2c@vger.kernel.org To: linux-i2c@vger.kernel.org Cc: linux-mips@linux-mips.org, Paul Burton , Jan Glauber , David Daney , Wolfram Sang Commit 70121f7f3725 ("i2c: octeon: thunderx: Limit register access retries") attempted to replace potentially infinite loops with ones which will time out using readq_poll_timeout, but in doing so it inverted the condition for exiting this loop. Tested on a Rhino Labs UTM-8 with Octeon CN7130. Signed-off-by: Paul Burton Cc: Jan Glauber Cc: David Daney Cc: Wolfram Sang Cc: linux-i2c@vger.kernel.org --- drivers/i2c/busses/i2c-octeon-core.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-octeon-core.h b/drivers/i2c/busses/i2c-octeon-core.h index 1db7c83..d980406 100644 --- a/drivers/i2c/busses/i2c-octeon-core.h +++ b/drivers/i2c/busses/i2c-octeon-core.h @@ -146,8 +146,9 @@ static inline void octeon_i2c_reg_write(struct octeon_i2c *i2c, u64 eop_reg, u8 __raw_writeq(SW_TWSI_V | eop_reg | data, i2c->twsi_base + SW_TWSI(i2c)); - readq_poll_timeout(i2c->twsi_base + SW_TWSI(i2c), tmp, tmp & SW_TWSI_V, - I2C_OCTEON_EVENT_WAIT, i2c->adap.timeout); + readq_poll_timeout(i2c->twsi_base + SW_TWSI(i2c), tmp, + !(tmp & SW_TWSI_V), I2C_OCTEON_EVENT_WAIT, + i2c->adap.timeout); } #define octeon_i2c_ctl_write(i2c, val) \ @@ -173,7 +174,7 @@ static inline int octeon_i2c_reg_read(struct octeon_i2c *i2c, u64 eop_reg, __raw_writeq(SW_TWSI_V | eop_reg | SW_TWSI_R, i2c->twsi_base + SW_TWSI(i2c)); ret = readq_poll_timeout(i2c->twsi_base + SW_TWSI(i2c), tmp, - tmp & SW_TWSI_V, I2C_OCTEON_EVENT_WAIT, + !(tmp & SW_TWSI_V), I2C_OCTEON_EVENT_WAIT, i2c->adap.timeout); if (error) *error = ret; -- 2.10.2