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 10/10] dw_dmac: introduce dwc_chan_reset
Date: Tue, 19 Jun 2012 13:34:10 +0300 [thread overview]
Message-ID: <1340102050-12697-11-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1340102050-12697-1-git-send-email-andriy.shevchenko@linux.intel.com>
This piece of code is used often. Make it as a separate function.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/dma/dw_dmac.c | 32 ++++++++++++++------------------
1 file changed, 14 insertions(+), 18 deletions(-)
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index d3845ef..14fbee4 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -219,6 +219,14 @@ static void dwc_dump_chan_regs(struct dw_dma_chan *dwc)
channel_readl(dwc, CTL_LO));
}
+
+static inline void dwc_chan_reset(struct dw_dma *dw, struct dw_dma_chan *dwc)
+{
+ channel_clear_bit(dw, CH_EN, dwc->mask);
+ while (dma_readl(dw, CH_EN) & dwc->mask)
+ cpu_relax();
+}
+
/*----------------------------------------------------------------------*/
/* Called with dwc->lock held and bh disabled */
@@ -314,9 +322,7 @@ static void dwc_complete_all(struct dw_dma *dw, struct dw_dma_chan *dwc)
"BUG: XFER bit set, but channel not idle!\n");
/* Try to continue after resetting the channel... */
- channel_clear_bit(dw, CH_EN, dwc->mask);
- while (dma_readl(dw, CH_EN) & dwc->mask)
- cpu_relax();
+ dwc_chan_reset(dw, dwc);
}
/*
@@ -398,9 +404,7 @@ static void dwc_scan_descriptors(struct dw_dma *dw, struct dw_dma_chan *dwc)
"BUG: All descriptors done, but channel not idle!\n");
/* Try to continue after resetting the channel... */
- channel_clear_bit(dw, CH_EN, dwc->mask);
- while (dma_readl(dw, CH_EN) & dwc->mask)
- cpu_relax();
+ dwc_chan_reset(dw, dwc);
if (!list_empty(&dwc->queue)) {
list_move(dwc->queue.next, &dwc->active_list);
@@ -516,9 +520,7 @@ static void dwc_handle_cyclic(struct dw_dma *dw, struct dw_dma_chan *dwc,
dwc_dump_chan_regs(dwc);
- channel_clear_bit(dw, CH_EN, dwc->mask);
- while (dma_readl(dw, CH_EN) & dwc->mask)
- cpu_relax();
+ dwc_chan_reset(dw, dwc);
/* make sure DMA does not restart by loading a new list */
channel_writel(dwc, LLP, 0);
@@ -948,9 +950,7 @@ static int dwc_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
} else if (cmd == DMA_TERMINATE_ALL) {
spin_lock_irqsave(&dwc->lock, flags);
- channel_clear_bit(dw, CH_EN, dwc->mask);
- while (dma_readl(dw, CH_EN) & dwc->mask)
- cpu_relax();
+ dwc_chan_reset(dw, dwc);
dwc->paused = false;
@@ -1158,9 +1158,7 @@ void dw_dma_cyclic_stop(struct dma_chan *chan)
spin_lock_irqsave(&dwc->lock, flags);
- channel_clear_bit(dw, CH_EN, dwc->mask);
- while (dma_readl(dw, CH_EN) & dwc->mask)
- cpu_relax();
+ dwc_chan_reset(dw, dwc);
spin_unlock_irqrestore(&dwc->lock, flags);
}
@@ -1338,9 +1336,7 @@ void dw_dma_cyclic_free(struct dma_chan *chan)
spin_lock_irqsave(&dwc->lock, flags);
- channel_clear_bit(dw, CH_EN, dwc->mask);
- while (dma_readl(dw, CH_EN) & dwc->mask)
- cpu_relax();
+ dwc_chan_reset(dw, dwc);
dma_writel(dw, CLEAR.ERROR, dwc->mask);
dma_writel(dw, CLEAR.XFER, dwc->mask);
--
1.7.10
next prev parent reply other threads:[~2012-06-19 10:35 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 ` [PATCHv2 03/10] dw_dmac: introduce dwc_dump_chan_regs to dump registers Andy Shevchenko
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 ` Andy Shevchenko [this message]
2012-06-19 10:39 ` [PATCHv2 10/10] dw_dmac: introduce dwc_chan_reset 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-11-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 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.