linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
To: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
Subject: [PATCH 5/5] musb: dma: use optimal transfer element for sdma
Date: Wed, 12 May 2010 17:19:39 +0530	[thread overview]
Message-ID: <1273664979-493-5-git-send-email-ajay.gupta@ti.com> (raw)
In-Reply-To: <1273664979-493-4-git-send-email-ajay.gupta-l0cyMroinI0@public.gmane.org>

Use optimal values of transfer element based on buffer address in system
DMA programming. This would improve the performance.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
---
 drivers/usb/musb/musbhsdma.c |   39 +++++++++++++++++++++++++++++++++------
 1 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
index 6118d5f..a0da178 100644
--- a/drivers/usb/musb/musbhsdma.c
+++ b/drivers/usb/musb/musbhsdma.c
@@ -230,6 +230,8 @@ static void configure_channel(struct dma_channel *channel,
 	u8 buffer_is_aligned = (dma_addr & 0x3) ? 0 : 1;
 	u8 use_sdma = (musb_channel->sysdma_channel == -1) ? 0 : 1;
 	u16 csr = 0;
+	u16 frame = len;
+	int data_type = OMAP_DMA_DATA_TYPE_S8;
 
 	DBG(4, "%p, pkt_sz %d, addr 0x%x, len %d, mode %d\n",
 			channel, packet_sz, dma_addr, len, mode);
@@ -238,13 +240,38 @@ static void configure_channel(struct dma_channel *channel,
 			(musb->hwvers >= MUSB_HWVERS_1800))
 		use_sdma = 0;
 
+	if (use_sdma) {
+		switch (dma_addr & 0x3) {
+		case 0:
+			if ((len % 4) == 0) {
+				data_type = OMAP_DMA_DATA_TYPE_S32;
+				frame = len / 4;
+				break;
+			}
+			/* FALLTHROUGH */
+		case 2:
+			if ((len % 2) == 0) {
+				data_type = OMAP_DMA_DATA_TYPE_S16;
+				frame = len / 2;
+				break;
+			}
+			/* FALLTHROUGH */
+		case 1:
+		case 3:
+		default:
+			data_type = OMAP_DMA_DATA_TYPE_S8;
+			frame = len;
+			break;
+		}
+	}
+
 	if (use_sdma &&	!musb_channel->transmit) {
 		/* System DMA */
 		/* RX: set src = FIFO */
 		omap_set_dma_transfer_params(musb_channel->sysdma_channel,
-					OMAP_DMA_DATA_TYPE_S8,
-					len ? len : 1, 1, /* One frame */
-					OMAP_DMA_SYNC_ELEMENT,
+					data_type,
+					len ? frame : 1, 1, /* One frame */
+					OMAP_DMA_SYNC_FRAME,
 					OMAP24XX_DMA_NO_DEVICE,
 					0); /* Src Sync */
 
@@ -268,9 +295,9 @@ static void configure_channel(struct dma_channel *channel,
 		/* System DMA */
 		/* TX: set dst = FIFO */
 		omap_set_dma_transfer_params(musb_channel->sysdma_channel,
-					OMAP_DMA_DATA_TYPE_S8,
-					len ? len : 1, 1, /* One frame */
-					OMAP_DMA_SYNC_ELEMENT,
+					data_type,
+					len ? frame : 1, 1, /* One frame */
+					OMAP_DMA_SYNC_FRAME,
 					OMAP24XX_DMA_NO_DEVICE,
 					0); /* Src Sync */
 
-- 
1.6.2.4

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2010-05-12 11:49 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-12 11:49 [PATCH 1/5] musb: save OTG base physical address Ajay Kumar Gupta
2010-05-12 11:49 ` [PATCH 2/5] musb: use system DMA to fix Inventra DMA issue on RTL-1.4 Ajay Kumar Gupta
     [not found]   ` <1273664979-493-2-git-send-email-ajay.gupta-l0cyMroinI0@public.gmane.org>
2010-05-12 11:49     ` [PATCH 3/5] musb: add function to check if Inventra DMA used Ajay Kumar Gupta
     [not found]       ` <1273664979-493-3-git-send-email-ajay.gupta-l0cyMroinI0@public.gmane.org>
2010-05-12 11:49         ` [PATCH 4/5] musb: use system DMA for unaligned buffers on RTL >= 1.8 Ajay Kumar Gupta
     [not found]           ` <1273664979-493-4-git-send-email-ajay.gupta-l0cyMroinI0@public.gmane.org>
2010-05-12 11:49             ` Ajay Kumar Gupta [this message]
2010-05-12 13:18             ` Sergei Shtylyov
2010-05-12 13:55               ` Gupta, Ajay Kumar
2010-05-12 14:59                 ` Sergei Shtylyov
     [not found]                   ` <4BEAC268.1080601-hkdhdckH98+B+jHODAdFcQ@public.gmane.org>
2010-05-12 17:55                     ` Felipe Balbi
2010-05-13  4:14                       ` Gupta, Ajay Kumar
     [not found]                         ` <19F8576C6E063C45BE387C64729E7394044E40516A-/tLxBxkBPtCIQmiDNMet8wC/G2K4zDHf@public.gmane.org>
2010-05-13 19:43                           ` Felipe Balbi
2010-05-14  4:39                             ` Gupta, Ajay Kumar
2010-05-12 17:54             ` Felipe Balbi
2010-05-13  4:13               ` Gupta, Ajay Kumar
     [not found]                 ` <19F8576C6E063C45BE387C64729E7394044E405169-/tLxBxkBPtCIQmiDNMet8wC/G2K4zDHf@public.gmane.org>
2010-05-14 11:06                   ` Felipe Balbi
2010-05-14 11:39                     ` Gupta, Ajay Kumar
2010-05-12 17:52       ` [PATCH 3/5] musb: add function to check if Inventra DMA used Felipe Balbi
2010-05-12 17:51     ` [PATCH 2/5] musb: use system DMA to fix Inventra DMA issue on RTL-1.4 Felipe Balbi
2010-05-12 17:56       ` Gadiyar, Anand
     [not found]         ` <5A47E75E594F054BAF48C5E4FC4B92AB03216237DA-/tLxBxkBPtCIQmiDNMet8wC/G2K4zDHf@public.gmane.org>
2010-05-13  4:22           ` Gupta, Ajay Kumar
2010-05-13  8:58             ` Kalliguddi, Hema
2010-05-13 10:10               ` Gupta, Ajay Kumar
2010-05-13 11:57                 ` Kalliguddi, Hema

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=1273664979-493-5-git-send-email-ajay.gupta@ti.com \
    --to=ajay.gupta-l0cymroini0@public.gmane.org \
    --cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-usb-u79uwXL29TY76Z2rM5mHXA@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).