[PATCH] i2c: octeon: Prevent error message on bus error

[PATCH] i2c: octeon: Prevent error message on bus error

[Jan Glauber]

The error message:

[Fri Feb 16 13:42:13 2018] i2c-thunderx 0000:01:09.4: unhandled state: 0

is mis-leading as state 0 (bus error) is not an unknown state.

Return -EIO as before but avoid printing the message. Also rename
STAT_ERROR to STATE_BUS_ERROR.

Signed-off-by: Jan Glauber <jglauber@cavium.com>
---
 drivers/i2c/busses/i2c-octeon-core.c | 1 +
 drivers/i2c/busses/i2c-octeon-core.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/i2c/busses/i2c-octeon-core.c b/drivers/i2c/busses/i2c-octeon-core.c
index 1d8775799056..d9607905dc2f 100644
--- a/drivers/i2c/busses/i2c-octeon-core.c
+++ b/drivers/i2c/busses/i2c-octeon-core.c
@@ -233,6 +233,7 @@ static int octeon_i2c_check_status(struct octeon_i2c *i2c, int final_read)
 		return -EOPNOTSUPP;
 
 	case STAT_TXDATA_NAK:
+	case STAT_BUS_ERROR:
 		return -EIO;
 	case STAT_TXADDR_NAK:
 	case STAT_RXADDR_NAK:
diff --git a/drivers/i2c/busses/i2c-octeon-core.h b/drivers/i2c/busses/i2c-octeon-core.h
index a7ef19855bb8..9bb9f64fdda0 100644
--- a/drivers/i2c/busses/i2c-octeon-core.h
+++ b/drivers/i2c/busses/i2c-octeon-core.h
@@ -43,7 +43,7 @@
 #define TWSI_CTL_AAK		0x04	/* Assert ACK */
 
 /* Status values */
-#define STAT_ERROR		0x00
+#define STAT_BUS_ERROR		0x00
 #define STAT_START		0x08
 #define STAT_REP_START		0x10
 #define STAT_TXADDR_ACK		0x18
-- 
2.16.2

Re: [PATCH] i2c: octeon: Prevent error message on bus error

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 434 bytes --]

On Tue, Feb 27, 2018 at 04:42:13PM +0100, Jan Glauber wrote:
> The error message:
> 
> [Fri Feb 16 13:42:13 2018] i2c-thunderx 0000:01:09.4: unhandled state: 0
> 
> is mis-leading as state 0 (bus error) is not an unknown state.
> 
> Return -EIO as before but avoid printing the message. Also rename
> STAT_ERROR to STATE_BUS_ERROR.
> 
> Signed-off-by: Jan Glauber <jglauber@cavium.com>

Applied to for-current, thanks!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] i2c: octeon: Prevent error message on bus error

[Phil Pokorny]

On Fri, Mar 2, 2018 at 2:11 AM, Wolfram Sang <wsa@the-dreams.de> wrote:
>
> On Tue, Feb 27, 2018 at 04:42:13PM +0100, Jan Glauber wrote:
> > The error message:
> >
> > [Fri Feb 16 13:42:13 2018] i2c-thunderx 0000:01:09.4: unhandled state: 0
> >
> > is mis-leading as state 0 (bus error) is not an unknown state.
> >
> > Return -EIO as before but avoid printing the message. Also rename
> > STAT_ERROR to STATE_BUS_ERROR.
> >
> > Signed-off-by: Jan Glauber <jglauber@cavium.com>
>
> Applied to for-current, thanks!

Did you also pick up the i2c-xlp9xx patches for current?

Similar set of issues there.

Multiple people have now tested them and reported they resolve issues
with IPMI SSIF on ThunderX2 platforms.

Thanks,
Phil P.

-- 
Philip Pokorny, RHCE
Chief Technology Officer
PENGUIN COMPUTING, Inc
www.penguincomputing.com

Changing the world through technical innovation

Re: [PATCH] i2c: octeon: Prevent error message on bus error

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 184 bytes --]


> Did you also pick up the i2c-xlp9xx patches for current?

Dunno which one of those you mean, but I reply to every patch to which
branch I applied it to so you can check it easily.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]