[i2c] [PATCH] Add polling transfer for i2c-pxa

Mike Rapoport mike at compulab.co.il
Mon Nov 19 15:40:39 CET 2007


Russell King - ARM Linux wrote:
> On Wed, Nov 14, 2007 at 09:21:59AM +0200, Mike Rapoport wrote:
>> Fixed (hopefully :) ).
> 
> Can we not re-use the existing interrupt handler code?  IOW, poll
> the status register to indicate an interrupt and then manually call
> the irq service handler.

> I don't see any point in having two sets of different code in the
> same driver for handling the same hardware - from the bug fixing
> point of view that's a recipe for problems.
> 

The polling transfer is now reusing the existing interrupt handler.


-- 
Sincerely yours,
Mike.


Signed-off-by: Mike Rapoport <mike at compulab.co.il>

 drivers/i2c/busses/i2c-pxa.c |  104 +++++++++++++++++++++++++++++++++++++++++-
 drivers/i2c/i2c-core.c       |   20 ++++++++-
 include/linux/i2c.h          |    4 ++
 3 files changed, 126 insertions(+), 2 deletions(-)

diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 6426a61..704c0ff 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -65,6 +65,7 @@ struct pxa_i2c {
 	unsigned long		iosize;

 	int			irq;
+	int			is_pio_xfer;
 };

 #define _IBMR(i2c)	((i2c)->reg_base + 0)
@@ -163,6 +164,7 @@ static void i2c_pxa_show_state(struct pxa_i2c *i2c, int lno, const char *fname)
 #define eedbg(lvl, x...) do { if ((lvl) < 1) { printk(KERN_DEBUG "" x); } } while(0)

 static void i2c_pxa_master_complete(struct pxa_i2c *i2c, int ret);
+static irqreturn_t i2c_pxa_handler(int this_irq, void *dev_id);

 static void i2c_pxa_scream_blue_murder(struct pxa_i2c *i2c, const char *why)
 {
@@ -554,6 +556,75 @@ static inline void i2c_pxa_stop_message(struct pxa_i2c *i2c)
 	writel(icr, _ICR(i2c));
 }

+static int i2c_pxa_pio_set_master(struct pxa_i2c *i2c)
+{
+	/* make timeout the same as for interrupt based functions */
+	long timeout = 2 * DEF_TIMEOUT;
+
+	/*
+	 * Wait for the bus to become free.
+	 */
+	while (timeout-- && readl(_ISR(i2c)) & (ISR_IBB | ISR_UB)) {
+		udelay(1000);
+		show_state(i2c);
+	}
+
+	if (timeout <= 0) {
+		show_state(i2c);
+		dev_err(&i2c->adap.dev,
+			"i2c_pxa: timeout waiting for bus free\n");
+		return I2C_RETRY;
+	}
+
+	/*
+	 * Set master mode.
+	 */
+	writel(readl(_ICR(i2c)) | ICR_SCLE, _ICR(i2c));
+
+	return 0;
+}
+
+static int i2c_pxa_do_pio_xfer(struct pxa_i2c *i2c,
+			       struct i2c_msg *msg, int num)
+{
+	unsigned long timeout = 500000; /* 5 seconds */
+	int ret = 0;
+	u32 icr;
+
+	ret = i2c_pxa_pio_set_master(i2c);
+	if (ret)
+		goto out;
+
+	i2c->msg = msg;
+	i2c->msg_num = num;
+	i2c->msg_idx = 0;
+	i2c->msg_ptr = 0;
+	i2c->irqlogidx = 0;
+	i2c->is_pio_xfer = 1;
+
+	i2c_pxa_start_message(i2c);
+
+	while (timeout-- && i2c->msg_num > 0) {
+		i2c_pxa_handler(0, i2c);
+		udelay(10);
+	}
+
+	i2c_pxa_stop_message(i2c);
+
+	i2c->is_pio_xfer = 0;
+
+	/*
+	 * We place the return code in i2c->msg_idx.
+	 */
+	ret = i2c->msg_idx;
+
+out:
+	if (timeout == 0)
+		i2c_pxa_scream_blue_murder(i2c, "timeout");
+
+	return ret;
+}
+
 /*
  * We are protected by the adapter bus mutex.
  */
@@ -610,6 +681,35 @@ static int i2c_pxa_do_xfer(struct pxa_i2c *i2c, struct i2c_msg *msg, int num)
 	return ret;
 }

+static int i2c_pxa_pio_xfer(struct i2c_adapter *adap,
+			    struct i2c_msg msgs[], int num)
+{
+	struct pxa_i2c *i2c = adap->algo_data;
+	int ret, i;
+
+	/* If the I2C controller is disabled we need to reset it
+	  (probably due to a suspend/resume destroying state). We do
+	  this here as we can then avoid worrying about resuming the
+	  controller before its users. */
+	if (!(readl(_ICR(i2c)) & ICR_IUE))
+		i2c_pxa_reset(i2c);
+
+	for (i = adap->retries; i >= 0; i--) {
+		ret = i2c_pxa_do_pio_xfer(i2c, msgs, num);
+		if (ret != I2C_RETRY)
+			goto out;
+
+		if (i2c_debug)
+			dev_dbg(&adap->dev, "Retrying transmission\n");
+		udelay(100);
+	}
+	i2c_pxa_scream_blue_murder(i2c, "exhausted retries");
+	ret = -EREMOTEIO;
+ out:
+	i2c_pxa_set_slave(i2c, ret);
+	return ret;
+}
+
 /*
  * i2c_pxa_master_complete - complete the message and wake up.
  */
@@ -621,7 +721,8 @@ static void i2c_pxa_master_complete(struct pxa_i2c *i2c, int ret)
 	i2c->msg_num = 0;
 	if (ret)
 		i2c->msg_idx = ret;
-	wake_up(&i2c->wait);
+	if (!i2c->is_pio_xfer)
+		wake_up(&i2c->wait);
 }

 static void i2c_pxa_irq_txempty(struct pxa_i2c *i2c, u32 isr)
@@ -837,6 +938,7 @@ static u32 i2c_pxa_functionality(struct i2c_adapter *adap)

 static const struct i2c_algorithm i2c_pxa_algorithm = {
 	.master_xfer	= i2c_pxa_xfer,
+	.pio_xfer	= i2c_pxa_pio_xfer,
 	.functionality	= i2c_pxa_functionality,
 };

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 1a4e8dc..37e3cd9 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -33,6 +33,7 @@
 #include <linux/platform_device.h>
 #include <linux/mutex.h>
 #include <linux/completion.h>
+#include <linux/delay.h>
 #include <asm/uaccess.h>

 #include "i2c-core.h"
@@ -870,7 +871,24 @@ int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg *msgs, int num)
 {
 	int ret;

-	if (adap->algo->master_xfer) {
+	if (in_atomic() || irqs_disabled()) {
+		int retries = 1;
+		if (adap->algo->pio_xfer == NULL) {
+			pr_debug("%s: algo has no poll xfer", __FUNCTION__);
+			return -EINVAL;
+		}
+		ret = mutex_trylock(&adap->bus_lock);
+		if (ret) { /* We get bus_lock, no ongoing I2C activity */
+			ret = adap->algo->pio_xfer(adap, msgs, num);
+			mutex_unlock(&adap->bus_lock);
+			return ret;
+		} else {
+			/* I2C activity is ongoing. */
+			/* FIXME: may be we should take the lock and
+			   abandon ongoing transfer */
+			return -EBUSY;
+		}
+	} else if (adap->algo->master_xfer) {
 #ifdef DEBUG
 		for (ret = 0; ret < num; ret++) {
 			dev_dbg(&adap->dev, "master_xfer[%d] %c, addr=0x%02x, "
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 8033e6b..7e24466 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -290,6 +290,10 @@ struct i2c_algorithm {
 	                   unsigned short flags, char read_write,
 	                   u8 command, int size, union i2c_smbus_data * data);

+	/* PIO xfer can be used in no-interrupts context */
+	int (*pio_xfer)(struct i2c_adapter *adap, struct i2c_msg *msgs,
+			int num);
+
 	/* To determine what the adapter supports */
 	u32 (*functionality) (struct i2c_adapter *);
 };

-------------------------------------------------------------------
List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php



More information about the i2c mailing list