From: Grygorii Strashko <grygorii.strashko@ti.com> To: Wolfram Sang <wsa@the-dreams.de> Cc: <linux-i2c@vger.kernel.org>, <linux-kernel@vger.kernel.org>, Grygorii Strashko <grygorii.strashko@ti.com>, Sekhar Nori <nsekhar@ti.com>, Kevin Hilman <khilman@deeprootsystems.com>, Santosh Shilimkar <ssantosh@kernel.org>, Murali Karicheri <m-karicheri2@ti.com> Subject: [PATCH 2/5] i2c: davinci: query STP always when NACK is received Date: Thu, 20 Nov 2014 12:03:05 +0200 [thread overview] Message-ID: <1416477788-5544-3-git-send-email-grygorii.strashko@ti.com> (raw) In-Reply-To: <1416477788-5544-1-git-send-email-grygorii.strashko@ti.com> According to I2C specification the NACK should be handled as folowing: "When SDA remains HIGH during this ninth clock pulse, this is defined as the Not Acknowledge signal. The master can then gene rate either a STOP condition to abort the transfer, or a repeated START condition to start a new transfer." [http://www.nxp.com/documents/user_manual/UM10204.pdf] The same is recomened by TI I2C wiki: http://processors.wiki.ti.com/index.php/I2C_Tips Currently, the Davinci I2C driver interrupts I2C trunsfer in case of NACK, but It queries Stop condition DAVINCI_I2C_MDR_REG.STP=1 only if NACK has been received during the last message transmitting/recieving. This may lead to Bus stuck in "Bus Busy" until I2C IP reset (idle/enable) if during SMBus reading transaction the first I2C message is NACKed. Hence, fix it by querying Stop condition (STP) always when NACK is received. This patch fixes Davinci I2C in the same way it was done for OMAP I2C commit cda2109a26eb ("i2c: omap: query STP always when NACK is received"). More info can be found at: https://lkml.org/lkml/2013/7/16/159 http://patchwork.ozlabs.org/patch/249790/ CC: Sekhar Nori <nsekhar@ti.com> CC: Kevin Hilman <khilman@deeprootsystems.com> CC: Santosh Shilimkar <ssantosh@kernel.org> CC: Murali Karicheri <m-karicheri2@ti.com> Reported-by: Hein Tibosch <hein_tibosch@yahoo.es> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> --- drivers/i2c/busses/i2c-davinci.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index 9bbfb8f..2cef115 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c @@ -411,11 +411,9 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop) if (dev->cmd_err & DAVINCI_I2C_STR_NACK) { if (msg->flags & I2C_M_IGNORE_NAK) return msg->len; - if (stop) { - w = davinci_i2c_read_reg(dev, DAVINCI_I2C_MDR_REG); - w |= DAVINCI_I2C_MDR_STP; - davinci_i2c_write_reg(dev, DAVINCI_I2C_MDR_REG, w); - } + w = davinci_i2c_read_reg(dev, DAVINCI_I2C_MDR_REG); + w |= DAVINCI_I2C_MDR_STP; + davinci_i2c_write_reg(dev, DAVINCI_I2C_MDR_REG, w); return -EREMOTEIO; } return -EIO; -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Grygorii Strashko <grygorii.strashko-l0cyMroinI0@public.gmane.org> To: Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Grygorii Strashko <grygorii.strashko-l0cyMroinI0@public.gmane.org>, Sekhar Nori <nsekhar-l0cyMroinI0@public.gmane.org>, Kevin Hilman <khilman-1D3HCaltpLuhEniVeURVKkEOCMrvLtNR@public.gmane.org>, Santosh Shilimkar <ssantosh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Murali Karicheri <m-karicheri2-l0cyMroinI0@public.gmane.org> Subject: [PATCH 2/5] i2c: davinci: query STP always when NACK is received Date: Thu, 20 Nov 2014 12:03:05 +0200 [thread overview] Message-ID: <1416477788-5544-3-git-send-email-grygorii.strashko@ti.com> (raw) In-Reply-To: <1416477788-5544-1-git-send-email-grygorii.strashko-l0cyMroinI0@public.gmane.org> According to I2C specification the NACK should be handled as folowing: "When SDA remains HIGH during this ninth clock pulse, this is defined as the Not Acknowledge signal. The master can then gene rate either a STOP condition to abort the transfer, or a repeated START condition to start a new transfer." [http://www.nxp.com/documents/user_manual/UM10204.pdf] The same is recomened by TI I2C wiki: http://processors.wiki.ti.com/index.php/I2C_Tips Currently, the Davinci I2C driver interrupts I2C trunsfer in case of NACK, but It queries Stop condition DAVINCI_I2C_MDR_REG.STP=1 only if NACK has been received during the last message transmitting/recieving. This may lead to Bus stuck in "Bus Busy" until I2C IP reset (idle/enable) if during SMBus reading transaction the first I2C message is NACKed. Hence, fix it by querying Stop condition (STP) always when NACK is received. This patch fixes Davinci I2C in the same way it was done for OMAP I2C commit cda2109a26eb ("i2c: omap: query STP always when NACK is received"). More info can be found at: https://lkml.org/lkml/2013/7/16/159 http://patchwork.ozlabs.org/patch/249790/ CC: Sekhar Nori <nsekhar-l0cyMroinI0@public.gmane.org> CC: Kevin Hilman <khilman-1D3HCaltpLuhEniVeURVKkEOCMrvLtNR@public.gmane.org> CC: Santosh Shilimkar <ssantosh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> CC: Murali Karicheri <m-karicheri2-l0cyMroinI0@public.gmane.org> Reported-by: Hein Tibosch <hein_tibosch-mRCrAkd8dF0@public.gmane.org> Signed-off-by: Grygorii Strashko <grygorii.strashko-l0cyMroinI0@public.gmane.org> --- drivers/i2c/busses/i2c-davinci.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index 9bbfb8f..2cef115 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c @@ -411,11 +411,9 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop) if (dev->cmd_err & DAVINCI_I2C_STR_NACK) { if (msg->flags & I2C_M_IGNORE_NAK) return msg->len; - if (stop) { - w = davinci_i2c_read_reg(dev, DAVINCI_I2C_MDR_REG); - w |= DAVINCI_I2C_MDR_STP; - davinci_i2c_write_reg(dev, DAVINCI_I2C_MDR_REG, w); - } + w = davinci_i2c_read_reg(dev, DAVINCI_I2C_MDR_REG); + w |= DAVINCI_I2C_MDR_STP; + davinci_i2c_write_reg(dev, DAVINCI_I2C_MDR_REG, w); return -EREMOTEIO; } return -EIO; -- 1.9.1
next prev parent reply other threads:[~2014-11-20 10:03 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-11-20 10:03 [PATCH 0/5] i2c: davinci improvements and fixes Grygorii Strashko 2014-11-20 10:03 ` Grygorii Strashko 2014-11-20 10:03 ` [PATCH 1/5] i2c: i2c-davinci: switch to use platform_get_irq Grygorii Strashko 2014-11-20 10:03 ` Grygorii Strashko 2014-11-20 21:48 ` [1/5] " Uwe Kleine-König 2014-11-21 11:01 ` Grygorii Strashko 2014-11-21 11:01 ` Grygorii Strashko 2014-11-21 14:03 ` Rob Herring 2014-11-21 14:03 ` Rob Herring 2014-11-21 14:59 ` Grygorii Strashko 2014-11-20 10:03 ` Grygorii Strashko [this message] 2014-11-20 10:03 ` [PATCH 2/5] i2c: davinci: query STP always when NACK is received Grygorii Strashko 2014-11-20 22:19 ` [2/5] " Uwe Kleine-König 2014-11-20 22:19 ` Uwe Kleine-König 2014-11-21 12:48 ` Grygorii Strashko 2014-11-21 12:48 ` Grygorii Strashko 2014-11-21 13:10 ` Uwe Kleine-König 2014-11-21 13:10 ` Uwe Kleine-König 2014-11-21 15:33 ` Grygorii Strashko 2014-11-21 15:33 ` Grygorii Strashko 2014-11-23 20:33 ` Uwe Kleine-König 2014-11-23 20:33 ` Uwe Kleine-König 2014-11-24 13:34 ` Grygorii Strashko 2014-11-24 13:34 ` Grygorii Strashko 2014-11-24 20:02 ` Uwe Kleine-König 2014-11-24 20:02 ` Uwe Kleine-König 2014-11-20 10:03 ` [PATCH 3/5] i2c: recovery: change input parameter to i2c_adapter for prepare/unprepare_recovery Grygorii Strashko 2014-11-20 10:03 ` Grygorii Strashko 2014-11-21 18:49 ` [3/5] " Uwe Kleine-König 2014-11-21 18:49 ` Uwe Kleine-König 2014-11-20 10:03 ` [PATCH 4/5] i2c: davinci: use bus recovery infrastructure Grygorii Strashko 2014-11-20 10:03 ` Grygorii Strashko 2014-11-21 19:07 ` [4/5] " Uwe Kleine-König 2014-11-21 19:07 ` Uwe Kleine-König 2014-11-21 19:33 ` Grygorii Strashko 2014-11-21 19:33 ` Grygorii Strashko 2014-11-23 20:36 ` Uwe Kleine-König 2014-11-23 20:36 ` Uwe Kleine-König 2014-11-24 13:26 ` Grygorii Strashko 2014-11-24 13:26 ` Grygorii Strashko 2014-11-24 20:07 ` Uwe Kleine-König 2014-11-24 20:07 ` Uwe Kleine-König 2014-11-20 10:03 ` [PATCH 5/5] i2c: davinci: use ICPFUNC to toggle I2C as gpio for bus recovery Grygorii Strashko 2014-11-20 10:03 ` Grygorii Strashko 2014-11-23 17:04 ` [5/5] " Uwe Kleine-König 2014-11-23 17:04 ` Uwe Kleine-König 2014-11-24 13:15 ` Grygorii Strashko 2014-11-24 13:15 ` Grygorii Strashko 2014-11-24 18:13 ` Mike Looijmans 2014-11-24 18:13 ` Mike Looijmans 2014-11-24 19:22 ` Grygorii Strashko 2014-11-24 19:22 ` Grygorii Strashko 2014-11-24 19:45 ` Uwe Kleine-König 2014-11-24 19:45 ` Uwe Kleine-König 2014-11-25 13:04 ` Grygorii Strashko 2014-11-25 13:04 ` Grygorii Strashko
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=1416477788-5544-3-git-send-email-grygorii.strashko@ti.com \ --to=grygorii.strashko@ti.com \ --cc=khilman@deeprootsystems.com \ --cc=linux-i2c@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=m-karicheri2@ti.com \ --cc=nsekhar@ti.com \ --cc=ssantosh@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.