From: Oleksij Rempel <o.rempel@pengutronix.de>
To: Christian Eggers <ceggers@arri.de>
Cc: "Oleksij Rempel" <linux@rempel-privat.de>,
"Shawn Guo" <shawnguo@kernel.org>,
"Sascha Hauer" <s.hauer@pengutronix.de>,
"Fabio Estevam" <festevam@gmail.com>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"David Laight" <David.Laight@ACULAB.COM>,
linux-kernel@vger.kernel.org,
"Krzysztof Kozlowski" <krzk@kernel.org>,
"NXP Linux Team" <linux-imx@nxp.com>,
"Pengutronix Kernel Team" <kernel@pengutronix.de>,
stable@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-i2c@vger.kernel.org
Subject: Re: [PATCH v5 1/3] i2c: imx: Fix reset of I2SR_IAL flag
Date: Fri, 9 Oct 2020 09:52:28 +0200 [thread overview]
Message-ID: <20201009075228.GB817@pengutronix.de> (raw)
In-Reply-To: <20201009071132.GA817@pengutronix.de>
On Fri, Oct 09, 2020 at 09:11:32AM +0200, Oleksij Rempel wrote:
> Hi Christian,
>
> On Wed, Oct 07, 2020 at 10:45:22AM +0200, Christian Eggers wrote:
> > According to the "VFxxx Controller Reference Manual" (and the comment
> > block starting at line 97), Vybrid requires writing a one for clearing
> > an interrupt flag. Syncing the method for clearing I2SR_IIF in
> > i2c_imx_isr().
> >
> > Signed-off-by: Christian Eggers <ceggers@arri.de>
> > Fixes: 4b775022f6fd ("i2c: imx: add struct to hold more configurable quirks")
> > Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> > Cc: stable@vger.kernel.org
> > ---
> > drivers/i2c/busses/i2c-imx.c | 20 +++++++++++++++-----
> > 1 file changed, 15 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
> > index 0ab5381aa012..cbdcab73a055 100644
> > --- a/drivers/i2c/busses/i2c-imx.c
> > +++ b/drivers/i2c/busses/i2c-imx.c
> > @@ -412,6 +412,19 @@ static void i2c_imx_dma_free(struct imx_i2c_struct *i2c_imx)
> > dma->chan_using = NULL;
> > }
> >
> > +static void i2c_imx_clear_irq(struct imx_i2c_struct *i2c_imx, unsigned int bits)
> > +{
> > + unsigned int temp;
> > +
> > + /*
> > + * i2sr_clr_opcode is the value to clear all interrupts. Here we want to
> > + * clear only <bits>, so we write ~i2sr_clr_opcode with just <bits>
> > + * toggled. This is required because i.MX needs W1C and Vybrid uses W0C.
> > + */
>
> This comment need correction. The i.MX needs W0C and Vybrid uses W1C
>
> > + temp = ~i2c_imx->hwdata->i2sr_clr_opcode ^ bits;
> > + imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2SR);
> > +}
> > +
> > static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy, bool atomic)
> > {
> > unsigned long orig_jiffies = jiffies;
> > @@ -424,8 +437,7 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy, bool a
> >
> > /* check for arbitration lost */
> > if (temp & I2SR_IAL) {
> > - temp &= ~I2SR_IAL;
> > - imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2SR);
> > + i2c_imx_clear_irq(i2c_imx, I2SR_IAL);
> > return -EAGAIN;
> > }
> >
> > @@ -623,9 +635,7 @@ static irqreturn_t i2c_imx_isr(int irq, void *dev_id)
> > if (temp & I2SR_IIF) {
> > /* save status register */
> > i2c_imx->i2csr = temp;
> > - temp &= ~I2SR_IIF;
> > - temp |= (i2c_imx->hwdata->i2sr_clr_opcode & I2SR_IIF);
> > - imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2SR);
> > + i2c_imx_clear_irq(i2c_imx, I2SR_IIF);
> > wake_up(&i2c_imx->queue);
> > return IRQ_HANDLED;
> > }
> > --
>
> Otherwise
>
> Acked-by: Oleksij Rempel <o.rempel@pengutronix.de>
By reviewing the second patch we found at least one more missing Vybrid
related case in the i2c_imx_trx_complete() function:
imx_i2c_write_reg(0, i2c_imx, IMX_I2C_I2SR);
this is OK for iMX by broken on Vybrid.
Since you already fixing it in this patch for some of IMX_I2C_I2SR
writes, please do it here as well. This is the last unhandled case...:)
Regards,
Oleksij
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
next prev parent reply other threads:[~2020-10-09 7:52 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-07 8:45 [PATCH v5 0/3] i2c: imx: Fix handling of arbitration loss Christian Eggers
2020-10-07 8:45 ` [PATCH v5 1/3] i2c: imx: Fix reset of I2SR_IAL flag Christian Eggers
2020-10-08 9:56 ` Wolfram Sang
2020-10-09 7:11 ` Oleksij Rempel
2020-10-09 7:52 ` Oleksij Rempel [this message]
2020-10-07 8:45 ` [PATCH v5 2/3] i2c: imx: Check for I2SR_IAL after every byte Christian Eggers
2020-10-09 7:53 ` Oleksij Rempel
2020-10-07 8:45 ` [PATCH v5 3/3] i2c: imx: Don't generate STOP condition if arbitration has been lost Christian Eggers
2020-10-09 8:14 ` Oleksij Rempel
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=20201009075228.GB817@pengutronix.de \
--to=o.rempel@pengutronix.de \
--cc=David.Laight@ACULAB.COM \
--cc=ceggers@arri.de \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rempel-privat.de \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=stable@vger.kernel.org \
--cc=u.kleine-koenig@pengutronix.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).