LKML Archive on lore.kernel.org
 help / color / Atom feed
From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Esben Haabendal <esben.haabendal@gmail.com>
Cc: linux-i2c@vger.kernel.org,
	Wolfram Sang <wsa+renesas@sang-engineering.com>,
	Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Yuan Yao <yao.yuan@freescale.com>, Esben Haabendal <eha@deif.com>,
	Philipp Zabel <p.zabel@pengutronix.de>,
	Phil Reid <preid@electromag.com.au>,
	Lucas Stach <l.stach@pengutronix.de>,
	Clemens Gruber <clemens.gruber@pqgruber.com>,
	Peter Rosin <peda@axentia.se>,
	Fabio Estevam <fabio.estevam@nxp.com>,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 3/4] i2c: imx: Simplify stopped state tracking
Date: Tue, 24 Jul 2018 09:59:19 +0200
Message-ID: <20180724075919.iyysd7dtbddvbavq@pengutronix.de> (raw)
In-Reply-To: <20180709094304.8814-4-esben.haabendal@gmail.com>

On Mon, Jul 09, 2018 at 11:43:03AM +0200, Esben Haabendal wrote:
> From: Esben Haabendal <eha@deif.com>
> 
> Always update the stopped state when busy status have been checked.
> This is identical to what was done before, with the exception of error
> handling.
> Without this change, some errors cause the stopped state to be left in
> incorrect state in i2c_imx_stop(), i2c_imx_dma_read(), i2c_imx_read() and
> i2c_imx_xfer().
> 
> Signed-off-by: Esben Haabendal <eha@deif.com>
> ---
>  drivers/i2c/busses/i2c-imx.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
> index d86f152176a4..1db8e6790afc 100644
> --- a/drivers/i2c/busses/i2c-imx.c
> +++ b/drivers/i2c/busses/i2c-imx.c
> @@ -421,10 +421,14 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy)
>  			return -EAGAIN;
>  		}
>  
> -		if (for_busy && (temp & I2SR_IBB))
> +		if (for_busy && (temp & I2SR_IBB)) {
> +			i2c_imx->stopped = 0;
>  			break;
> -		if (!for_busy && !(temp & I2SR_IBB))
> +		}
> +		if (!for_busy && !(temp & I2SR_IBB)) {
> +			i2c_imx->stopped = 1;
>  			break;
> +		}

Would it make sense to assign to ->stopped independent of for_busy?

>  		if (time_after(jiffies, orig_jiffies + msecs_to_jiffies(500))) {
>  			dev_dbg(&i2c_imx->adapter.dev,
>  				"<%s> I2C bus is busy\n", __func__);
> @@ -538,7 +542,6 @@ static int i2c_imx_start(struct imx_i2c_struct *i2c_imx)
>  	result = i2c_imx_bus_busy(i2c_imx, 1);
>  	if (result)
>  		return result;
> -	i2c_imx->stopped = 0;
>  
>  	temp |= I2CR_IIEN | I2CR_MTX | I2CR_TXAK;
>  	temp &= ~I2CR_DMAEN;
> @@ -569,7 +572,6 @@ static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx)
>  
>  	if (!i2c_imx->stopped) {
>  		i2c_imx_bus_busy(i2c_imx, 0);
> -		i2c_imx->stopped = 1;
>  	}

The braces can go away here.
>  
>  	/* Disable I2C controller */

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

  reply index

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20180709094304.8814-1-esben.haabendal@gmail.com>
2018-07-09  9:43 ` [PATCH v2 1/4] i2c: imx: Fix reinit_completion() use Esben Haabendal
2018-07-23 18:08   ` Wolfram Sang
2018-07-09  9:43 ` [PATCH v2 2/4] i2c: imx: Fix race condition in dma read Esben Haabendal
2018-07-24  7:57   ` Uwe Kleine-König
2018-08-09 11:57     ` Esben Haabendal
2018-07-09  9:43 ` [PATCH v2 3/4] i2c: imx: Simplify stopped state tracking Esben Haabendal
2018-07-24  7:59   ` Uwe Kleine-König [this message]
2018-08-09 12:06     ` Esben Haabendal
2018-08-09 16:26       ` Uwe Kleine-König
2018-08-10  9:25         ` Esben Haabendal
2018-08-10 12:25           ` Uwe Kleine-König
2018-07-09  9:43 ` [PATCH v2 4/4] arm: dts: ls1021a: Enable I2C DMA support Esben Haabendal
2018-07-24  8:02   ` Uwe Kleine-König

Reply instructions:

You may reply publically 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=20180724075919.iyysd7dtbddvbavq@pengutronix.de \
    --to=u.kleine-koenig@pengutronix.de \
    --cc=clemens.gruber@pqgruber.com \
    --cc=eha@deif.com \
    --cc=esben.haabendal@gmail.com \
    --cc=fabio.estevam@nxp.com \
    --cc=l.stach@pengutronix.de \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=p.zabel@pengutronix.de \
    --cc=peda@axentia.se \
    --cc=preid@electromag.com.au \
    --cc=robh+dt@kernel.org \
    --cc=wsa+renesas@sang-engineering.com \
    --cc=yao.yuan@freescale.com \
    /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

LKML Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git
	git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git
	git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git
	git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git
	git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git
	git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git
	git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git
	git clone --mirror https://lore.kernel.org/lkml/7 lkml/git/7.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 lkml lkml/ https://lore.kernel.org/lkml \
		linux-kernel@vger.kernel.org linux-kernel@archiver.kernel.org
	public-inbox-index lkml


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kernel


AGPL code for this site: git clone https://public-inbox.org/ public-inbox