All of lore.kernel.org
 help / color / mirror / Atom feed
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: [PATCHv7 10/24] i2c: omap: ack IRQ in parts
Date: Thu, 16 Aug 2012 19:33:41 +0530	[thread overview]
Message-ID: <1345125835-15524-11-git-send-email-shubhrajyoti@ti.com> (raw)
In-Reply-To: <1345125835-15524-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org>

From: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>

According to flow diagrams on OMAP TRMs,
we should ACK the IRQ as they happen.

Signed-off-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
[Ack the stat OMAP_I2C_STAT_AL in case of arbitration lost]
Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
---
 drivers/i2c/busses/i2c-omap.c |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 8b80799..0adbfb1 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -850,21 +850,19 @@ omap_i2c_isr(int this_irq, void *dev_id)
 		}
 
 complete:
-		/*
-		 * Ack the stat in one go, but [R/X]DR and [R/X]RDY should be
-		 * acked after the data operation is complete.
-		 * Ref: TRM SWPU114Q Figure 18-31
-		 */
-		omap_i2c_write_reg(dev, OMAP_I2C_STAT_REG, stat &
-				~(OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR |
-				OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR));
-
-		if (stat & OMAP_I2C_STAT_NACK)
+		if (stat & OMAP_I2C_STAT_NACK) {
 			err |= OMAP_I2C_STAT_NACK;
+			omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK);
+			omap_i2c_complete_cmd(dev, err);
+			return IRQ_HANDLED;
+		}
 
 		if (stat & OMAP_I2C_STAT_AL) {
 			dev_err(dev->dev, "Arbitration lost\n");
 			err |= OMAP_I2C_STAT_AL;
+			omap_i2c_ack_stat(dev, OMAP_I2C_STAT_AL);
+			omap_i2c_complete_cmd(dev, err);
+			return IRQ_HANDLED;
 		}
 
 		/*
@@ -941,12 +939,18 @@ complete:
 
 		if (stat & OMAP_I2C_STAT_ROVR) {
 			dev_err(dev->dev, "Receive overrun\n");
-			dev->cmd_err |= OMAP_I2C_STAT_ROVR;
+			err |= OMAP_I2C_STAT_ROVR;
+			omap_i2c_ack_stat(dev, OMAP_I2C_STAT_ROVR);
+			omap_i2c_complete_cmd(dev, err);
+			return IRQ_HANDLED;
 		}
 
 		if (stat & OMAP_I2C_STAT_XUDF) {
 			dev_err(dev->dev, "Transmit underflow\n");
-			dev->cmd_err |= OMAP_I2C_STAT_XUDF;
+			err |= OMAP_I2C_STAT_XUDF;
+			omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XUDF);
+			omap_i2c_complete_cmd(dev, err);
+			return IRQ_HANDLED;
 		}
 	} while (stat);
 
-- 
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: [PATCHv7 10/24] i2c: omap: ack IRQ in parts
Date: Thu, 16 Aug 2012 19:33:41 +0530	[thread overview]
Message-ID: <1345125835-15524-11-git-send-email-shubhrajyoti@ti.com> (raw)
In-Reply-To: <1345125835-15524-1-git-send-email-shubhrajyoti@ti.com>

From: Felipe Balbi <balbi@ti.com>

According to flow diagrams on OMAP TRMs,
we should ACK the IRQ as they happen.

Signed-off-by: Felipe Balbi <balbi@ti.com>
[Ack the stat OMAP_I2C_STAT_AL in case of arbitration lost]
Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
---
 drivers/i2c/busses/i2c-omap.c |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 8b80799..0adbfb1 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -850,21 +850,19 @@ omap_i2c_isr(int this_irq, void *dev_id)
 		}
 
 complete:
-		/*
-		 * Ack the stat in one go, but [R/X]DR and [R/X]RDY should be
-		 * acked after the data operation is complete.
-		 * Ref: TRM SWPU114Q Figure 18-31
-		 */
-		omap_i2c_write_reg(dev, OMAP_I2C_STAT_REG, stat &
-				~(OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR |
-				OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR));
-
-		if (stat & OMAP_I2C_STAT_NACK)
+		if (stat & OMAP_I2C_STAT_NACK) {
 			err |= OMAP_I2C_STAT_NACK;
+			omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK);
+			omap_i2c_complete_cmd(dev, err);
+			return IRQ_HANDLED;
+		}
 
 		if (stat & OMAP_I2C_STAT_AL) {
 			dev_err(dev->dev, "Arbitration lost\n");
 			err |= OMAP_I2C_STAT_AL;
+			omap_i2c_ack_stat(dev, OMAP_I2C_STAT_AL);
+			omap_i2c_complete_cmd(dev, err);
+			return IRQ_HANDLED;
 		}
 
 		/*
@@ -941,12 +939,18 @@ complete:
 
 		if (stat & OMAP_I2C_STAT_ROVR) {
 			dev_err(dev->dev, "Receive overrun\n");
-			dev->cmd_err |= OMAP_I2C_STAT_ROVR;
+			err |= OMAP_I2C_STAT_ROVR;
+			omap_i2c_ack_stat(dev, OMAP_I2C_STAT_ROVR);
+			omap_i2c_complete_cmd(dev, err);
+			return IRQ_HANDLED;
 		}
 
 		if (stat & OMAP_I2C_STAT_XUDF) {
 			dev_err(dev->dev, "Transmit underflow\n");
-			dev->cmd_err |= OMAP_I2C_STAT_XUDF;
+			err |= OMAP_I2C_STAT_XUDF;
+			omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XUDF);
+			omap_i2c_complete_cmd(dev, err);
+			return IRQ_HANDLED;
 		}
 	} while (stat);
 
-- 
1.7.5.4

  parent reply	other threads:[~2012-08-16 14:03 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-16 14:03 [PATCHv7 00/24] I2C big cleanup Shubhrajyoti D
2012-08-16 14:03 ` Shubhrajyoti D
2012-08-16 14:03 ` [PATCHv7 03/24] i2c: omap: decrease indentation level on data handling Shubhrajyoti D
2012-08-16 14:03   ` Shubhrajyoti D
2012-08-16 14:03 ` [PATCHv7 04/24] i2c: omap: add blank lines Shubhrajyoti D
2012-08-16 14:03   ` Shubhrajyoti D
2012-08-16 14:03 ` [PATCHv7 09/24] i2c: omap: switch over to do {} while loop Shubhrajyoti D
2012-08-16 14:03   ` Shubhrajyoti D
2012-08-16 14:03 ` [PATCHv7 11/24] i2c: omap: switch to platform_get_irq() Shubhrajyoti D
2012-08-16 14:03   ` Shubhrajyoti D
     [not found] ` <1345125835-15524-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org>
2012-08-16 14:03   ` [PATCHv7 01/24] i2c: omap: switch to devm_* API Shubhrajyoti D
2012-08-16 14:03     ` Shubhrajyoti D
2012-08-16 14:03   ` [PATCHv7 02/24] i2c: omap: simplify num_bytes handling Shubhrajyoti D
2012-08-16 14:03     ` Shubhrajyoti D
2012-08-16 14:03   ` [PATCHv7 05/24] i2c: omap: simplify omap_i2c_ack_stat() Shubhrajyoti D
2012-08-16 14:03     ` Shubhrajyoti D
2012-08-16 14:03   ` [PATCHv7 06/24] i2c: omap: split out [XR]DR and [XR]RDY Shubhrajyoti D
2012-08-16 14:03     ` Shubhrajyoti D
2012-08-16 14:03   ` [PATCHv7 07/24] i2c: omap: improve i462 errata handling Shubhrajyoti D
2012-08-16 14:03     ` Shubhrajyoti D
2012-08-16 14:03   ` [PATCHv7 08/24] i2c: omap: re-factor receive/transmit data loop Shubhrajyoti D
2012-08-16 14:03     ` Shubhrajyoti D
2012-08-16 14:03   ` Shubhrajyoti D [this message]
2012-08-16 14:03     ` [PATCHv7 10/24] i2c: omap: ack IRQ in parts Shubhrajyoti D
2012-08-16 14:03   ` [PATCHv7 12/24] i2c: omap: bus: add a receiver flag Shubhrajyoti D
2012-08-16 14:03     ` Shubhrajyoti D
2012-08-16 14:03   ` [PATCHv7 13/24] i2c: omap: simplify errata check Shubhrajyoti D
2012-08-16 14:03     ` Shubhrajyoti D
2012-08-16 14:03   ` [PATCHv7 15/24] i2c: omap: simplify IRQ exit path Shubhrajyoti D
2012-08-16 14:03     ` Shubhrajyoti D
2012-08-16 14:03   ` [PATCHv7 17/24] i2c: omap: get rid of the "complete" label Shubhrajyoti D
2012-08-16 14:03     ` Shubhrajyoti D
2012-08-16 14:03   ` [PATCHv7 18/24] i2c: omap: remove redundant status read Shubhrajyoti D
2012-08-16 14:03     ` Shubhrajyoti D
2012-08-16 14:03   ` [PATCHv7 20/24] i2c: omap: switch to threaded IRQ support Shubhrajyoti D
2012-08-16 14:03     ` Shubhrajyoti D
2012-08-16 14:03   ` [PATCHv7 21/24] i2c: omap: remove unnecessary pm_runtime_suspended check Shubhrajyoti D
2012-08-16 14:03     ` Shubhrajyoti D
2012-08-16 14:03   ` [PATCHv7 22/24] i2c: omap: switch over to autosuspend API Shubhrajyoti D
2012-08-16 14:03     ` Shubhrajyoti D
2012-08-16 14:03   ` [PATCHv7 24/24] i2c: omap: Prevent NULL pointer dereference in remove Shubhrajyoti D
2012-08-16 14:03     ` Shubhrajyoti D
2012-08-16 14:03 ` [PATCHv7 14/24] i2c: omap: always return IRQ_HANDLED Shubhrajyoti D
2012-08-16 14:03   ` Shubhrajyoti D
2012-08-16 14:03 ` [PATCHv7 16/24] i2c: omap: resize fifos before each message Shubhrajyoti D
2012-08-16 14:03   ` Shubhrajyoti D
2012-08-16 14:03 ` [PATCHv7 19/24] i2c: omap: always return IRQ_HANDLED Shubhrajyoti D
2012-08-16 14:03   ` Shubhrajyoti D
2012-08-16 14:03 ` [PATCHv7 23/24] i2c: omap: sanitize exit path Shubhrajyoti D
2012-08-16 14:03   ` Shubhrajyoti D
2012-08-16 14:15 ` [PATCHv7 00/24] I2C big cleanup Wolfram Sang
2012-08-16 14:15   ` Wolfram Sang

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=1345125835-15524-11-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: link
Be 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.