linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Joel Fernandes <joelf-l0cyMroinI0@public.gmane.org>
To: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>,
	Sekhar Nori <nsekhar-l0cyMroinI0@public.gmane.org>,
	Santosh Shilimkar
	<santosh.shilimkar-l0cyMroinI0@public.gmane.org>,
	Sricharan R <r.sricharan-l0cyMroinI0@public.gmane.org>,
	Rajendra Nayak <rnayak-l0cyMroinI0@public.gmane.org>,
	Lokesh Vutla <lokeshvutla-l0cyMroinI0@public.gmane.org>,
	Matt Porter <matt-agtwNxEcTQJWk0Htik3J/w@public.gmane.org>,
	Grant Likely
	<grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>,
	Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>,
	Vinod Koul <vinod.koul-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>,
	Dan Williams <djbw-b10kYP2dOMg@public.gmane.org>,
	Mark Brown <broonie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
	Benoit Cousson
	<benoit.cousson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
	Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>,
	Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>,
	Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>,
	Balaji TK <balajitk-l0cyMroinI0@public.gmane.org>,
	Gururaja Hebbar <gururaja.hebbar-l0cyMroinI0@public.gmane.org>,
	Chris Ball <cjb-2X9k7bc8m7Mdnm+yROfE0A@public.gmane.org>,
	Jason Kridner <jkridner-hcmAuCOw+vXj4SYmN/TMmA@public.gmane.org>
Cc: Linux DaVinci Kernel List
	<davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/@public.gmane.org>,
	Joel Fernandes <joelf-l0cyMroinI0@public.gmane.org>,
	Linux MMC List
	<linux-mmc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	Linux Kernel Mailing List
	<linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	Linux OMAP List
	<linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	Linux ARM Kernel List
	<linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>
Subject: [PATCH v3 01/12] dma: edma: Setup parameters to DMA MAX_NR_SG at a time
Date: Mon, 5 Aug 2013 11:14:46 -0500	[thread overview]
Message-ID: <1375719297-12871-2-git-send-email-joelf@ti.com> (raw)
In-Reply-To: <1375719297-12871-1-git-send-email-joelf-l0cyMroinI0@public.gmane.org>

Changes are made here for configuring existing parameters to support
DMA'ing them out in batches as needed.

Also allocate as many as slots as needed by the SG list, but not more
than MAX_NR_SG. Then these slots will be reused accordingly.
For ex, if MAX_NR_SG=10, and number of SG entries is 40, still only
10 slots will be allocated to DMA the entire SG list of size 40.

Signed-off-by: Joel Fernandes <joelf-l0cyMroinI0@public.gmane.org>
---
 drivers/dma/edma.c |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index 5f3e532..7b0853c 100644
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -222,9 +222,9 @@ static struct dma_async_tx_descriptor *edma_prep_slave_sg(
 	enum dma_slave_buswidth dev_width;
 	u32 burst;
 	struct scatterlist *sg;
-	int i;
 	int acnt, bcnt, ccnt, src, dst, cidx;
 	int src_bidx, dst_bidx, src_cidx, dst_cidx;
+	int i, num_slots_needed;
 
 	if (unlikely(!echan || !sgl || !sg_len))
 		return NULL;
@@ -262,8 +262,11 @@ static struct dma_async_tx_descriptor *edma_prep_slave_sg(
 
 	edesc->pset_nr = sg_len;
 
-	for_each_sg(sgl, sg, sg_len, i) {
-		/* Allocate a PaRAM slot, if needed */
+	/* Allocate a PaRAM slot, if needed */
+
+	num_slots_needed = sg_len > MAX_NR_SG ? MAX_NR_SG : sg_len;
+
+	for (i = 0; i < num_slots_needed; i++) {
 		if (echan->slot[i] < 0) {
 			echan->slot[i] =
 				edma_alloc_slot(EDMA_CTLR(echan->ch_num),
@@ -273,6 +276,10 @@ static struct dma_async_tx_descriptor *edma_prep_slave_sg(
 				return NULL;
 			}
 		}
+	}
+
+	/* Configure PaRAM sets for each SG */
+	for_each_sg(sgl, sg, sg_len, i) {
 
 		acnt = dev_width;
 
@@ -330,6 +337,7 @@ static struct dma_async_tx_descriptor *edma_prep_slave_sg(
 		/* Configure A or AB synchronized transfers */
 		if (edesc->absync)
 			edesc->pset[i].opt |= SYNCDIM;
+
 		/* If this is the last set, enable completion interrupt flag */
 		if (i == sg_len - 1)
 			edesc->pset[i].opt |= TCINTEN;
-- 
1.7.9.5

  parent reply	other threads:[~2013-08-05 16:14 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-05 16:14 [PATCH v3 00/12] edma: Add support for SG lists of any length Joel Fernandes
2013-08-05 16:14 ` [PATCH v3 03/12] dma: edma: remove limits on number of slots Joel Fernandes
     [not found]   ` <1375719297-12871-4-git-send-email-joelf-l0cyMroinI0@public.gmane.org>
2013-08-12  7:17     ` Sekhar Nori
2013-08-05 16:14 ` [PATCH v3 04/12] dma: edma: Write out and handle MAX_NR_SG at a given time Joel Fernandes
2013-08-05 16:14 ` [PATCH v3 05/12] ARM: edma: Add function to enable interrupt for a PaRAM slot Joel Fernandes
2013-08-05 16:14 ` [PATCH v3 06/12] ARM: edma: Add pr_debug in edma_link Joel Fernandes
2013-08-05 16:14 ` [PATCH v3 07/12] dma: edma: Add function to dump a PaRAM set from PaRAM Joel Fernandes
     [not found]   ` <1375719297-12871-8-git-send-email-joelf-l0cyMroinI0@public.gmane.org>
2013-08-12  5:52     ` Sekhar Nori
     [not found]       ` <52087824.60002-l0cyMroinI0@public.gmane.org>
2013-08-13  1:06         ` Joel Fernandes
2013-08-05 16:14 ` [PATCH v3 08/12] dma: edma: Add one more required slot to MAX slots Joel Fernandes
2013-08-12  5:56   ` Sekhar Nori
2013-08-12 13:31     ` Mark Brown
     [not found]       ` <20130812133111.GZ6427-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2013-08-12 18:19         ` Joel Fernandes
     [not found]     ` <52087921.8040101-l0cyMroinI0@public.gmane.org>
2013-08-13  1:08       ` Joel Fernandes
2013-08-05 16:14 ` [PATCH v3 09/12] dma: edma: Implement multiple linked sets for continuity Joel Fernandes
     [not found]   ` <1375719297-12871-10-git-send-email-joelf-l0cyMroinI0@public.gmane.org>
2013-08-12 18:56     ` Sekhar Nori
     [not found]       ` <52092FF7.7040508-l0cyMroinI0@public.gmane.org>
2013-08-13  1:00         ` Joel Fernandes
2013-08-05 16:14 ` [PATCH v3 10/12] dma: edma: Check if MAX_NR_SG is even in prep function Joel Fernandes
2013-08-05 16:14 ` [PATCH v3 11/12] dma: edma: Keep tracking of Pending interrupts (pending_acks) Joel Fernandes
2013-08-05 16:14 ` [PATCH v3 12/12] dma: edma: Return if nothing left todo in edma_execute Joel Fernandes
     [not found] ` <1375719297-12871-1-git-send-email-joelf-l0cyMroinI0@public.gmane.org>
2013-08-05 16:14   ` Joel Fernandes [this message]
     [not found]     ` <1375719297-12871-2-git-send-email-joelf-l0cyMroinI0@public.gmane.org>
2013-08-12  7:15       ` [PATCH v3 01/12] dma: edma: Setup parameters to DMA MAX_NR_SG at a time Sekhar Nori
     [not found]         ` <52088B8B.9040000-l0cyMroinI0@public.gmane.org>
2013-08-12 23:55           ` Joel Fernandes
     [not found]             ` <52097604.7010503-l0cyMroinI0@public.gmane.org>
2013-08-13  0:19               ` Joel Fernandes
2013-08-13  0:05           ` Joel Fernandes
2013-08-05 16:14   ` [PATCH v3 02/12] ARM: edma: Don't clear EMR of channel in edma_stop Joel Fernandes
     [not found]     ` <1375719297-12871-3-git-send-email-joelf-l0cyMroinI0@public.gmane.org>
2013-08-08 11:49       ` Sekhar Nori
     [not found]         ` <520385D3.1060408-l0cyMroinI0@public.gmane.org>
2013-08-12  4:25           ` Sekhar Nori
2013-08-12  4:29             ` Joel Fernandes
2013-08-12  6:24               ` Sekhar Nori
2013-08-16  5:57   ` [PATCH v3 00/12] edma: Add support for SG lists of any length 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=1375719297-12871-2-git-send-email-joelf@ti.com \
    --to=joelf-l0cymroini0@public.gmane.org \
    --cc=arnd-r2nGTMty4D4@public.gmane.org \
    --cc=balajitk-l0cyMroinI0@public.gmane.org \
    --cc=benoit.cousson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
    --cc=broonie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
    --cc=cjb-2X9k7bc8m7Mdnm+yROfE0A@public.gmane.org \
    --cc=davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/@public.gmane.org \
    --cc=djbw-b10kYP2dOMg@public.gmane.org \
    --cc=grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org \
    --cc=gururaja.hebbar-l0cyMroinI0@public.gmane.org \
    --cc=jkridner-hcmAuCOw+vXj4SYmN/TMmA@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org \
    --cc=linux-mmc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=lokeshvutla-l0cyMroinI0@public.gmane.org \
    --cc=matt-agtwNxEcTQJWk0Htik3J/w@public.gmane.org \
    --cc=nsekhar-l0cyMroinI0@public.gmane.org \
    --cc=olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org \
    --cc=r.sricharan-l0cyMroinI0@public.gmane.org \
    --cc=rnayak-l0cyMroinI0@public.gmane.org \
    --cc=rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org \
    --cc=santosh.shilimkar-l0cyMroinI0@public.gmane.org \
    --cc=tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org \
    --cc=vinod.koul-ral2JQCrhuEAvxtiuMwx3w@public.gmane.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 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).