From: vaibhav.hiremath@linaro.org (Vaibhav Hiremath)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH-V2 06/12] i2c: pxa: Update debug function to dump more info on error
Date: Mon, 15 Jun 2015 21:19:53 +0530 [thread overview]
Message-ID: <1434383399-2370-7-git-send-email-vaibhav.hiremath@linaro.org> (raw)
In-Reply-To: <1434383399-2370-1-git-send-email-vaibhav.hiremath@linaro.org>
Update i2c_pxa_scream_blue_murder() fn to print more information
in case of error.
Also, use dev_err variants instead of printk.
Signed-off-by: Jett.Zhou <jtzhou@marvell.com>
Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
Cc: Wolfram Sang <wsa@the-dreams.de>
---
drivers/i2c/busses/i2c-pxa.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 810e9d0..b8b3856 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -132,6 +132,7 @@ struct pxa_i2c {
unsigned int msg_idx;
unsigned int msg_ptr;
unsigned int slave_addr;
+ unsigned int req_slave_addr;
struct i2c_adapter adap;
struct clk *clk;
@@ -255,15 +256,20 @@ static void i2c_pxa_show_state(struct pxa_i2c *i2c, int lno, const char *fname)
static void i2c_pxa_scream_blue_murder(struct pxa_i2c *i2c, const char *why)
{
unsigned int i;
- printk(KERN_ERR "i2c: error: %s\n", why);
- printk(KERN_ERR "i2c: msg_num: %d msg_idx: %d msg_ptr: %d\n",
+ struct device *dev = &i2c->adap.dev;
+
+ dev_err(dev, "slave_0x%x error: %s\n",
+ i2c->req_slave_addr >> 1, why);
+ dev_err(dev, "msg_num: %d msg_idx: %d msg_ptr: %d\n",
i2c->msg_num, i2c->msg_idx, i2c->msg_ptr);
- printk(KERN_ERR "i2c: ICR: %08x ISR: %08x\n",
- readl(_ICR(i2c)), readl(_ISR(i2c)));
- printk(KERN_DEBUG "i2c: log: ");
+ dev_err(dev, "IBMR: %08x IDBR: %08x ICR: %08x ISR: %08x\n",
+ readl(_IBMR(i2c)), readl(_IDBR(i2c)), readl(_ICR(i2c)),
+ readl(_ISR(i2c)));
+ dev_dbg(dev, "log: ");
for (i = 0; i < i2c->irqlogidx; i++)
- printk("[%08x:%08x] ", i2c->isrlog[i], i2c->icrlog[i]);
- printk("\n");
+ pr_debug("[%08x:%08x] ", i2c->isrlog[i], i2c->icrlog[i]);
+
+ pr_debug("\n");
}
#else /* ifdef DEBUG */
@@ -640,6 +646,7 @@ static inline void i2c_pxa_start_message(struct pxa_i2c *i2c)
* Step 1: target slave address into IDBR
*/
writel(i2c_pxa_addr_byte(i2c->msg), _IDBR(i2c));
+ i2c->req_slave_addr = i2c_pxa_addr_byte(i2c->msg);
/*
* Step 2: initiate the write.
@@ -959,6 +966,7 @@ static void i2c_pxa_irq_txempty(struct pxa_i2c *i2c, u32 isr)
* Write the next address.
*/
writel(i2c_pxa_addr_byte(i2c->msg), _IDBR(i2c));
+ i2c->req_slave_addr = i2c_pxa_addr_byte(i2c->msg);
/*
* And trigger a repeated start, and send the byte.
--
1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Vaibhav Hiremath <vaibhav.hiremath-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
To: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org,
robert.jarzmik-GANU6spQydw@public.gmane.org,
Vaibhav Hiremath
<vaibhav.hiremath-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
"Jett.Zhou" <jtzhou-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>
Subject: [PATCH-V2 06/12] i2c: pxa: Update debug function to dump more info on error
Date: Mon, 15 Jun 2015 21:19:53 +0530 [thread overview]
Message-ID: <1434383399-2370-7-git-send-email-vaibhav.hiremath@linaro.org> (raw)
In-Reply-To: <1434383399-2370-1-git-send-email-vaibhav.hiremath-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Update i2c_pxa_scream_blue_murder() fn to print more information
in case of error.
Also, use dev_err variants instead of printk.
Signed-off-by: Jett.Zhou <jtzhou-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>
Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>
---
drivers/i2c/busses/i2c-pxa.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 810e9d0..b8b3856 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -132,6 +132,7 @@ struct pxa_i2c {
unsigned int msg_idx;
unsigned int msg_ptr;
unsigned int slave_addr;
+ unsigned int req_slave_addr;
struct i2c_adapter adap;
struct clk *clk;
@@ -255,15 +256,20 @@ static void i2c_pxa_show_state(struct pxa_i2c *i2c, int lno, const char *fname)
static void i2c_pxa_scream_blue_murder(struct pxa_i2c *i2c, const char *why)
{
unsigned int i;
- printk(KERN_ERR "i2c: error: %s\n", why);
- printk(KERN_ERR "i2c: msg_num: %d msg_idx: %d msg_ptr: %d\n",
+ struct device *dev = &i2c->adap.dev;
+
+ dev_err(dev, "slave_0x%x error: %s\n",
+ i2c->req_slave_addr >> 1, why);
+ dev_err(dev, "msg_num: %d msg_idx: %d msg_ptr: %d\n",
i2c->msg_num, i2c->msg_idx, i2c->msg_ptr);
- printk(KERN_ERR "i2c: ICR: %08x ISR: %08x\n",
- readl(_ICR(i2c)), readl(_ISR(i2c)));
- printk(KERN_DEBUG "i2c: log: ");
+ dev_err(dev, "IBMR: %08x IDBR: %08x ICR: %08x ISR: %08x\n",
+ readl(_IBMR(i2c)), readl(_IDBR(i2c)), readl(_ICR(i2c)),
+ readl(_ISR(i2c)));
+ dev_dbg(dev, "log: ");
for (i = 0; i < i2c->irqlogidx; i++)
- printk("[%08x:%08x] ", i2c->isrlog[i], i2c->icrlog[i]);
- printk("\n");
+ pr_debug("[%08x:%08x] ", i2c->isrlog[i], i2c->icrlog[i]);
+
+ pr_debug("\n");
}
#else /* ifdef DEBUG */
@@ -640,6 +646,7 @@ static inline void i2c_pxa_start_message(struct pxa_i2c *i2c)
* Step 1: target slave address into IDBR
*/
writel(i2c_pxa_addr_byte(i2c->msg), _IDBR(i2c));
+ i2c->req_slave_addr = i2c_pxa_addr_byte(i2c->msg);
/*
* Step 2: initiate the write.
@@ -959,6 +966,7 @@ static void i2c_pxa_irq_txempty(struct pxa_i2c *i2c, u32 isr)
* Write the next address.
*/
writel(i2c_pxa_addr_byte(i2c->msg), _IDBR(i2c));
+ i2c->req_slave_addr = i2c_pxa_addr_byte(i2c->msg);
/*
* And trigger a repeated start, and send the byte.
--
1.9.1
next prev parent reply other threads:[~2015-06-15 15:49 UTC|newest]
Thread overview: 125+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <vaibhav.hiremath@linaro.org>
2015-06-02 18:45 ` [PATCH-RESEND 0/3] i2c: core/pxa: Add support for hardware lock Vaibhav Hiremath
2015-06-02 18:45 ` Vaibhav Hiremath
2015-06-02 18:45 ` [PATCH-RESEND 1/3] i2c: core: append hardware lock with bus lock Vaibhav Hiremath
2015-06-02 18:45 ` Vaibhav Hiremath
2015-06-02 18:45 ` [PATCH-RESEND 2/3] i2c: pxa: Add support for hardware lock Vaibhav Hiremath
2015-06-02 18:45 ` Vaibhav Hiremath
2015-06-02 18:45 ` [PATCH-RESEND 3/3] i2c: pxa: Add pin ctrl support for CP core access Vaibhav Hiremath
2015-06-02 18:45 ` Vaibhav Hiremath
2015-06-16 8:28 ` [PATCH-RESEND 0/3] i2c: core/pxa: Add support for hardware lock Vaibhav Hiremath
2015-06-16 8:28 ` Vaibhav Hiremath
2015-07-07 6:43 ` Vaibhav Hiremath
2015-07-07 6:43 ` Vaibhav Hiremath
2015-10-25 9:52 ` Wolfram Sang
2015-10-25 9:52 ` Wolfram Sang
2015-06-15 15:49 ` [PATCH-V2 00/12] i2c: pxa: Fixes, cleanup and support for pxa910 family Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-06-15 15:49 ` [PATCH-V2 01/12] i2c: pxa: keep i2c irq ON in suspend Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-06-15 15:49 ` [PATCH-V2 02/12] i2c: pxa: No need to set slave addr for i2c master mode reset Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-07-03 20:58 ` Robert Jarzmik
2015-07-03 20:58 ` Robert Jarzmik
2015-06-15 15:49 ` [PATCH-V2 03/12] i2c: pxa: Return I2C_RETRY when timeout in pio mode Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-06-16 5:31 ` Shubhrajyoti Datta
2015-06-16 5:31 ` Shubhrajyoti Datta
2015-06-16 7:41 ` Vaibhav Hiremath
2015-06-16 7:41 ` Vaibhav Hiremath
2015-07-03 21:07 ` Robert Jarzmik
2015-07-03 21:07 ` Robert Jarzmik
2015-06-15 15:49 ` [PATCH-V2 04/12] i2c: pxa: Reset i2c controller on timeout in interrupt and " Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-07-03 15:27 ` Robert Jarzmik
2015-07-03 15:27 ` Robert Jarzmik
2015-07-03 18:13 ` Vaibhav Hiremath
2015-07-03 18:13 ` Vaibhav Hiremath
2015-06-15 15:49 ` [PATCH-V2 05/12] i2c: pxa: Remove compile warnning in 64bit mode Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath [this message]
2015-06-15 15:49 ` [PATCH-V2 06/12] i2c: pxa: Update debug function to dump more info on error Vaibhav Hiremath
2015-06-15 15:49 ` [PATCH-V2 07/12] i2c:pxa: Use devm_ variants in probe function Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-07-03 15:28 ` Robert Jarzmik
2015-07-03 15:28 ` Robert Jarzmik
2015-07-03 18:14 ` Vaibhav Hiremath
2015-07-03 18:14 ` Vaibhav Hiremath
2015-06-15 15:49 ` [PATCH-V2 08/12] i2c: pxa: enable/disable i2c module across msg xfer Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-07-03 15:28 ` Robert Jarzmik
2015-07-03 15:28 ` Robert Jarzmik
2015-07-03 18:23 ` Vaibhav Hiremath
2015-07-03 18:23 ` Vaibhav Hiremath
2015-07-03 18:48 ` Vaibhav Hiremath
2015-07-03 18:48 ` Vaibhav Hiremath
2015-07-03 19:44 ` Robert Jarzmik
2015-07-03 19:44 ` Robert Jarzmik
2015-06-15 15:49 ` [PATCH-V2 09/12] Documentation: binding: add new property 'disable_after_xfer' to i2c-pxa Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-06-15 15:49 ` [PATCH-V2 10/12] i2c: pxa: Add support for pxa910/988 & new configuration features Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-06-15 15:49 ` [PATCH-V2 11/12] i2c: pxa: Add ILCR (tLow & tHigh) configuration support Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-07-03 15:28 ` Robert Jarzmik
2015-07-03 15:28 ` Robert Jarzmik
2015-07-03 18:17 ` Vaibhav Hiremath
2015-07-03 18:17 ` Vaibhav Hiremath
2015-06-15 15:49 ` [PATCH-V2 12/12] Documentation: binding: add sclk adjustment properties to i2c-pxa Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-06-16 13:22 ` Rob Herring
2015-06-16 13:22 ` Rob Herring
2015-06-16 14:25 ` Vaibhav Hiremath
2015-06-16 14:25 ` Vaibhav Hiremath
2015-06-29 8:52 ` [PATCH-V2 00/12] i2c: pxa: Fixes, cleanup and support for pxa910 family Vaibhav Hiremath
2015-06-29 8:52 ` Vaibhav Hiremath
2015-07-02 16:54 ` Vaibhav Hiremath
2015-07-02 16:54 ` Vaibhav Hiremath
2015-06-17 18:58 [PATCH-v2 0/3] mfd: 88pm800: Add Device tree support Vaibhav Hiremath
2015-06-17 18:58 ` Vaibhav Hiremath
2015-06-17 18:58 ` [rtc-linux] " Vaibhav Hiremath
2015-06-17 18:58 ` [PATCH-v2 1/3] mfd: 88pm800: Add device " Vaibhav Hiremath
2015-06-17 18:58 ` Vaibhav Hiremath
2015-06-17 18:58 ` [rtc-linux] " Vaibhav Hiremath
2015-06-17 18:58 ` Vaibhav Hiremath
2015-06-17 18:58 ` [PATCH-v2] rtc: 88pm80x: add " Vaibhav Hiremath
2015-06-17 18:58 ` Vaibhav Hiremath
2015-06-17 18:58 ` [rtc-linux] " Vaibhav Hiremath
2015-06-20 0:43 ` Alexandre Belloni
2015-06-20 0:43 ` Alexandre Belloni
2015-06-20 0:43 ` Alexandre Belloni
2015-06-20 0:43 ` Alexandre Belloni
2015-06-25 7:46 ` Vaibhav Hiremath
2015-06-25 7:46 ` Vaibhav Hiremath
2015-06-25 7:46 ` Vaibhav Hiremath
2015-06-25 7:46 ` Vaibhav Hiremath
2015-07-07 6:37 ` Vaibhav Hiremath
2015-07-07 6:37 ` Vaibhav Hiremath
2015-07-07 6:37 ` Vaibhav Hiremath
2015-07-07 6:37 ` Vaibhav Hiremath
2015-06-17 18:58 ` [PATCH-v2 2/3] mfd: 88pm800: Allow configuration of interrupt clear method Vaibhav Hiremath
2015-06-17 18:58 ` Vaibhav Hiremath
2015-06-17 18:58 ` [rtc-linux] " Vaibhav Hiremath
2015-06-17 18:58 ` Vaibhav Hiremath
2015-06-17 18:58 ` [PATCH-v2 3/3] mfd: devicetree: bindings: Add new 88pm800 mfd binding Vaibhav Hiremath
2015-06-17 18:58 ` Vaibhav Hiremath
2015-06-17 18:58 ` [rtc-linux] " Vaibhav Hiremath
2015-06-17 18:58 ` Vaibhav Hiremath
2015-06-23 15:37 ` Rob Herring
2015-06-23 15:37 ` Rob Herring
2015-06-23 15:37 ` [rtc-linux] " Rob Herring
2015-06-23 15:37 ` Rob Herring
2015-06-23 17:02 ` Vaibhav Hiremath
2015-06-23 17:02 ` Vaibhav Hiremath
2015-06-23 17:02 ` [rtc-linux] " Vaibhav Hiremath
2015-06-24 0:29 ` Krzysztof Kozlowski
2015-06-24 0:29 ` Krzysztof Kozlowski
2015-06-24 0:29 ` [rtc-linux] " Krzysztof Kozlowski
2015-06-24 0:29 ` Krzysztof Kozlowski
2015-06-24 5:19 ` Vaibhav Hiremath
2015-06-24 5:19 ` Vaibhav Hiremath
2015-06-24 5:19 ` [rtc-linux] " Vaibhav Hiremath
2015-06-24 5:19 ` Vaibhav Hiremath
2015-06-23 5:07 ` [PATCH-v2 0/3] mfd: 88pm800: Add Device tree support Vaibhav Hiremath
2015-06-23 5:07 ` Vaibhav Hiremath
2015-06-23 5:07 ` [rtc-linux] " Vaibhav Hiremath
2015-06-23 5:07 ` Vaibhav Hiremath
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=1434383399-2370-7-git-send-email-vaibhav.hiremath@linaro.org \
--to=vaibhav.hiremath@linaro.org \
--cc=linux-arm-kernel@lists.infradead.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: link
Be 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.