From: Shubhrajyoti D <shubhrajyoti@ti.com> To: linux-omap@vger.kernel.org Cc: linux-i2c@vger.kernel.org, linux-arm-kernel@lists.infradead.org, ben-linux@fluff.org, tony@atomide.com, w.sang@pengutronix.de, Felipe Balbi <balbi@ti.com>, Shubhrajyoti D <shubhrajyoti@ti.com> Subject: [PATCHv3 07/17] i2c: omap: improve i462 errata handling Date: Fri, 29 Jun 2012 15:43:27 +0530 [thread overview] Message-ID: <1340964817-8599-8-git-send-email-shubhrajyoti@ti.com> (raw) In-Reply-To: <1340964817-8599-1-git-send-email-shubhrajyoti@ti.com> From: Felipe Balbi <balbi@ti.com> Make it not depend on ISR's local variables in order to make it easier to re-factor the transmit data loop. Also since we are waiting for XUDF just before writing data lets not flag the underflow. This is anyways going to go once we write the data. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> --- drivers/i2c/busses/i2c-omap.c | 43 ++++++++++++++++++++++++++++------------ 1 files changed, 30 insertions(+), 13 deletions(-) diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 45bd731..870452d 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -744,27 +744,30 @@ omap_i2c_omap1_isr(int this_irq, void *dev_id) * data to DATA_REG. Otherwise some data bytes can be lost while transferring * them from the memory to the I2C interface. */ -static int errata_omap3_i462(struct omap_i2c_dev *dev, u16 *stat, int *err) +static int errata_omap3_i462(struct omap_i2c_dev *dev) { unsigned long timeout = 10000; + u16 stat; - while (--timeout && !(*stat & OMAP_I2C_STAT_XUDF)) { - if (*stat & (OMAP_I2C_STAT_NACK | OMAP_I2C_STAT_AL)) { + do { + stat = omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG); + if (stat & OMAP_I2C_STAT_XUDF) + break; + + if (stat & (OMAP_I2C_STAT_NACK | OMAP_I2C_STAT_AL)) { omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR)); - return -ETIMEDOUT; + return -EIO; } cpu_relax(); - *stat = omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG); - } + } while (--timeout); if (!timeout) { dev_err(dev->dev, "timeout waiting on XUDF bit\n"); return 0; } - *err |= OMAP_I2C_STAT_XUDF; return 0; } @@ -926,9 +929,16 @@ complete: } } - if ((dev->errata & I2C_OMAP_ERRATA_I462) && - errata_omap3_i462(dev, &stat, &err)) - goto complete; + if (dev->errata & I2C_OMAP_ERRATA_I462) { + int ret; + + ret = errata_omap3_i462(dev); + stat = omap_i2c_read_reg(dev, + OMAP_I2C_STAT_REG); + + if (ret < 0) + goto complete; + } omap_i2c_write_reg(dev, OMAP_I2C_DATA_REG, w); } @@ -966,9 +976,16 @@ complete: } } - if ((dev->errata & I2C_OMAP_ERRATA_I462) && - errata_omap3_i462(dev, &stat, &err)) - goto complete; + if (dev->errata & I2C_OMAP_ERRATA_I462) { + int ret; + + ret = errata_omap3_i462(dev); + stat = omap_i2c_read_reg(dev, + OMAP_I2C_STAT_REG); + + if (ret < 0) + goto complete; + } omap_i2c_write_reg(dev, OMAP_I2C_DATA_REG, w); } -- 1.7.5.4
WARNING: multiple messages have this Message-ID (diff)
From: shubhrajyoti@ti.com (Shubhrajyoti D) To: linux-arm-kernel@lists.infradead.org Subject: [PATCHv3 07/17] i2c: omap: improve i462 errata handling Date: Fri, 29 Jun 2012 15:43:27 +0530 [thread overview] Message-ID: <1340964817-8599-8-git-send-email-shubhrajyoti@ti.com> (raw) In-Reply-To: <1340964817-8599-1-git-send-email-shubhrajyoti@ti.com> From: Felipe Balbi <balbi@ti.com> Make it not depend on ISR's local variables in order to make it easier to re-factor the transmit data loop. Also since we are waiting for XUDF just before writing data lets not flag the underflow. This is anyways going to go once we write the data. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> --- drivers/i2c/busses/i2c-omap.c | 43 ++++++++++++++++++++++++++++------------ 1 files changed, 30 insertions(+), 13 deletions(-) diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 45bd731..870452d 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -744,27 +744,30 @@ omap_i2c_omap1_isr(int this_irq, void *dev_id) * data to DATA_REG. Otherwise some data bytes can be lost while transferring * them from the memory to the I2C interface. */ -static int errata_omap3_i462(struct omap_i2c_dev *dev, u16 *stat, int *err) +static int errata_omap3_i462(struct omap_i2c_dev *dev) { unsigned long timeout = 10000; + u16 stat; - while (--timeout && !(*stat & OMAP_I2C_STAT_XUDF)) { - if (*stat & (OMAP_I2C_STAT_NACK | OMAP_I2C_STAT_AL)) { + do { + stat = omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG); + if (stat & OMAP_I2C_STAT_XUDF) + break; + + if (stat & (OMAP_I2C_STAT_NACK | OMAP_I2C_STAT_AL)) { omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR)); - return -ETIMEDOUT; + return -EIO; } cpu_relax(); - *stat = omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG); - } + } while (--timeout); if (!timeout) { dev_err(dev->dev, "timeout waiting on XUDF bit\n"); return 0; } - *err |= OMAP_I2C_STAT_XUDF; return 0; } @@ -926,9 +929,16 @@ complete: } } - if ((dev->errata & I2C_OMAP_ERRATA_I462) && - errata_omap3_i462(dev, &stat, &err)) - goto complete; + if (dev->errata & I2C_OMAP_ERRATA_I462) { + int ret; + + ret = errata_omap3_i462(dev); + stat = omap_i2c_read_reg(dev, + OMAP_I2C_STAT_REG); + + if (ret < 0) + goto complete; + } omap_i2c_write_reg(dev, OMAP_I2C_DATA_REG, w); } @@ -966,9 +976,16 @@ complete: } } - if ((dev->errata & I2C_OMAP_ERRATA_I462) && - errata_omap3_i462(dev, &stat, &err)) - goto complete; + if (dev->errata & I2C_OMAP_ERRATA_I462) { + int ret; + + ret = errata_omap3_i462(dev); + stat = omap_i2c_read_reg(dev, + OMAP_I2C_STAT_REG); + + if (ret < 0) + goto complete; + } omap_i2c_write_reg(dev, OMAP_I2C_DATA_REG, w); } -- 1.7.5.4
next prev parent reply other threads:[~2012-06-29 10:13 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-06-29 10:13 [PATCHv3 00/17] I2C Big cleanup Shubhrajyoti D 2012-06-29 10:13 ` Shubhrajyoti D 2012-06-29 10:13 ` [PATCHv3 02/17] i2c: omap: simplify num_bytes handling Shubhrajyoti D 2012-06-29 10:13 ` Shubhrajyoti D 2012-06-29 10:13 ` [PATCHv3 03/17] i2c: omap: decrease indentation level on data handling Shubhrajyoti D 2012-06-29 10:13 ` Shubhrajyoti D 2012-06-29 10:13 ` [PATCHv3 04/17] i2c: omap: add blank lines Shubhrajyoti D 2012-06-29 10:13 ` Shubhrajyoti D 2012-06-29 10:13 ` [PATCHv3 06/17] i2c: omap: split out [XR]DR and [XR]RDY Shubhrajyoti D 2012-06-29 10:13 ` Shubhrajyoti D [not found] ` <1340964817-8599-7-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org> 2012-07-02 11:56 ` Felipe Balbi 2012-07-02 11:56 ` Felipe Balbi [not found] ` <20120702115620.GD2730-S8G//mZuvNWo5Im9Ml3/Zg@public.gmane.org> 2012-07-02 12:00 ` Shubhrajyoti Datta 2012-07-02 12:00 ` Shubhrajyoti Datta 2012-06-29 10:13 ` Shubhrajyoti D [this message] 2012-06-29 10:13 ` [PATCHv3 07/17] i2c: omap: improve i462 errata handling Shubhrajyoti D 2012-06-29 10:13 ` [PATCHv3 11/17] i2c: omap: switch to platform_get_irq() Shubhrajyoti D 2012-06-29 10:13 ` Shubhrajyoti D [not found] ` <1340964817-8599-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org> 2012-06-29 10:13 ` [PATCHv3 01/17] i2c: omap: switch to devm_* API Shubhrajyoti D 2012-06-29 10:13 ` Shubhrajyoti D 2012-06-29 10:13 ` [PATCHv3 05/17] i2c: omap: simplify omap_i2c_ack_stat() Shubhrajyoti D 2012-06-29 10:13 ` Shubhrajyoti D 2012-06-29 10:13 ` [PATCHv3 08/17] i2c: omap: re-factor receive/transmit data loop Shubhrajyoti D 2012-06-29 10:13 ` Shubhrajyoti D 2012-06-29 10:13 ` [PATCHv3 09/17] i2c: omap: switch over to do {} while loop Shubhrajyoti D 2012-06-29 10:13 ` Shubhrajyoti D 2012-06-29 10:13 ` [PATCHv3 10/17] i2c: omap: ack IRQ in parts Shubhrajyoti D 2012-06-29 10:13 ` Shubhrajyoti D 2012-06-29 10:13 ` [PATCHv3 12/17] i2c: omap: bus: add a receiver flag Shubhrajyoti D 2012-06-29 10:13 ` Shubhrajyoti D 2012-06-29 10:13 ` [PATCHv3 13/17] i2c: omap: simplify errata check Shubhrajyoti D 2012-06-29 10:13 ` Shubhrajyoti D 2012-06-29 10:13 ` [PATCHv3 14/17] i2c: omap: always return IRQ_HANDLED Shubhrajyoti D 2012-06-29 10:13 ` Shubhrajyoti D 2012-06-29 10:13 ` [PATCHv3 17/17] i2c: omap: get rid of the "complete" label Shubhrajyoti D 2012-06-29 10:13 ` Shubhrajyoti D [not found] ` <1340964817-8599-18-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org> 2012-07-02 11:59 ` Felipe Balbi 2012-07-02 11:59 ` Felipe Balbi 2012-06-29 10:13 ` [PATCHv3 15/17] i2c: omap: simplify IRQ exit path Shubhrajyoti D 2012-06-29 10:13 ` Shubhrajyoti D 2012-06-29 10:13 ` [PATCHv3 16/17] i2c: omap: resize fifos before each message Shubhrajyoti D 2012-06-29 10:13 ` Shubhrajyoti D
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=1340964817-8599-8-git-send-email-shubhrajyoti@ti.com \ --to=shubhrajyoti@ti.com \ --cc=balbi@ti.com \ --cc=ben-linux@fluff.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-i2c@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=tony@atomide.com \ --cc=w.sang@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: 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.