From: Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> To: Richard Zhao <linuxzsc-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Cc: kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org, linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org Subject: Re: [PATCH 3/4] i2c: imx: add macros and printk to make debug easy Date: Thu, 1 Oct 2009 09:29:34 +0200 [thread overview] Message-ID: <20091001072934.GX27039@pengutronix.de> (raw) In-Reply-To: <1254359613-21210-3-git-send-email-linuxzsc-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> On Thu, Oct 01, 2009 at 09:13:32AM +0800, Richard Zhao wrote: > When CONFIG_I2C_DEBUG_BUS is enabled, it helps dump registers at operation > fail condition, and print i2c_msg to xfer. > > Signed-off-by: Richard Zhao <linuxzsc-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Honestly I don't think we need this. It makes the driver too verbose for my taste. Sascha > > diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c > index c1e541c..87faea4 100644 > --- a/drivers/i2c/busses/i2c-imx.c > +++ b/drivers/i2c/busses/i2c-imx.c > @@ -125,6 +125,20 @@ struct imx_i2c_struct { > /** Functions for IMX I2C adapter driver *************************************** > *******************************************************************************/ > > +#ifdef CONFIG_I2C_DEBUG_BUS > +#define reg_dump(i2c_imx) \ > +{ \ > + printk(KERN_DEBUG "fun %s:%d ", __func__, __LINE__); \ > + printk(KERN_DEBUG "IADR %02x IFDR %02x I2CR %02x I2SR %02x\n", \ > + readb(i2c_imx->base + IMX_I2C_IADR), \ > + readb(i2c_imx->base + IMX_I2C_IFDR), \ > + readb(i2c_imx->base + IMX_I2C_I2CR), \ > + readb(i2c_imx->base + IMX_I2C_I2SR)); \ > +} > +#else > +#define reg_dump(i2c_imx) > +#endif > + > static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy) > { > unsigned long orig_jiffies = jiffies; > @@ -146,6 +160,7 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy) > if (time_after(jiffies, orig_jiffies + HZ / 1000)) { > dev_dbg(&i2c_imx->adapter.dev, > "<%s> I2C bus is busy\n", __func__); > + reg_dump(i2c_imx); > return -EIO; > } > schedule(); > @@ -164,9 +179,11 @@ static int i2c_imx_trx_complete(struct imx_i2c_struct *i2c_imx) > > if (unlikely(result < 0)) { > dev_dbg(&i2c_imx->adapter.dev, "<%s> result < 0\n", __func__); > + reg_dump(i2c_imx); > return result; > } else if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) { > dev_dbg(&i2c_imx->adapter.dev, "<%s> Timeout\n", __func__); > + reg_dump(i2c_imx); > return -ETIMEDOUT; > } > dev_dbg(&i2c_imx->adapter.dev, "<%s> TRX complete\n", __func__); > @@ -178,6 +195,7 @@ static int i2c_imx_acked(struct imx_i2c_struct *i2c_imx) > { > if (readb(i2c_imx->base + IMX_I2C_I2SR) & I2SR_RXAK) { > dev_dbg(&i2c_imx->adapter.dev, "<%s> No ACK\n", __func__); > + reg_dump(i2c_imx); > return -EIO; /* No ACK */ > } > > @@ -197,17 +215,20 @@ static int i2c_imx_start(struct imx_i2c_struct *i2c_imx) > writeb(I2CR_IEN, i2c_imx->base + IMX_I2C_I2CR); > > result = i2c_imx_bus_busy(i2c_imx, 0); > - if (result) > + if (result) { > + reg_dump(i2c_imx); > return result; > + } > > /* Start I2C transaction */ > temp = readb(i2c_imx->base + IMX_I2C_I2CR); > temp |= I2CR_MSTA; > writeb(temp, i2c_imx->base + IMX_I2C_I2CR); > result = i2c_imx_bus_busy(i2c_imx, 1); > - if (result) > + if (result) { > + reg_dump(i2c_imx); > return result; > - > + } > temp |= I2CR_IIEN | I2CR_MTX | I2CR_TXAK; > writeb(temp, i2c_imx->base + IMX_I2C_I2CR); > return result; > @@ -228,7 +249,8 @@ static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx) > */ > udelay(i2c_imx->disable_delay); > > - i2c_imx_bus_busy(i2c_imx, 0); > + if (i2c_imx_bus_busy(i2c_imx, 0)) > + reg_dump(i2c_imx); > > /* Disable I2C controller */ > writeb(0, i2c_imx->base + IMX_I2C_I2CR); > @@ -389,7 +411,18 @@ static int i2c_imx_xfer(struct i2c_adapter *adapter, > struct imx_i2c_struct *i2c_imx = i2c_get_adapdata(adapter); > > dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__); > - > +#ifdef CONFIG_I2C_DEBUG_BUS > + for (i = 0; i < num; i++) { > + printk(KERN_DEBUG "msg%d addr %02x RD %d cnt %d d:", i, > + msgs[i].addr, msgs[i].flags & I2C_M_RD, msgs[i].len); > + if (!(msgs[i].flags & I2C_M_RD)) { > + int j; > + for (j = 0; j < msgs[i].len; j++) > + printk("%02x ", msgs[i].buf[j]); > + } > + printk("\n"); > + } > +#endif > /* Start I2C transfer */ > result = i2c_imx_start(i2c_imx); > if (result) > @@ -404,8 +437,10 @@ static int i2c_imx_xfer(struct i2c_adapter *adapter, > temp |= I2CR_RSTA; > writeb(temp, i2c_imx->base + IMX_I2C_I2CR); > result = i2c_imx_bus_busy(i2c_imx, 1); > - if (result) > + if (result) { > + reg_dump(i2c_imx); > goto fail0; > + } > } > dev_dbg(&i2c_imx->adapter.dev, > "<%s> transfer message: %d\n", __func__, i); > @@ -562,7 +597,7 @@ static int __init i2c_imx_probe(struct platform_device *pdev) > res_size, i2c_imx->res->start); > dev_dbg(&i2c_imx->adapter.dev, "adapter name: \"%s\"\n", > i2c_imx->adapter.name); > - dev_dbg(&i2c_imx->adapter.dev, "IMX I2C adapter registered\n"); > + dev_info(&i2c_imx->adapter.dev, "IMX I2C adapter registered\n"); > > return 0; /* Return OK */ > > -- > 1.6.0.4 > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
WARNING: multiple messages have this Message-ID (diff)
From: s.hauer@pengutronix.de (Sascha Hauer) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/4] i2c: imx: add macros and printk to make debug easy Date: Thu, 1 Oct 2009 09:29:34 +0200 [thread overview] Message-ID: <20091001072934.GX27039@pengutronix.de> (raw) In-Reply-To: <1254359613-21210-3-git-send-email-linuxzsc@gmail.com> On Thu, Oct 01, 2009 at 09:13:32AM +0800, Richard Zhao wrote: > When CONFIG_I2C_DEBUG_BUS is enabled, it helps dump registers at operation > fail condition, and print i2c_msg to xfer. > > Signed-off-by: Richard Zhao <linuxzsc@gmail.com> Honestly I don't think we need this. It makes the driver too verbose for my taste. Sascha > > diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c > index c1e541c..87faea4 100644 > --- a/drivers/i2c/busses/i2c-imx.c > +++ b/drivers/i2c/busses/i2c-imx.c > @@ -125,6 +125,20 @@ struct imx_i2c_struct { > /** Functions for IMX I2C adapter driver *************************************** > *******************************************************************************/ > > +#ifdef CONFIG_I2C_DEBUG_BUS > +#define reg_dump(i2c_imx) \ > +{ \ > + printk(KERN_DEBUG "fun %s:%d ", __func__, __LINE__); \ > + printk(KERN_DEBUG "IADR %02x IFDR %02x I2CR %02x I2SR %02x\n", \ > + readb(i2c_imx->base + IMX_I2C_IADR), \ > + readb(i2c_imx->base + IMX_I2C_IFDR), \ > + readb(i2c_imx->base + IMX_I2C_I2CR), \ > + readb(i2c_imx->base + IMX_I2C_I2SR)); \ > +} > +#else > +#define reg_dump(i2c_imx) > +#endif > + > static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy) > { > unsigned long orig_jiffies = jiffies; > @@ -146,6 +160,7 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy) > if (time_after(jiffies, orig_jiffies + HZ / 1000)) { > dev_dbg(&i2c_imx->adapter.dev, > "<%s> I2C bus is busy\n", __func__); > + reg_dump(i2c_imx); > return -EIO; > } > schedule(); > @@ -164,9 +179,11 @@ static int i2c_imx_trx_complete(struct imx_i2c_struct *i2c_imx) > > if (unlikely(result < 0)) { > dev_dbg(&i2c_imx->adapter.dev, "<%s> result < 0\n", __func__); > + reg_dump(i2c_imx); > return result; > } else if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) { > dev_dbg(&i2c_imx->adapter.dev, "<%s> Timeout\n", __func__); > + reg_dump(i2c_imx); > return -ETIMEDOUT; > } > dev_dbg(&i2c_imx->adapter.dev, "<%s> TRX complete\n", __func__); > @@ -178,6 +195,7 @@ static int i2c_imx_acked(struct imx_i2c_struct *i2c_imx) > { > if (readb(i2c_imx->base + IMX_I2C_I2SR) & I2SR_RXAK) { > dev_dbg(&i2c_imx->adapter.dev, "<%s> No ACK\n", __func__); > + reg_dump(i2c_imx); > return -EIO; /* No ACK */ > } > > @@ -197,17 +215,20 @@ static int i2c_imx_start(struct imx_i2c_struct *i2c_imx) > writeb(I2CR_IEN, i2c_imx->base + IMX_I2C_I2CR); > > result = i2c_imx_bus_busy(i2c_imx, 0); > - if (result) > + if (result) { > + reg_dump(i2c_imx); > return result; > + } > > /* Start I2C transaction */ > temp = readb(i2c_imx->base + IMX_I2C_I2CR); > temp |= I2CR_MSTA; > writeb(temp, i2c_imx->base + IMX_I2C_I2CR); > result = i2c_imx_bus_busy(i2c_imx, 1); > - if (result) > + if (result) { > + reg_dump(i2c_imx); > return result; > - > + } > temp |= I2CR_IIEN | I2CR_MTX | I2CR_TXAK; > writeb(temp, i2c_imx->base + IMX_I2C_I2CR); > return result; > @@ -228,7 +249,8 @@ static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx) > */ > udelay(i2c_imx->disable_delay); > > - i2c_imx_bus_busy(i2c_imx, 0); > + if (i2c_imx_bus_busy(i2c_imx, 0)) > + reg_dump(i2c_imx); > > /* Disable I2C controller */ > writeb(0, i2c_imx->base + IMX_I2C_I2CR); > @@ -389,7 +411,18 @@ static int i2c_imx_xfer(struct i2c_adapter *adapter, > struct imx_i2c_struct *i2c_imx = i2c_get_adapdata(adapter); > > dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__); > - > +#ifdef CONFIG_I2C_DEBUG_BUS > + for (i = 0; i < num; i++) { > + printk(KERN_DEBUG "msg%d addr %02x RD %d cnt %d d:", i, > + msgs[i].addr, msgs[i].flags & I2C_M_RD, msgs[i].len); > + if (!(msgs[i].flags & I2C_M_RD)) { > + int j; > + for (j = 0; j < msgs[i].len; j++) > + printk("%02x ", msgs[i].buf[j]); > + } > + printk("\n"); > + } > +#endif > /* Start I2C transfer */ > result = i2c_imx_start(i2c_imx); > if (result) > @@ -404,8 +437,10 @@ static int i2c_imx_xfer(struct i2c_adapter *adapter, > temp |= I2CR_RSTA; > writeb(temp, i2c_imx->base + IMX_I2C_I2CR); > result = i2c_imx_bus_busy(i2c_imx, 1); > - if (result) > + if (result) { > + reg_dump(i2c_imx); > goto fail0; > + } > } > dev_dbg(&i2c_imx->adapter.dev, > "<%s> transfer message: %d\n", __func__, i); > @@ -562,7 +597,7 @@ static int __init i2c_imx_probe(struct platform_device *pdev) > res_size, i2c_imx->res->start); > dev_dbg(&i2c_imx->adapter.dev, "adapter name: \"%s\"\n", > i2c_imx->adapter.name); > - dev_dbg(&i2c_imx->adapter.dev, "IMX I2C adapter registered\n"); > + dev_info(&i2c_imx->adapter.dev, "IMX I2C adapter registered\n"); > > return 0; /* Return OK */ > > -- > 1.6.0.4 > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
next prev parent reply other threads:[~2009-10-01 7:29 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2009-10-01 1:13 [PATCH 1/4] i2c: imx: check busy bit when START/STOP Richard Zhao 2009-10-01 1:13 ` Richard Zhao [not found] ` <1254359613-21210-1-git-send-email-linuxzsc-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2009-10-01 1:13 ` [PATCH 2/4] i2c: imx: only imx1 needs disable delay Richard Zhao 2009-10-01 1:13 ` Richard Zhao [not found] ` <1254359613-21210-2-git-send-email-linuxzsc-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2009-10-01 1:13 ` [PATCH 3/4] i2c: imx: add macros and printk to make debug easy Richard Zhao 2009-10-01 1:13 ` Richard Zhao [not found] ` <1254359613-21210-3-git-send-email-linuxzsc-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2009-10-01 1:13 ` [PATCH 4/4] i2c: imx: disable clock when it's possible to save power Richard Zhao 2009-10-01 1:13 ` Richard Zhao [not found] ` <1254359613-21210-4-git-send-email-linuxzsc-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2009-10-01 7:34 ` Sascha Hauer 2009-10-01 7:34 ` Sascha Hauer [not found] ` <20091001073434.GY27039-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2009-10-01 7:56 ` Richard Zhao 2009-10-01 7:56 ` Richard Zhao [not found] ` <4e090d470910010056n56bff9f4l1fec703c2dde9edf-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2009-10-01 8:00 ` Sascha Hauer 2009-10-01 8:00 ` Sascha Hauer 2009-10-04 12:30 ` Richard Zhao 2009-10-01 7:29 ` Sascha Hauer [this message] 2009-10-01 7:29 ` [PATCH 3/4] i2c: imx: add macros and printk to make debug easy Sascha Hauer [not found] ` <20091001072934.GX27039-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2009-10-01 8:01 ` Richard Zhao 2009-10-01 8:01 ` Richard Zhao [not found] ` <4e090d470910010101r6839cc9ax4fe84f04a1afbb00-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2009-10-01 8:26 ` Sascha Hauer 2009-10-01 8:26 ` Sascha Hauer [not found] ` <20091001082610.GB27039-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2009-10-01 9:30 ` Richard Zhao 2009-10-01 9:30 ` Richard Zhao 2009-10-04 12:23 ` Richard Zhao 2009-10-01 7:26 ` [PATCH 2/4] i2c: imx: only imx1 needs disable delay Sascha Hauer 2009-10-01 7:26 ` Sascha Hauer 2009-10-01 7:52 ` Richard Zhao 2009-10-01 7:52 ` Richard Zhao [not found] ` <4e090d470910010052k37a0a4eep6d436e45e6524234-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2009-10-01 7:57 ` Sascha Hauer 2009-10-01 7:57 ` Sascha Hauer 2009-10-01 8:03 ` [PATCH 1/4] i2c: imx: check busy bit when START/STOP Richard Zhao 2009-10-01 8:03 ` Richard Zhao [not found] ` <4e090d470910010103o611d9fb2t3acf93632216fc88-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2009-10-01 8:38 ` Sascha Hauer 2009-10-01 8:38 ` Sascha Hauer [not found] ` <20091001083831.GD27039-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2009-10-01 9:11 ` Richard Zhao 2009-10-01 9:11 ` Richard Zhao [not found] ` <4e090d470910010211k4ce78763i1a5163ec6ea57fe8-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2009-10-01 9:52 ` Sascha Hauer 2009-10-01 9:52 ` Sascha Hauer [not found] ` <20091001095239.GE27039-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2009-10-01 14:54 ` Richard Zhao 2009-10-01 14:54 ` Richard Zhao [not found] ` <4e090d470910010754r1ebc4455u6220ccfd803491b0-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2009-10-01 16:37 ` Wolfram Sang 2009-10-01 16:37 ` Wolfram Sang [not found] ` <20091001163753.GA20103-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2009-10-02 0:57 ` Richard Zhao 2009-10-02 0:57 ` Richard Zhao [not found] ` <4e090d470910011757g261c693ehdca40ce43ebee2ec-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2009-10-02 7:26 ` Sascha Hauer 2009-10-02 7:26 ` Sascha Hauer [not found] ` <20091002072643.GH27039-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2009-10-02 8:17 ` Richard Zhao 2009-10-02 8:17 ` Richard Zhao [not found] ` <4e090d470910020117w620fda4cta7b26b912d01bc24-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2009-10-02 14:11 ` Wolfram Sang 2009-10-02 14:11 ` Wolfram Sang 2009-10-04 12:22 ` Richard Zhao -- strict thread matches above, loose matches on Subject: below -- 2009-09-30 5:55 Richard Zhao 2009-09-30 5:55 ` [PATCH 2/4] i2c: imx: only imx1 needs disable delay Richard Zhao [not found] ` <1254290106-29272-2-git-send-email-linuxzsc-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2009-09-30 5:55 ` [PATCH 3/4] i2c: imx: add macros and printk to make debug easy Richard Zhao
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20091001072934.GX27039@pengutronix.de \ --to=s.hauer-bicnvbalz9megne8c9+irq@public.gmane.org \ --cc=kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linuxzsc-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.