From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: linux-kernel@vger.kernel.org
Cc: Viresh Kumar <viresh.kumar@st.com>,
Vinod Koul <vinod.koul@intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH 7/9] dw_dmac: disable BLOCK interrupts
Date: Fri, 15 Jun 2012 10:05:11 +0300 [thread overview]
Message-ID: <1339743913-6236-8-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1339743913-6236-1-git-send-email-andriy.shevchenko@linux.intel.com>
Just to be sure we are in known state we disable the BLOCK interupts.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/dma/dw_dmac.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index cffe630..b2586bd 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -575,6 +575,7 @@ static irqreturn_t dw_dma_interrupt(int irq, void *dev_id)
/* Try to recover */
channel_clear_bit(dw, MASK.XFER, (1 << 8) - 1);
+ channel_clear_bit(dw, MASK.BLOCK, (1 << 8) - 1);
channel_clear_bit(dw, MASK.SRC_TRAN, (1 << 8) - 1);
channel_clear_bit(dw, MASK.DST_TRAN, (1 << 8) - 1);
channel_clear_bit(dw, MASK.ERROR, (1 << 8) - 1);
@@ -1376,6 +1377,7 @@ static void dw_dma_off(struct dw_dma *dw)
dma_writel(dw, CFG, 0);
channel_clear_bit(dw, MASK.XFER, dw->all_chan_mask);
+ channel_clear_bit(dw, MASK.BLOCK, dw->all_chan_mask);
channel_clear_bit(dw, MASK.SRC_TRAN, dw->all_chan_mask);
channel_clear_bit(dw, MASK.DST_TRAN, dw->all_chan_mask);
channel_clear_bit(dw, MASK.ERROR, dw->all_chan_mask);
@@ -1478,6 +1480,7 @@ static int __init dw_probe(struct platform_device *pdev)
/* Clear/disable all interrupts on all channels. */
dma_writel(dw, CLEAR.XFER, dw->all_chan_mask);
+ dma_writel(dw, CLEAR.BLOCK, dw->all_chan_mask);
dma_writel(dw, CLEAR.SRC_TRAN, dw->all_chan_mask);
dma_writel(dw, CLEAR.DST_TRAN, dw->all_chan_mask);
dma_writel(dw, CLEAR.ERROR, dw->all_chan_mask);
--
1.7.10
next prev parent reply other threads:[~2012-06-15 7:06 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 ` Andy Shevchenko [this message]
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 ` [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=1339743913-6236-8-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=vinod.koul@intel.com \
--cc=viresh.kumar@st.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