* [U-Boot] [PATCH v1 0/2] Fix some ppc4xx i2c controller issues @ 2014-10-29 14:56 dirk.eibach at gdsys.cc 2014-10-29 14:56 ` [U-Boot] [PATCH v1 1/2] ppc4xx: Fix i2c repeated start dirk.eibach at gdsys.cc 2014-10-29 14:56 ` [U-Boot] [PATCH v1 2/2] ppc4xx: Handle i2c stuck on combined xfer dirk.eibach at gdsys.cc 0 siblings, 2 replies; 7+ messages in thread From: dirk.eibach at gdsys.cc @ 2014-10-29 14:56 UTC (permalink / raw) To: u-boot From: Dirk Eibach <dirk.eibach@gdsys.cc> Dirk Eibach (2): ppc4xx: Fix i2c repeated start ppc4xx: Handle i2c stuck on combined xfer arch/powerpc/include/asm/ppc4xx-i2c.h | 2 ++ drivers/i2c/ppc4xx_i2c.c | 30 ++++++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) -- 1.8.3 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v1 1/2] ppc4xx: Fix i2c repeated start 2014-10-29 14:56 [U-Boot] [PATCH v1 0/2] Fix some ppc4xx i2c controller issues dirk.eibach at gdsys.cc @ 2014-10-29 14:56 ` dirk.eibach at gdsys.cc 2014-11-05 10:35 ` Stefan Roese 2014-10-29 14:56 ` [U-Boot] [PATCH v1 2/2] ppc4xx: Handle i2c stuck on combined xfer dirk.eibach at gdsys.cc 1 sibling, 1 reply; 7+ messages in thread From: dirk.eibach at gdsys.cc @ 2014-10-29 14:56 UTC (permalink / raw) To: u-boot From: Dirk Eibach <dirk.eibach@gdsys.cc> Debugging some i2c trouble I saw on my scope that repeated start is not working properply. The 4xx even held clock pulled down after transfers. Having a look in the driver I realized that IIC_CNTL_RPST is set on that part of the transfer that should begin with a repeated start. But repeated start is about not sending a stop condition, so IIC_CNTL_RPST has to be set on the last transfer before the repeated start happens. Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc> --- drivers/i2c/ppc4xx_i2c.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/ppc4xx_i2c.c b/drivers/i2c/ppc4xx_i2c.c index e7a15ba..d2ff86c 100644 --- a/drivers/i2c/ppc4xx_i2c.c +++ b/drivers/i2c/ppc4xx_i2c.c @@ -158,8 +158,7 @@ static void ppc4xx_i2c_init(struct i2c_adapter *adap, int speed, int slaveaddr) * * Typical case is a Write of an addr followd by a Read. The * IBM FAQ does not cover this. On the last byte of the write - * we don't set the creg CHT bit, and on the first bytes of the - * read we set the RPST bit. + * we don't set the creg CHT bit but the RPST bit. * * It does not support address only transfers, there must be * a data part. If you want to write the address yourself, put @@ -247,6 +246,10 @@ static int _i2c_transfer(struct i2c_adapter *adap, if ((!cmd_type && (ptr == addr)) || ((tran + bc) != cnt)) creg |= IIC_CNTL_CHT; + /* last part of address, prepare for repeated start on read */ + if (cmd_type && (ptr == addr) && ((tran + bc) == cnt)) + creg |= IIC_CNTL_RPST; + if (reading) { creg |= IIC_CNTL_READ; } else { @@ -314,8 +317,6 @@ static int _i2c_transfer(struct i2c_adapter *adap, cnt = data_len; tran = 0; reading = cmd_type; - if (reading) - creg = IIC_CNTL_RPST; } } return result; -- 1.8.3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v1 1/2] ppc4xx: Fix i2c repeated start 2014-10-29 14:56 ` [U-Boot] [PATCH v1 1/2] ppc4xx: Fix i2c repeated start dirk.eibach at gdsys.cc @ 2014-11-05 10:35 ` Stefan Roese 0 siblings, 0 replies; 7+ messages in thread From: Stefan Roese @ 2014-11-05 10:35 UTC (permalink / raw) To: u-boot On 29.10.2014 15:56, dirk.eibach at gdsys.cc wrote: > From: Dirk Eibach <dirk.eibach@gdsys.cc> > > Debugging some i2c trouble I saw on my scope that repeated > start is not working properply. The 4xx even held clock pulled down > after transfers. Having a look in the driver I realized > that IIC_CNTL_RPST is set on that part of the transfer that should > begin with a repeated start. But repeated start is about not sending a > stop condition, so IIC_CNTL_RPST has to be set on the last transfer > before the repeated start happens. > > Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan ^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v1 2/2] ppc4xx: Handle i2c stuck on combined xfer 2014-10-29 14:56 [U-Boot] [PATCH v1 0/2] Fix some ppc4xx i2c controller issues dirk.eibach at gdsys.cc 2014-10-29 14:56 ` [U-Boot] [PATCH v1 1/2] ppc4xx: Fix i2c repeated start dirk.eibach at gdsys.cc @ 2014-10-29 14:56 ` dirk.eibach at gdsys.cc 2014-10-30 6:55 ` Heiko Schocher 2014-11-05 10:36 ` Stefan Roese 1 sibling, 2 replies; 7+ messages in thread From: dirk.eibach at gdsys.cc @ 2014-10-29 14:56 UTC (permalink / raw) To: u-boot From: Dirk Eibach <dirk.eibach@gdsys.cc> ppc4xx i2c master gets stuck on errors while repeated start is active. Can be easily reproduced by "i2c md" on an unpopulated i2c address. There is not stop condition given, scl remains pulled low. The only way out seems to be doing a stop manually and then a soft reset. Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc> --- arch/powerpc/include/asm/ppc4xx-i2c.h | 2 ++ drivers/i2c/ppc4xx_i2c.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/arch/powerpc/include/asm/ppc4xx-i2c.h b/arch/powerpc/include/asm/ppc4xx-i2c.h index 09189cf..df97f17 100644 --- a/arch/powerpc/include/asm/ppc4xx-i2c.h +++ b/arch/powerpc/include/asm/ppc4xx-i2c.h @@ -72,6 +72,8 @@ struct ppc4xx_i2c { #define IIC_EXTSTS_XFRA 0x01 #define IIC_EXTSTS_ICT 0x02 #define IIC_EXTSTS_LA 0x04 +#define IIC_EXTSTS_BCS_MASK 0x70 +#define IIC_EXTSTS_BCS_FREE 0x40 /* XTCNTLSS Register Bit definition */ #define IIC_XTCNTLSS_SRST 0x01 diff --git a/drivers/i2c/ppc4xx_i2c.c b/drivers/i2c/ppc4xx_i2c.c index d2ff86c..df88885 100644 --- a/drivers/i2c/ppc4xx_i2c.c +++ b/drivers/i2c/ppc4xx_i2c.c @@ -289,6 +289,27 @@ static int _i2c_transfer(struct i2c_adapter *adap, /* Transfer aborted? */ if (status & IIC_EXTSTS_XFRA) result = IIC_NOK_XFRA; + /* Is bus free? + * If error happened during combined xfer + * IIC interface is usually stuck in some strange + * state without a valid stop condition. + * Brute, but working: generate stop, then soft reset. + */ + if ((status & IIC_EXTSTS_BCS_MASK) + != IIC_EXTSTS_BCS_FREE){ + u8 mdcntl = in_8(&i2c->mdcntl); + + /* Generate valid stop condition */ + out_8(&i2c->xtcntlss, IIC_XTCNTLSS_SRST); + out_8(&i2c->directcntl, IIC_DIRCNTL_SCC); + udelay(10); + out_8(&i2c->directcntl, + IIC_DIRCNTL_SCC | IIC_DIRCNTL_SDAC); + out_8(&i2c->xtcntlss, 0); + + ppc4xx_i2c_init(adap, (mdcntl & IIC_MDCNTL_FSM) + ? 400000 : 100000, 0); + } } else if ( status & IIC_STS_PT) { result = IIC_NOK_TOUT; } -- 1.8.3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v1 2/2] ppc4xx: Handle i2c stuck on combined xfer 2014-10-29 14:56 ` [U-Boot] [PATCH v1 2/2] ppc4xx: Handle i2c stuck on combined xfer dirk.eibach at gdsys.cc @ 2014-10-30 6:55 ` Heiko Schocher 2014-10-30 6:58 ` Dirk Eibach 2014-11-05 10:36 ` Stefan Roese 1 sibling, 1 reply; 7+ messages in thread From: Heiko Schocher @ 2014-10-30 6:55 UTC (permalink / raw) To: u-boot Hello Dirk, Am 29.10.2014 15:56, schrieb dirk.eibach at gdsys.cc: > From: Dirk Eibach<dirk.eibach@gdsys.cc> > > ppc4xx i2c master gets stuck on errors while repeated start is > active. Can be easily reproduced by "i2c md" on an unpopulated > i2c address. There is not stop condition given, scl remains > pulled low. > The only way out seems to be doing a stop manually and then a > soft reset. > > Signed-off-by: Dirk Eibach<dirk.eibach@gdsys.cc> > --- > > arch/powerpc/include/asm/ppc4xx-i2c.h | 2 ++ > drivers/i2c/ppc4xx_i2c.c | 21 +++++++++++++++++++++ > 2 files changed, 23 insertions(+) > > diff --git a/arch/powerpc/include/asm/ppc4xx-i2c.h b/arch/powerpc/include/asm/ppc4xx-i2c.h > index 09189cf..df97f17 100644 > --- a/arch/powerpc/include/asm/ppc4xx-i2c.h > +++ b/arch/powerpc/include/asm/ppc4xx-i2c.h > @@ -72,6 +72,8 @@ struct ppc4xx_i2c { > #define IIC_EXTSTS_XFRA 0x01 > #define IIC_EXTSTS_ICT 0x02 > #define IIC_EXTSTS_LA 0x04 > +#define IIC_EXTSTS_BCS_MASK 0x70 > +#define IIC_EXTSTS_BCS_FREE 0x40 > > /* XTCNTLSS Register Bit definition */ > #define IIC_XTCNTLSS_SRST 0x01 > diff --git a/drivers/i2c/ppc4xx_i2c.c b/drivers/i2c/ppc4xx_i2c.c > index d2ff86c..df88885 100644 > --- a/drivers/i2c/ppc4xx_i2c.c > +++ b/drivers/i2c/ppc4xx_i2c.c > @@ -289,6 +289,27 @@ static int _i2c_transfer(struct i2c_adapter *adap, > /* Transfer aborted? */ > if (status& IIC_EXTSTS_XFRA) > result = IIC_NOK_XFRA; > + /* Is bus free? Nitpick only: wrong comment style ... Is it OK for you, if I fix it, when applying this patch? Thanks! bye, Heiko > + * If error happened during combined xfer > + * IIC interface is usually stuck in some strange > + * state without a valid stop condition. > + * Brute, but working: generate stop, then soft reset. > + */ > + if ((status& IIC_EXTSTS_BCS_MASK) > + != IIC_EXTSTS_BCS_FREE){ > + u8 mdcntl = in_8(&i2c->mdcntl); > + > + /* Generate valid stop condition */ > + out_8(&i2c->xtcntlss, IIC_XTCNTLSS_SRST); > + out_8(&i2c->directcntl, IIC_DIRCNTL_SCC); > + udelay(10); > + out_8(&i2c->directcntl, > + IIC_DIRCNTL_SCC | IIC_DIRCNTL_SDAC); > + out_8(&i2c->xtcntlss, 0); > + > + ppc4xx_i2c_init(adap, (mdcntl& IIC_MDCNTL_FSM) > + ? 400000 : 100000, 0); > + } > } else if ( status& IIC_STS_PT) { > result = IIC_NOK_TOUT; > } -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v1 2/2] ppc4xx: Handle i2c stuck on combined xfer 2014-10-30 6:55 ` Heiko Schocher @ 2014-10-30 6:58 ` Dirk Eibach 0 siblings, 0 replies; 7+ messages in thread From: Dirk Eibach @ 2014-10-30 6:58 UTC (permalink / raw) To: u-boot Hello Heiko, >> +++ b/drivers/i2c/ppc4xx_i2c.c >> @@ -289,6 +289,27 @@ static int _i2c_transfer(struct i2c_adapter *adap, >> /* Transfer aborted? */ >> if (status& IIC_EXTSTS_XFRA) >> result = IIC_NOK_XFRA; >> + /* Is bus free? > > > Nitpick only: wrong comment style ... Is it OK for you, if I fix it, > when applying this patch? Oops, yes please fix it when applying. Shouldn't checkpatch catch this? Cheers Dirk ^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v1 2/2] ppc4xx: Handle i2c stuck on combined xfer 2014-10-29 14:56 ` [U-Boot] [PATCH v1 2/2] ppc4xx: Handle i2c stuck on combined xfer dirk.eibach at gdsys.cc 2014-10-30 6:55 ` Heiko Schocher @ 2014-11-05 10:36 ` Stefan Roese 1 sibling, 0 replies; 7+ messages in thread From: Stefan Roese @ 2014-11-05 10:36 UTC (permalink / raw) To: u-boot On 29.10.2014 15:56, dirk.eibach at gdsys.cc wrote: > From: Dirk Eibach <dirk.eibach@gdsys.cc> > > ppc4xx i2c master gets stuck on errors while repeated start is > active. Can be easily reproduced by "i2c md" on an unpopulated > i2c address. There is not stop condition given, scl remains > pulled low. > The only way out seems to be doing a stop manually and then a > soft reset. > > Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-11-05 10:36 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-10-29 14:56 [U-Boot] [PATCH v1 0/2] Fix some ppc4xx i2c controller issues dirk.eibach at gdsys.cc 2014-10-29 14:56 ` [U-Boot] [PATCH v1 1/2] ppc4xx: Fix i2c repeated start dirk.eibach at gdsys.cc 2014-11-05 10:35 ` Stefan Roese 2014-10-29 14:56 ` [U-Boot] [PATCH v1 2/2] ppc4xx: Handle i2c stuck on combined xfer dirk.eibach at gdsys.cc 2014-10-30 6:55 ` Heiko Schocher 2014-10-30 6:58 ` Dirk Eibach 2014-11-05 10:36 ` Stefan Roese
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox