2018-02-27 15:45:21

by Jan Glauber

[permalink] [raw]
Subject: [PATCH] i2c: octeon: Prevent error message on bus error

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 <[email protected]>
---
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



2018-03-02 17:36:25

by Wolfram Sang

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

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 <[email protected]>

Applied to for-current, thanks!


Attachments:
(No filename) (434.00 B)
signature.asc (849.00 B)
Download all attachments

2018-03-03 03:24:08

by Phil Pokorny

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

On Fri, Mar 2, 2018 at 2:11 AM, Wolfram Sang <[email protected]> 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 <[email protected]>
>
> 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
http://www.penguincomputing.com

Changing the world through technical innovation

2018-03-03 19:38:05

by Wolfram Sang

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


> 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.


Attachments:
(No filename) (190.00 B)
signature.asc (849.00 B)
Download all attachments