From: Felipe Balbi <balbi@ti.com>
To: Linux USB Mailing List <linux-usb@vger.kernel.org>
Cc: Felipe Balbi <balbi@ti.com>,
Greg Kroah-Hartman <gregkh@suse.de> (supporter:USB SUBSYSTEM
,commit_signer:27/51=53%),
Thomas Dahlmann <dahlmann.thomas@arcor.de> (supporter:AMD GEODE
CS5536...),
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
(commit_signer:44/51=86%),
linux-omap@vger.kernel.org (open list:DESIGNWARE USB3 D...),
linux-kernel@vger.kernel.org (open list),
linux-geode@lists.infradead.org (open list:AMD GEODE CS5536...)
Subject: [PATCH 1/9] usb: gadget: add generic map/unmap request utilities
Date: Tue, 24 Jan 2012 13:45:22 +0200 [thread overview]
Message-ID: <1327405543-27589-2-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1327405543-27589-1-git-send-email-balbi@ti.com>
such utilities are currently duplicated on all UDC
drivers basically with the same structure. Let's group
all implementations into one generic implementation
and get rid of that duplication.
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
drivers/usb/gadget/udc-core.c | 52 +++++++++++++++++++++++++++++++++++++++++
include/linux/usb/gadget.h | 10 ++++++++
2 files changed, 62 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/gadget/udc-core.c b/drivers/usb/gadget/udc-core.c
index 0b0d12c..56da49f 100644
--- a/drivers/usb/gadget/udc-core.c
+++ b/drivers/usb/gadget/udc-core.c
@@ -22,6 +22,7 @@
#include <linux/device.h>
#include <linux/list.h>
#include <linux/err.h>
+#include <linux/dma-mapping.h>
#include <linux/usb/ch9.h>
#include <linux/usb/gadget.h>
@@ -49,6 +50,57 @@ static DEFINE_MUTEX(udc_lock);
/* ------------------------------------------------------------------------- */
+int usb_gadget_map_request(struct usb_gadget *gadget,
+ struct usb_request *req, int is_in)
+{
+ if (req->length == 0)
+ return 0;
+
+ if (req->num_sgs) {
+ int mapped;
+
+ mapped = dma_map_sg(&gadget->dev, req->sg, req->num_sgs,
+ is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
+ if (mapped == 0) {
+ dev_err(&gadget->dev, "failed to map SGs\n");
+ return -EFAULT;
+ }
+
+ req->num_mapped_sgs = mapped;
+ } else {
+ req->dma = dma_map_single(&gadget->dev, req->buf, req->length,
+ is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
+
+ if (dma_mapping_error(&gadget->dev, req->dma)) {
+ dev_err(&gadget->dev, "failed to map buffer\n");
+ return -EFAULT;
+ }
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(usb_gadget_map_request);
+
+void usb_gadget_unmap_request(struct usb_gadget *gadget,
+ struct usb_request *req, int is_in)
+{
+ if (req->length == 0)
+ return;
+
+ if (req->num_mapped_sgs) {
+ dma_unmap_sg(&gadget->dev, req->sg, req->num_mapped_sgs,
+ is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
+
+ req->num_mapped_sgs = 0;
+ } else {
+ dma_unmap_single(&gadget->dev, req->dma, req->length,
+ is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
+ }
+}
+EXPORT_SYMBOL_GPL(usb_gadget_unmap_request);
+
+/* ------------------------------------------------------------------------- */
+
/**
* usb_gadget_start - tells usb device controller to start up
* @gadget: The gadget we want to get started
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index da653b5..9517466 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -950,6 +950,16 @@ static inline void usb_free_descriptors(struct usb_descriptor_header **v)
/*-------------------------------------------------------------------------*/
+/* utility to simplify map/unmap of usb_requests to/from DMA */
+
+extern int usb_gadget_map_request(struct usb_gadget *gadget,
+ struct usb_request *req, int is_in);
+
+extern void usb_gadget_unmap_request(struct usb_gadget *gadget,
+ struct usb_request *req, int is_in);
+
+/*-------------------------------------------------------------------------*/
+
/* utility wrapping a simple endpoint selection policy */
extern struct usb_ep *usb_ep_autoconfig(struct usb_gadget *,
--
1.7.8.2
next prev parent reply other threads:[~2012-01-24 11:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-24 11:45 [PATCH 0/9] usb: gadget: generic map/unmap routines Felipe Balbi
2012-01-24 11:45 ` Felipe Balbi [this message]
2012-01-24 11:45 ` [PATCH 2/9] usb: dwc3: gadget: use " Felipe Balbi
2012-01-24 11:45 ` [PATCH 3/9] usb: gadget: langwell: use generic map/unmap functions Felipe Balbi
2012-01-24 11:45 ` [PATCH 4/9] usb: renesas: gadget: use generic map/unmap routines Felipe Balbi
2012-01-24 11:45 ` [PATCH 5/9] usb: gadget: amd5536: " Felipe Balbi
2012-01-24 11:45 ` [PATCH 6/9] usb: gadget: r8a66597: " Felipe Balbi
2012-01-24 11:45 ` [PATCH 7/9] usb: gadget: net2272: use generic map/umap routines Felipe Balbi
2012-01-24 11:45 ` [PATCH 8/9] usb: gadget: net2280: use generic map/unmap routines Felipe Balbi
2012-01-24 11:45 ` [PATCH 9/9] usb: gadget: goku: " Felipe Balbi
2012-02-13 13:08 ` [PATCH 0/9] usb: gadget: " Felipe Balbi
-- strict thread matches above, loose matches on Subject: below --
2011-12-19 10:30 [PATCH 0/9] Add a generic request map/unmap routine Felipe Balbi
2011-12-19 10:30 ` [PATCH 1/9] usb: gadget: add generic map/unmap request utilities Felipe Balbi
2011-12-19 15:19 ` Alan Stern
2011-12-19 15:49 ` Felipe Balbi
2011-12-19 16:27 ` Alan Stern
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=1327405543-27589-2-git-send-email-balbi@ti.com \
--to=balbi@ti.com \
--cc=dahlmann.thomas@arcor.de \
--cc=gregkh@suse.de \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=linux-geode@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.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).