From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: linux-kernel@vger.kernel.org
Cc: Viresh Kumar <viresh.linux@gmail.com>,
Vinod Koul <vinod.koul@intel.com>,
Dan Williams <dan.j.williams@intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCHv2 03/10] dw_dmac: introduce dwc_dump_chan_regs to dump registers
Date: Tue, 19 Jun 2012 13:34:03 +0300 [thread overview]
Message-ID: <1340102050-12697-4-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1340102050-12697-1-git-send-email-andriy.shevchenko@linux.intel.com>
There is three places where values of the most significant registers were
printed. Make such piece of code as separate function.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/dma/dw_dmac.c | 37 ++++++++++++++++---------------------
1 file changed, 16 insertions(+), 21 deletions(-)
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index 45861b6..b6251dc 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -193,6 +193,19 @@ static void dwc_initialize(struct dw_dma_chan *dwc)
/*----------------------------------------------------------------------*/
+static void dwc_dump_chan_regs(struct dw_dma_chan *dwc)
+{
+ dev_err(chan2dev(&dwc->chan),
+ " SAR: 0x%x DAR: 0x%x LLP: 0x%x CTL: 0x%x:%08x\n",
+ channel_readl(dwc, SAR),
+ channel_readl(dwc, DAR),
+ channel_readl(dwc, LLP),
+ channel_readl(dwc, CTL_HI),
+ channel_readl(dwc, CTL_LO));
+}
+
+/*----------------------------------------------------------------------*/
+
/* Called with dwc->lock held and bh disabled */
static void dwc_dostart(struct dw_dma_chan *dwc, struct dw_desc *first)
{
@@ -202,13 +215,7 @@ static void dwc_dostart(struct dw_dma_chan *dwc, struct dw_desc *first)
if (dma_readl(dw, CH_EN) & dwc->mask) {
dev_err(chan2dev(&dwc->chan),
"BUG: Attempted to start non-idle channel\n");
- dev_err(chan2dev(&dwc->chan),
- " SAR: 0x%x DAR: 0x%x LLP: 0x%x CTL: 0x%x:%08x\n",
- channel_readl(dwc, SAR),
- channel_readl(dwc, DAR),
- channel_readl(dwc, LLP),
- channel_readl(dwc, CTL_HI),
- channel_readl(dwc, CTL_LO));
+ dwc_dump_chan_regs(dwc);
/* The tasklet will hopefully advance the queue... */
return;
@@ -492,13 +499,7 @@ static void dwc_handle_cyclic(struct dw_dma *dw, struct dw_dma_chan *dwc,
spin_lock_irqsave(&dwc->lock, flags);
- dev_err(chan2dev(&dwc->chan),
- " SAR: 0x%x DAR: 0x%x LLP: 0x%x CTL: 0x%x:%08x\n",
- channel_readl(dwc, SAR),
- channel_readl(dwc, DAR),
- channel_readl(dwc, LLP),
- channel_readl(dwc, CTL_HI),
- channel_readl(dwc, CTL_LO));
+ dwc_dump_chan_regs(dwc);
channel_clear_bit(dw, CH_EN, dwc->mask);
while (dma_readl(dw, CH_EN) & dwc->mask)
@@ -1133,13 +1134,7 @@ int dw_dma_cyclic_start(struct dma_chan *chan)
if (dma_readl(dw, CH_EN) & dwc->mask) {
dev_err(chan2dev(&dwc->chan),
"BUG: Attempted to start non-idle channel\n");
- dev_err(chan2dev(&dwc->chan),
- " SAR: 0x%x DAR: 0x%x LLP: 0x%x CTL: 0x%x:%08x\n",
- channel_readl(dwc, SAR),
- channel_readl(dwc, DAR),
- channel_readl(dwc, LLP),
- channel_readl(dwc, CTL_HI),
- channel_readl(dwc, CTL_LO));
+ dwc_dump_chan_regs(dwc);
spin_unlock_irqrestore(&dwc->lock, flags);
return -EBUSY;
}
--
1.7.10
next prev parent reply other threads:[~2012-06-19 10:34 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-15 7:05 [PATCH 0/9] dw_dmac: set of cleanups and small fixes Andy Shevchenko
2012-06-15 7:05 ` [PATCH 1/9] dw_dmac: fix constant in the comment Andy Shevchenko
2012-06-15 7:05 ` [PATCH 2/9] dw_dmac: use proper casting to print dma_addr_t values Andy Shevchenko
2012-06-15 7:05 ` [PATCH 3/9] dw_dmac: introduce dwc_dump_chan_regs to dump registers Andy Shevchenko
2012-06-15 7:05 ` [PATCH 4/9] dw_dmac: print correct number of scanned descriptors Andy Shevchenko
2012-06-15 7:05 ` [PATCH 5/9] dw_dmac: use __func__ constant in the debug prints Andy Shevchenko
2012-06-15 7:05 ` [PATCH 6/9] dw_dmac: disable dma in optimal way in probe Andy Shevchenko
2012-06-15 7:05 ` [PATCH 7/9] dw_dmac: disable BLOCK interrupts Andy Shevchenko
2012-06-15 7:05 ` [PATCH 8/9] dw_dmac: introduce dwc_fast_fls() Andy Shevchenko
2012-06-15 7:05 ` [PATCH 9/9] dw_dmac: move from __init to __devinit Andy Shevchenko
2012-06-19 10:34 ` [PATCHv2 00/10] dw_dmac: set of cleanups and small fixes Andy Shevchenko
2012-06-19 10:34 ` [PATCHv2 01/10] dw_dmac: fix constant in the comment Andy Shevchenko
2012-06-19 10:34 ` [PATCHv2 02/10] dw_dmac: use proper casting to print dma_addr_t values Andy Shevchenko
2012-06-19 10:34 ` Andy Shevchenko [this message]
2012-06-19 10:34 ` [PATCHv2 04/10] dw_dmac: print correct number of scanned descriptors Andy Shevchenko
2012-06-19 10:34 ` [PATCHv2 05/10] dw_dmac: use __func__ constant in the debug prints Andy Shevchenko
2012-06-19 10:34 ` [PATCHv2 06/10] dw_dmac: disable dma in optimal way in probe Andy Shevchenko
2012-06-19 10:34 ` [PATCHv2 07/10] dw_dmac: disable BLOCK interrupts Andy Shevchenko
2012-06-19 10:34 ` [PATCHv2 08/10] dw_dmac: introduce dwc_fast_fls() Andy Shevchenko
2012-06-19 10:34 ` [PATCHv2 09/10] dw_dmac: move from __init to __devinit Andy Shevchenko
2012-06-19 10:34 ` [PATCHv2 10/10] dw_dmac: introduce dwc_chan_reset Andy Shevchenko
2012-06-19 10:39 ` viresh kumar
2012-06-19 10:46 ` [PATCHv2.1] dw_dmac: introduce dwc_chan_disable Andy Shevchenko
2012-06-19 10:52 ` viresh kumar
2012-06-21 2:39 ` Vinod Koul
2012-06-19 10:40 ` [PATCHv2 00/10] dw_dmac: set of cleanups and small fixes viresh kumar
2012-06-21 2:39 ` Vinod Koul
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=1340102050-12697-4-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=dan.j.williams@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=vinod.koul@intel.com \
--cc=viresh.linux@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox