From: Jan Glauber <jan.glauber@caviumnetworks.com>
To: Paul Burton <paul.burton@imgtec.com>
Cc: linux-i2c@vger.kernel.org, linux-mips@linux-mips.org,
David Daney <david.daney@cavium.com>,
Wolfram Sang <wsa@the-dreams.de>,
stable@vger.kernel.org
Subject: Re: [PATCH 1/2] i2c: octeon: Fix register access
Date: Tue, 8 Nov 2016 08:13:37 +0100 [thread overview]
Message-ID: <20161108071337.GA4601@hardcore> (raw)
In-Reply-To: <20161107200921.30284-1-paul.burton@imgtec.com>
On Mon, Nov 07, 2016 at 08:09:20PM +0000, Paul Burton wrote:
> 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 <paul.burton@imgtec.com>
> Cc: Jan Glauber <jglauber@cavium.com>
> Cc: David Daney <david.daney@cavium.com>
> Cc: Wolfram Sang <wsa@the-dreams.de>
> Cc: linux-i2c@vger.kernel.org
>
> ---
Acked-by: Jan Glauber <jglauber@cavium.com>
Thanks for spotting this. I think this should go into stable too for
4.8, so adding Cc: stable@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
next prev parent reply other threads:[~2016-11-08 7:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-07 20:09 [PATCH 1/2] i2c: octeon: Fix register access Paul Burton
2016-11-07 20:09 ` [PATCH 2/2] i2c: octeon: Fix waiting for operation completion Paul Burton
2016-11-08 9:20 ` Jan Glauber
2016-11-09 13:41 ` Jan Glauber
2016-11-09 14:07 ` Paul Burton
2016-11-09 14:38 ` Jan Glauber
2016-11-11 8:57 ` Jan Glauber
2016-11-11 20:51 ` Steven J. Hill
2016-11-11 22:11 ` David Daney
2016-11-08 7:13 ` Jan Glauber [this message]
2016-11-09 14:09 ` [PATCH 1/2] i2c: octeon: Fix register access Paul Burton
2016-11-09 14:43 ` Jan Glauber
2016-11-10 20:17 ` Wolfram Sang
2016-11-11 7:00 ` Jan Glauber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161108071337.GA4601@hardcore \
--to=jan.glauber@caviumnetworks.com \
--cc=david.daney@cavium.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=paul.burton@imgtec.com \
--cc=stable@vger.kernel.org \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).