public inbox for linux-i2c@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] i2c: mpc: Report correct I2C error codes on Freescale MPC i2c bus driver
@ 2014-10-21  7:05 Danielle Costantino
       [not found] ` <CAAVjN7cpGzokOntyyGVBksdvAw7rGt8zvggpCeMqr+g1yHEyzg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
  0 siblings, 1 reply; 6+ messages in thread
From: Danielle Costantino @ 2014-10-21  7:05 UTC (permalink / raw)
  To: Wolfram Sang
  Cc: linux-i2c, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org

From: Danielle Costantino <danielle.costantino-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

This patch enforces correct I2C error returned codes from Freescale's
MPC i2c bus driver, allowing for proper user-space/kernel error
handling.

Signed-off-by: Danielle Costantino <danielle.costantino-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 0edf630..66bef28 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -124,7 +124,7 @@
 static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing)
 {
  unsigned long orig_jiffies = jiffies;
- u32 x;
+ u32 cmd_err;
  int result = 0;

  if (!i2c->irq) {
@@ -137,7 +137,7 @@
  break;
  }
  }
- x = readb(i2c->base + MPC_I2C_SR);
+ cmd_err = readb(i2c->base + MPC_I2C_SR);
  writeb(0, i2c->base + MPC_I2C_SR);
  } else {
  /* Interrupt mode */
@@ -150,30 +150,30 @@
  result = -ETIMEDOUT;
  }

- x = i2c->interrupt;
+ cmd_err = i2c->interrupt;
  i2c->interrupt = 0;
  }

- if (result < 0)
- return result;
+    if (result < 0)
+        return result;

- if (!(x & CSR_MCF)) {
- dev_dbg(i2c->dev, "unfinished\n");
- return -EIO;
- }
+    if (!(cmd_err & CSR_MCF)) {
+        dev_dbg(i2c->dev, "unfinished\n");
+        return -EIO;
+    }

- if (x & CSR_MAL) {
- dev_dbg(i2c->dev, "MAL\n");
- return -EIO;
- }
+    if (cmd_err & CSR_MAL) {
+        dev_dbg(i2c->dev, "MAL\n");
+        return -EAGAIN;
+    }

- if (writing && (x & CSR_RXAK)) {
- dev_dbg(i2c->dev, "No RXAK\n");
- /* generate stop */
- writeccr(i2c, CCR_MEN);
- return -EIO;
- }
- return 0;
+    if (writing && (cmd_err & CSR_RXAK)) {
+        dev_dbg(i2c->dev, "No RXAK\n");
+        /* generate stop */
+        writeccr(i2c, CCR_MEN);
+        return -ENXIO;
+    }
+    return 0;
 }

 #if defined(CONFIG_PPC_MPC52xx) || defined(CONFIG_PPC_MPC512x)

-- 
- Danielle Costantino

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH] i2c: mpc: Report correct I2C error codes on Freescale MPC i2c bus driver
@ 2014-10-08 19:06 Danielle Costantino
       [not found] ` <CAAVjN7fq-czDj5Ga_UC+fzqy3dcYY3bgU7Z5JUY829Va4rbeXQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
  0 siblings, 1 reply; 6+ messages in thread
From: Danielle Costantino @ 2014-10-08 19:06 UTC (permalink / raw)
  To: linux-i2c

Report correct I2C error codes on Freescale MPC i2c bus driver


diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 0edf630..b56145c 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -124,7 +124,7 @@
 static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing)
 {
  unsigned long orig_jiffies = jiffies;
- u32 x;
+ u32 cmd_err;
  int result = 0;

  if (!i2c->irq) {
@@ -133,11 +133,11 @@
  if (time_after(jiffies, orig_jiffies + timeout)) {
  dev_dbg(i2c->dev, "timeout\n");
  writeccr(i2c, 0);
- result = -EIO;
+ result = -ETIMEDOUT;
  break;
  }
  }
- x = readb(i2c->base + MPC_I2C_SR);
+ cmd_err = readb(i2c->base + MPC_I2C_SR);
  writeb(0, i2c->base + MPC_I2C_SR);
  } else {
  /* Interrupt mode */
@@ -150,28 +150,28 @@
  result = -ETIMEDOUT;
  }

- x = i2c->interrupt;
+ cmd_err = i2c->interrupt;
  i2c->interrupt = 0;
  }

  if (result < 0)
  return result;

- if (!(x & CSR_MCF)) {
+ if (!(cmd_err & CSR_MCF)) {
  dev_dbg(i2c->dev, "unfinished\n");
  return -EIO;
  }

- if (x & CSR_MAL) {
+ if (cmd_err & CSR_MAL) {
  dev_dbg(i2c->dev, "MAL\n");
- return -EIO;
+ return -EAGAIN;
  }

- if (writing && (x & CSR_RXAK)) {
+ if (writing && (cmd_err & CSR_RXAK)) {
  dev_dbg(i2c->dev, "No RXAK\n");
  /* generate stop */
  writeccr(i2c, CCR_MEN);
- return -EIO;
+ return -ENXIO;
  }
  return 0;
 }
@@ -554,7 +554,7 @@
        i2c->base + MPC_I2C_SR);
  mpc_i2c_fixup(i2c);
  }
- return -EIO;
+ return -ETIMEDOUT;
  }
  schedule();
  }
@@ -590,7 +590,7 @@
        i2c->base + MPC_I2C_SR);
  mpc_i2c_fixup(i2c);
  }
- return -EIO;
+ return -ETIMEDOUT;
  }
  cond_resched();
  }


- Danielle Costantino

^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-11-12 15:40 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-21  7:05 [PATCH] i2c: mpc: Report correct I2C error codes on Freescale MPC i2c bus driver Danielle Costantino
     [not found] ` <CAAVjN7cpGzokOntyyGVBksdvAw7rGt8zvggpCeMqr+g1yHEyzg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-11-10 14:49   ` Wolfram Sang
2014-11-12 13:08     ` Danielle Costantino
     [not found]       ` <CAAVjN7fsZC6V7bsJQLNmEx=yOmvsDn2ZwfOHNLd_=_jAbYB2dA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-11-12 15:40         ` Wolfram Sang
  -- strict thread matches above, loose matches on Subject: below --
2014-10-08 19:06 Danielle Costantino
     [not found] ` <CAAVjN7fq-czDj5Ga_UC+fzqy3dcYY3bgU7Z5JUY829Va4rbeXQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-10-09 13:46   ` Mark Roszko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox