From: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org> To: linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org, tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org, w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org, Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>, Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org> Subject: [PATCHv6 06/24] i2c: omap: split out [XR]DR and [XR]RDY Date: Tue, 14 Aug 2012 19:48:48 +0530 [thread overview] Message-ID: <1344953946-13005-7-git-send-email-shubhrajyoti@ti.com> (raw) In-Reply-To: <1344953946-13005-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org> From: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org> While they do pretty much the same thing, there are a few peculiarities. Specially WRT erratas, it's best to split those out and re-factor the read/write loop to another function which both cases call. This last part will be done on another patch. While at that, also avoid an unncessary register read since dev->fifo_len will always contain the correct amount of data to be transferred. Signed-off-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org> Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org> --- drivers/i2c/busses/i2c-omap.c | 126 ++++++++++++++++++++++++++++++----------- 1 files changed, 92 insertions(+), 34 deletions(-) diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 8009095..139602f 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -801,36 +801,62 @@ complete: return IRQ_HANDLED; } - if (stat & (OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR)) { + if (stat & OMAP_I2C_STAT_RDR) { u8 num_bytes = 1; + if (dev->fifo_size) + num_bytes = dev->buf_len; + + while (num_bytes--) { + if (!dev->buf_len) { + dev_err(dev->dev, + "RDR IRQ while no data" + " requested\n"); + break; + } + + w = omap_i2c_read_reg(dev, OMAP_I2C_DATA_REG); + *dev->buf++ = w; + dev->buf_len--; + + /* + * Data reg in 2430, omap3 and + * omap4 is 8 bit wide + */ + if (dev->flags & + OMAP_I2C_FLAG_16BIT_DATA_REG) { + if (dev->buf_len) { + *dev->buf++ = w >> 8; + dev->buf_len--; + } + } + } + if (dev->errata & I2C_OMAP_ERRATA_I207) i2c_omap_errata_i207(dev, stat); - if (dev->fifo_size) { - if (stat & OMAP_I2C_STAT_RRDY) - num_bytes = dev->fifo_size; - else /* read RXSTAT on RDR interrupt */ - num_bytes = (omap_i2c_read_reg(dev, - OMAP_I2C_BUFSTAT_REG) - >> 8) & 0x3F; - } + omap_i2c_ack_stat(dev, OMAP_I2C_STAT_RDR); + continue; + } + + if (stat & OMAP_I2C_STAT_RRDY) { + u8 num_bytes = 1; + + if (dev->fifo_size) + num_bytes = dev->fifo_size; + while (num_bytes--) { if (!dev->buf_len) { - if (stat & OMAP_I2C_STAT_RRDY) - dev_err(dev->dev, + dev_err(dev->dev, "RRDY IRQ while no data" - " requested\n"); - if (stat & OMAP_I2C_STAT_RDR) - dev_err(dev->dev, - "RDR IRQ while no data" - " requested\n"); + " requested\n"); break; } w = omap_i2c_read_reg(dev, OMAP_I2C_DATA_REG); *dev->buf++ = w; dev->buf_len--; + /* * Data reg in 2430, omap3 and * omap4 is 8 bit wide @@ -843,36 +869,68 @@ complete: } } } - omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_RRDY | - OMAP_I2C_STAT_RDR)); + + omap_i2c_ack_stat(dev, OMAP_I2C_STAT_RRDY); continue; } - if (stat & (OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR)) { + if (stat & OMAP_I2C_STAT_XDR) { u8 num_bytes = 1; - if (dev->fifo_size) { - if (stat & OMAP_I2C_STAT_XRDY) - num_bytes = dev->fifo_size; - else /* read TXSTAT on XDR interrupt */ - num_bytes = omap_i2c_read_reg(dev, - OMAP_I2C_BUFSTAT_REG) - & 0x3F; + + if (dev->fifo_size) + num_bytes = dev->buf_len; + + while (num_bytes--) { + if (!dev->buf_len) { + dev_err(dev->dev, + "XDR IRQ while no " + "data to send\n"); + break; + } + + w = *dev->buf++; + dev->buf_len--; + + /* + * Data reg in 2430, omap3 and + * omap4 is 8 bit wide + */ + if (dev->flags & + OMAP_I2C_FLAG_16BIT_DATA_REG) { + if (dev->buf_len) { + w |= *dev->buf++ << 8; + dev->buf_len--; + } + } + + if ((dev->errata & I2C_OMAP_ERRATA_I462) && + errata_omap3_i462(dev, &stat, &err)) + goto complete; + + omap_i2c_write_reg(dev, OMAP_I2C_DATA_REG, w); } + + omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XDR); + continue; + } + + if (stat & OMAP_I2C_STAT_XRDY) { + u8 num_bytes = 1; + + if (dev->fifo_size) + num_bytes = dev->fifo_size; + while (num_bytes--) { if (!dev->buf_len) { - if (stat & OMAP_I2C_STAT_XRDY) - dev_err(dev->dev, + dev_err(dev->dev, "XRDY IRQ while no " "data to send\n"); - if (stat & OMAP_I2C_STAT_XDR) - dev_err(dev->dev, - "XDR IRQ while no " - "data to send\n"); break; } w = *dev->buf++; dev->buf_len--; + /* * Data reg in 2430, omap3 and * omap4 is 8 bit wide @@ -891,8 +949,8 @@ complete: omap_i2c_write_reg(dev, OMAP_I2C_DATA_REG, w); } - omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_XRDY | - OMAP_I2C_STAT_XDR)); + + omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XRDY); continue; } -- 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: [PATCHv6 06/24] i2c: omap: split out [XR]DR and [XR]RDY Date: Tue, 14 Aug 2012 19:48:48 +0530 [thread overview] Message-ID: <1344953946-13005-7-git-send-email-shubhrajyoti@ti.com> (raw) In-Reply-To: <1344953946-13005-1-git-send-email-shubhrajyoti@ti.com> From: Felipe Balbi <balbi@ti.com> While they do pretty much the same thing, there are a few peculiarities. Specially WRT erratas, it's best to split those out and re-factor the read/write loop to another function which both cases call. This last part will be done on another patch. While at that, also avoid an unncessary register read since dev->fifo_len will always contain the correct amount of data to be transferred. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> --- drivers/i2c/busses/i2c-omap.c | 126 ++++++++++++++++++++++++++++++----------- 1 files changed, 92 insertions(+), 34 deletions(-) diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 8009095..139602f 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -801,36 +801,62 @@ complete: return IRQ_HANDLED; } - if (stat & (OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR)) { + if (stat & OMAP_I2C_STAT_RDR) { u8 num_bytes = 1; + if (dev->fifo_size) + num_bytes = dev->buf_len; + + while (num_bytes--) { + if (!dev->buf_len) { + dev_err(dev->dev, + "RDR IRQ while no data" + " requested\n"); + break; + } + + w = omap_i2c_read_reg(dev, OMAP_I2C_DATA_REG); + *dev->buf++ = w; + dev->buf_len--; + + /* + * Data reg in 2430, omap3 and + * omap4 is 8 bit wide + */ + if (dev->flags & + OMAP_I2C_FLAG_16BIT_DATA_REG) { + if (dev->buf_len) { + *dev->buf++ = w >> 8; + dev->buf_len--; + } + } + } + if (dev->errata & I2C_OMAP_ERRATA_I207) i2c_omap_errata_i207(dev, stat); - if (dev->fifo_size) { - if (stat & OMAP_I2C_STAT_RRDY) - num_bytes = dev->fifo_size; - else /* read RXSTAT on RDR interrupt */ - num_bytes = (omap_i2c_read_reg(dev, - OMAP_I2C_BUFSTAT_REG) - >> 8) & 0x3F; - } + omap_i2c_ack_stat(dev, OMAP_I2C_STAT_RDR); + continue; + } + + if (stat & OMAP_I2C_STAT_RRDY) { + u8 num_bytes = 1; + + if (dev->fifo_size) + num_bytes = dev->fifo_size; + while (num_bytes--) { if (!dev->buf_len) { - if (stat & OMAP_I2C_STAT_RRDY) - dev_err(dev->dev, + dev_err(dev->dev, "RRDY IRQ while no data" - " requested\n"); - if (stat & OMAP_I2C_STAT_RDR) - dev_err(dev->dev, - "RDR IRQ while no data" - " requested\n"); + " requested\n"); break; } w = omap_i2c_read_reg(dev, OMAP_I2C_DATA_REG); *dev->buf++ = w; dev->buf_len--; + /* * Data reg in 2430, omap3 and * omap4 is 8 bit wide @@ -843,36 +869,68 @@ complete: } } } - omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_RRDY | - OMAP_I2C_STAT_RDR)); + + omap_i2c_ack_stat(dev, OMAP_I2C_STAT_RRDY); continue; } - if (stat & (OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR)) { + if (stat & OMAP_I2C_STAT_XDR) { u8 num_bytes = 1; - if (dev->fifo_size) { - if (stat & OMAP_I2C_STAT_XRDY) - num_bytes = dev->fifo_size; - else /* read TXSTAT on XDR interrupt */ - num_bytes = omap_i2c_read_reg(dev, - OMAP_I2C_BUFSTAT_REG) - & 0x3F; + + if (dev->fifo_size) + num_bytes = dev->buf_len; + + while (num_bytes--) { + if (!dev->buf_len) { + dev_err(dev->dev, + "XDR IRQ while no " + "data to send\n"); + break; + } + + w = *dev->buf++; + dev->buf_len--; + + /* + * Data reg in 2430, omap3 and + * omap4 is 8 bit wide + */ + if (dev->flags & + OMAP_I2C_FLAG_16BIT_DATA_REG) { + if (dev->buf_len) { + w |= *dev->buf++ << 8; + dev->buf_len--; + } + } + + if ((dev->errata & I2C_OMAP_ERRATA_I462) && + errata_omap3_i462(dev, &stat, &err)) + goto complete; + + omap_i2c_write_reg(dev, OMAP_I2C_DATA_REG, w); } + + omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XDR); + continue; + } + + if (stat & OMAP_I2C_STAT_XRDY) { + u8 num_bytes = 1; + + if (dev->fifo_size) + num_bytes = dev->fifo_size; + while (num_bytes--) { if (!dev->buf_len) { - if (stat & OMAP_I2C_STAT_XRDY) - dev_err(dev->dev, + dev_err(dev->dev, "XRDY IRQ while no " "data to send\n"); - if (stat & OMAP_I2C_STAT_XDR) - dev_err(dev->dev, - "XDR IRQ while no " - "data to send\n"); break; } w = *dev->buf++; dev->buf_len--; + /* * Data reg in 2430, omap3 and * omap4 is 8 bit wide @@ -891,8 +949,8 @@ complete: omap_i2c_write_reg(dev, OMAP_I2C_DATA_REG, w); } - omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_XRDY | - OMAP_I2C_STAT_XDR)); + + omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XRDY); continue; } -- 1.7.5.4
next prev parent reply other threads:[~2012-08-14 14:18 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-08-14 14:18 [PATCHv6 00/24] I2C big cleanup Shubhrajyoti D 2012-08-14 14:18 ` Shubhrajyoti D 2012-08-14 14:18 ` [PATCHv6 01/24] i2c: omap: switch to devm_* API Shubhrajyoti D 2012-08-14 14:18 ` Shubhrajyoti D 2012-08-14 14:18 ` [PATCHv6 02/24] i2c: omap: simplify num_bytes handling Shubhrajyoti D 2012-08-14 14:18 ` Shubhrajyoti D 2012-08-14 14:18 ` [PATCHv6 03/24] i2c: omap: decrease indentation level on data handling Shubhrajyoti D 2012-08-14 14:18 ` Shubhrajyoti D 2012-08-14 14:18 ` [PATCHv6 04/24] i2c: omap: add blank lines Shubhrajyoti D 2012-08-14 14:18 ` Shubhrajyoti D 2012-08-14 14:18 ` [PATCHv6 05/24] i2c: omap: simplify omap_i2c_ack_stat() Shubhrajyoti D 2012-08-14 14:18 ` Shubhrajyoti D 2012-08-14 14:18 ` [PATCHv6 07/24] i2c: omap: improve i462 errata handling Shubhrajyoti D 2012-08-14 14:18 ` Shubhrajyoti D 2012-08-14 14:18 ` [PATCHv6 08/24] i2c: omap: re-factor receive/transmit data loop Shubhrajyoti D 2012-08-14 14:18 ` Shubhrajyoti D 2012-08-14 14:18 ` [PATCHv6 09/24] i2c: omap: switch over to do {} while loop Shubhrajyoti D 2012-08-14 14:18 ` Shubhrajyoti D 2012-08-14 14:18 ` [PATCHv6 11/24] i2c: omap: switch to platform_get_irq() Shubhrajyoti D 2012-08-14 14:18 ` Shubhrajyoti D 2012-08-14 14:18 ` [PATCHv6 13/24] i2c: omap: simplify errata check Shubhrajyoti D 2012-08-14 14:18 ` Shubhrajyoti D 2012-08-14 14:18 ` [PATCHv6 14/24] i2c: omap: always return IRQ_HANDLED Shubhrajyoti D 2012-08-14 14:18 ` Shubhrajyoti D [not found] ` <1344953946-13005-15-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org> 2012-08-16 3:18 ` Hebbar, Gururaja 2012-08-16 3:18 ` Hebbar, Gururaja 2012-08-14 14:18 ` [PATCHv6 15/24] i2c: omap: simplify IRQ exit path Shubhrajyoti D 2012-08-14 14:18 ` Shubhrajyoti D 2012-08-14 14:18 ` [PATCHv6 16/24] i2c: omap: resize fifos before each message Shubhrajyoti D 2012-08-14 14:18 ` Shubhrajyoti D 2012-08-14 14:18 ` [PATCHv6 17/24] i2c: omap: get rid of the "complete" label Shubhrajyoti D 2012-08-14 14:18 ` Shubhrajyoti D [not found] ` <1344953946-13005-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org> 2012-08-14 14:18 ` Shubhrajyoti D [this message] 2012-08-14 14:18 ` [PATCHv6 06/24] i2c: omap: split out [XR]DR and [XR]RDY Shubhrajyoti D 2012-08-14 14:18 ` [PATCHv6 10/24] i2c: omap: ack IRQ in parts Shubhrajyoti D 2012-08-14 14:18 ` Shubhrajyoti D 2012-08-14 14:18 ` [PATCHv6 12/24] i2c: omap: bus: add a receiver flag Shubhrajyoti D 2012-08-14 14:18 ` Shubhrajyoti D 2012-08-14 14:19 ` [PATCHv6 18/24] i2c: omap: remove redundant status read Shubhrajyoti D 2012-08-14 14:19 ` Shubhrajyoti D 2012-08-14 14:19 ` [PATCHv6 19/24] i2c: omap: always return IRQ_HANDLED Shubhrajyoti D 2012-08-14 14:19 ` Shubhrajyoti D 2012-08-14 14:19 ` [PATCHv6 20/24] i2c: omap: switch to threaded IRQ support Shubhrajyoti D 2012-08-14 14:19 ` Shubhrajyoti D 2012-08-14 14:19 ` [PATCHv6 21/24] i2c: omap: remove unnecessary pm_runtime_suspended check Shubhrajyoti D 2012-08-14 14:19 ` Shubhrajyoti D 2012-08-14 14:19 ` [PATCHv6 22/24] i2c: omap: switch over to autosuspend API Shubhrajyoti D 2012-08-14 14:19 ` Shubhrajyoti D 2012-08-14 14:19 ` [PATCHv6 23/24] i2c: omap: sanitize exit path Shubhrajyoti D 2012-08-14 14:19 ` Shubhrajyoti D 2012-08-14 14:19 ` [PATCHv6 24/24] i2c: omap: Prevent NULL pointer dereference in remove Shubhrajyoti D 2012-08-14 14:19 ` Shubhrajyoti D [not found] ` <1344953946-13005-25-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org> 2012-08-15 6:03 ` Felipe Balbi 2012-08-15 6:03 ` Felipe Balbi
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=1344953946-13005-7-git-send-email-shubhrajyoti@ti.com \ --to=shubhrajyoti-l0cymroini0@public.gmane.org \ --cc=balbi-l0cyMroinI0@public.gmane.org \ --cc=ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org \ --cc=w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \ /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.