From: Joel Fernandes <joelf@ti.com>
To: Tony Lindgren <tony@atomide.com>, Sekhar Nori <nsekhar@ti.com>,
Vinod Koul <vinod.koul@intel.com>,
Benoit Cousson <benoit.cousson@linaro.org>,
Balaji TK <balajitk@ti.com>, Arnd Bergmann <arnd@arndb.de>
Cc: Mark Jackson <mpfj-list@newflow.co.uk>,
Joel Fernandes <joelf@ti.com>,
Pantel Antoniou <panto@antoniou-consulting.com>,
Linux MMC List <linux-mmc@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Jason Kridner <jkridner@beagleboard.org>,
Linux OMAP List <linux-omap@vger.kernel.org>,
Linux ARM Kernel List <linux-arm-kernel@lists.infradead.org>
Subject: [PATCH v2] ARM: EDMA: Fix clearing of unused list for DT DMA resources
Date: Mon, 22 Jul 2013 12:59:49 -0500 [thread overview]
Message-ID: <1374515989-7391-1-git-send-email-joelf@ti.com> (raw)
HWMOD removal for MMC is breaking edma_start as the events are being manually
triggered due to unused channel list not being clear, Thanks to Balaji TK for
finding this issue.
This patch fixes the issue, by reading the "dmas" property from the DT node if
it exists and clearing the bits in the unused channel list.
Cc: Balaji T K <balajitk@ti.com>
Cc: Pantel Antoniou <panto@antoniou-consulting.com>
Signed-off-by: Joel Fernandes <joelf@ti.com>
---
v2 changes: Fixed compiler warning
arch/arm/common/edma.c | 31 +++++++++++++++++++++++--------
1 file changed, 23 insertions(+), 8 deletions(-)
diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
index a432e6c..765d578 100644
--- a/arch/arm/common/edma.c
+++ b/arch/arm/common/edma.c
@@ -561,14 +561,29 @@ static int reserve_contiguous_slots(int ctlr, unsigned int id,
static int prepare_unused_channel_list(struct device *dev, void *data)
{
struct platform_device *pdev = to_platform_device(dev);
- int i, ctlr;
-
- for (i = 0; i < pdev->num_resources; i++) {
- if ((pdev->resource[i].flags & IORESOURCE_DMA) &&
- (int)pdev->resource[i].start >= 0) {
- ctlr = EDMA_CTLR(pdev->resource[i].start);
- clear_bit(EDMA_CHAN_SLOT(pdev->resource[i].start),
- edma_cc[ctlr]->edma_unused);
+ int i = 0, ctlr;
+ u32 dma_chan;
+ const __be32 *dma_chan_p;
+ struct property *prop;
+
+ if (dev->of_node) {
+ of_property_for_each_u32(dev->of_node, "dmas", prop, \
+ dma_chan_p, dma_chan) {
+ if (i++ & 1) {
+ ctlr = EDMA_CTLR(dma_chan);
+ clear_bit(EDMA_CHAN_SLOT(dma_chan),
+ edma_cc[ctlr]->edma_unused);
+ }
+ }
+ } else {
+ for (; i < pdev->num_resources; i++) {
+ if ((pdev->resource[i].flags & IORESOURCE_DMA) &&
+ (int)pdev->resource[i].start >= 0) {
+ ctlr = EDMA_CTLR(pdev->resource[i].start);
+ clear_bit(EDMA_CHAN_SLOT(
+ pdev->resource[i].start),
+ edma_cc[ctlr]->edma_unused);
+ }
}
}
--
1.7.9.5
next reply other threads:[~2013-07-22 17:59 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-22 17:59 Joel Fernandes [this message]
2013-07-27 23:32 ` [PATCH v2] ARM: EDMA: Fix clearing of unused list for DT DMA resources Joel Fernandes
2013-07-29 7:04 ` Sekhar Nori
2013-07-30 3:53 ` Joel Fernandes
2013-07-30 4:52 ` Sekhar Nori
2013-07-30 5:05 ` Joel Fernandes
2013-07-29 7:01 ` Sekhar Nori
2013-07-30 3:47 ` Joel Fernandes
2013-07-30 16:29 ` Sekhar Nori
2013-07-31 5:06 ` Joel Fernandes
-- strict thread matches above, loose matches on Subject: below --
2013-08-23 19:53 Joel Fernandes
[not found] ` <1377287613-16491-1-git-send-email-joelf-l0cyMroinI0@public.gmane.org>
2013-08-26 10:46 ` Sekhar Nori
[not found] ` <521B3212.3050405-l0cyMroinI0@public.gmane.org>
2013-08-26 16:52 ` Joel Fernandes
[not found] ` <521B87C0.1090507-l0cyMroinI0@public.gmane.org>
2013-08-26 19:34 ` Sekhar Nori
2013-09-06 19:13 ` Mark Jackson
2013-09-06 19:15 ` Mark Jackson
[not found] ` <522A29CF.2090001-2FZW7xY0fHgqdlJmJB21zg@public.gmane.org>
2013-09-06 19:51 ` Joel Fernandes
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=1374515989-7391-1-git-send-email-joelf@ti.com \
--to=joelf@ti.com \
--cc=arnd@arndb.de \
--cc=balajitk@ti.com \
--cc=benoit.cousson@linaro.org \
--cc=jkridner@beagleboard.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=mpfj-list@newflow.co.uk \
--cc=nsekhar@ti.com \
--cc=panto@antoniou-consulting.com \
--cc=tony@atomide.com \
--cc=vinod.koul@intel.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;
as well as URLs for NNTP newsgroup(s).