Instead of having a limited number of usable tds in the udc we use a
linked list to support dynamic amount of needed tds for all special
gadget types. This improves throughput.
This patch also adresses a possible momory leak in _ep_nuke found
while porting the request handling to an linked list.
- In hardware_enqueue code adds one extra td with dma_pool_alloc if
mReq->req.zero is true. In the case that _ep_nuke will be called for
that endpoint, this could lead to an memory leak, as dma_pool_free
will
not be called. As the code patch will changed anyway, that issue will
be fixed as well in that patch.
Signed-off-by: Michael Grzeschik <[email protected]>
---
Changes since v1:
- splited kzalloc in add_td_to list into two lines
- rebased the patch on ci-for-greg
- reworked the fix description of this patch
drivers/usb/chipidea/debug.c | 15 ++--
drivers/usb/chipidea/udc.c | 159 ++++++++++++++++++++++++++++++-------------
drivers/usb/chipidea/udc.h | 12 ++--
3 files changed, 127 insertions(+), 59 deletions(-)
diff --git a/drivers/usb/chipidea/debug.c b/drivers/usb/chipidea/debug.c
index 8f8ba3a..178b4a8 100644
--- a/drivers/usb/chipidea/debug.c
+++ b/drivers/usb/chipidea/debug.c
@@ -162,6 +162,7 @@ static int ci_requests_show(struct seq_file *s, void *data)
unsigned long flags;
struct list_head *ptr = NULL;
struct ci13xxx_req *req = NULL;
+ struct td_node *node, *tmpnode;
unsigned i, j, qsize = sizeof(struct ci13xxx_td)/sizeof(u32);
if (ci->role != CI_ROLE_GADGET) {
@@ -174,13 +175,15 @@ static int ci_requests_show(struct seq_file *s, void
*data)
list_for_each(ptr, &ci->ci13xxx_ep[i].qh.queue) {
req = list_entry(ptr, struct ci13xxx_req, queue);
- seq_printf(s, "EP=%02i: TD=%08X %s\n",
- i % (ci->hw_ep_max / 2), (u32)req->dma,
- ((i < ci->hw_ep_max/2) ? "RX" : "TX"));
+ list_for_each_entry_safe(node, tmpnode, &req->tds, td) {
+ seq_printf(s, "EP=%02i: TD=%08X %s\n",
+ i % (ci->hw_ep_max / 2),
(u32)node->dma,
+ ((i < ci->hw_ep_max/2) ? "RX" :
"TX"));
- for (j = 0; j < qsize; j++)
- seq_printf(s, " %04X: %08X\n", j,
- readl(&req->ptr + j));
+ for (j = 0; j < qsize; j++)
+ seq_printf(s, " %04X: %08X\n", j,
+ readl(&node->ptr + j));
+ }
}
spin_unlock_irqrestore(&ci->lock, flags);
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index 64089f2..cf230cb 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -391,6 +391,45 @@ static void vbus_work(struct work_struct *work)
/******************************************************************************
* UTIL block
*****************************************************************************/
+
+static void setup_td_bits(struct td_node *tdnode, unsigned length)
+{
+ memset(tdnode->ptr, 0, sizeof(*tdnode->ptr));
+ tdnode->ptr->token = length << __ffs(TD_TOTAL_BYTES);
+ tdnode->ptr->token &= TD_TOTAL_BYTES;
+ tdnode->ptr->token |= TD_STATUS_ACTIVE;
+}
+
+static int add_td_to_list(struct ci13xxx_ep *mEp, struct ci13xxx_req *mReq,
unsigned length, gfp_t gfp_flags)
+{
+ struct td_node *lastnode, *node = kzalloc(sizeof(struct td_node),
+ gfp_flags);
+
+ if (node == NULL)
+ return -ENOMEM;
+
+ node->ptr = dma_pool_alloc(mEp->td_pool, gfp_flags,
+ &node->dma);
+ if (node->ptr == NULL) {
+ kfree(node);
+ return -ENOMEM;
+ }
+
+ setup_td_bits(node, length);
+
+ if (!list_empty(&mReq->tds)) {
+ /* get the last entry */
+ lastnode = list_entry(mReq->tds.prev,
+ struct td_node, td);
+ lastnode->ptr->next = node->dma;
+ }
+
+ INIT_LIST_HEAD(&node->td);
+ list_add_tail(&node->td, &mReq->tds);
+
+ return 0;
+}
+
/**
* _hardware_queue: configures a request at hardware level
* @gadget: gadget
@@ -404,6 +443,7 @@ static int _hardware_enqueue(struct ci13xxx_ep *mEp, struct
ci13xxx_req *mReq, g
unsigned i;
int ret = 0;
unsigned length = mReq->req.length;
+ struct td_node *firstnode, *lastnode;
/* don't queue twice */
if (mReq->req.status == -EALREADY)
@@ -411,55 +451,43 @@ static int _hardware_enqueue(struct ci13xxx_ep *mEp,
struct ci13xxx_req *mReq, g
mReq->req.status = -EALREADY;
- if (mReq->req.zero && length && (length % mEp->ep.maxpacket == 0)) {
- mReq->zptr = dma_pool_alloc(mEp->td_pool, gfp_flags,
- &mReq->zdma);
- if (mReq->zptr == NULL)
- return -ENOMEM;
-
- memset(mReq->zptr, 0, sizeof(*mReq->zptr));
- mReq->zptr->next = TD_TERMINATE;
- mReq->zptr->token = TD_STATUS_ACTIVE;
- if (!mReq->req.no_interrupt)
- mReq->zptr->token |= TD_IOC;
- }
ret = usb_gadget_map_request(&ci->gadget, &mReq->req, mEp->dir);
if (ret)
return ret;
- /*
- * TD configuration
- * TODO - handle requests which spawns into several TDs
- */
- memset(mReq->ptr, 0, sizeof(*mReq->ptr));
- mReq->ptr->token = length << __ffs(TD_TOTAL_BYTES);
- mReq->ptr->token &= TD_TOTAL_BYTES;
- mReq->ptr->token |= TD_STATUS_ACTIVE;
- if (mReq->zptr) {
- mReq->ptr->next = mReq->zdma;
- } else {
- mReq->ptr->next = TD_TERMINATE;
- if (!mReq->req.no_interrupt)
- mReq->ptr->token |= TD_IOC;
- }
- mReq->ptr->page[0] = mReq->req.dma;
+ firstnode = list_first_entry(&mReq->tds,
+ struct td_node, td);
+
+ setup_td_bits(firstnode, length);
+
+ firstnode->ptr->page[0] = mReq->req.dma;
for (i = 1; i < TD_PAGE_COUNT; i++)
- mReq->ptr->page[i] =
+ firstnode->ptr->page[i] =
(mReq->req.dma + i * CI13XXX_PAGE_SIZE) &
~TD_RESERVED_MASK;
+ if (mReq->req.zero && length && (length % mEp->ep.maxpacket == 0))
+ add_td_to_list(mEp, mReq, 0, gfp_flags);
+
+ lastnode = list_entry(mReq->tds.prev,
+ struct td_node, td);
+
+ lastnode->ptr->next = TD_TERMINATE;
+ if (!mReq->req.no_interrupt)
+ lastnode->ptr->token |= TD_IOC;
wmb();
if (!list_empty(&mEp->qh.queue)) {
struct ci13xxx_req *mReqPrev;
int n = hw_ep_bit(mEp->num, mEp->dir);
int tmp_stat;
+ struct td_node *prevlastnode;
mReqPrev = list_entry(mEp->qh.queue.prev,
struct ci13xxx_req, queue);
- if (mReqPrev->zptr)
- writel(mReq->dma & TD_ADDR_MASK, &mReqPrev->zptr->next);
- else
- writel(mReq->dma & TD_ADDR_MASK, &mReqPrev->ptr->next);
+ prevlastnode = list_entry(mReqPrev->tds.prev,
+ struct td_node, td);
+
+ writel(firstnode->dma & TD_ADDR_MASK, &prevlastnode->ptr->next);
wmb();
if (hw_read(ci, OP_ENDPTPRIME, BIT(n)))
goto done;
@@ -472,7 +500,7 @@ static int _hardware_enqueue(struct ci13xxx_ep *mEp, struct
ci13xxx_req *mReq, g
goto done;
}
/* QH configuration */
- writel(mReq->dma, &mEp->qh.ptr->td.next); /* TERMINATE = 0 */
+ writel(firstnode->dma, &mEp->qh.ptr->td.next); /* TERMINATE = 0 */
writel(readl(&mEp->qh.ptr->td.token) &
~(TD_STATUS_HALTED|TD_STATUS_ACTIVE), &mEp->qh.ptr->td.token);
wmb(); /* synchronize before ep prime */
@@ -493,20 +521,24 @@ done:
static int _hardware_dequeue(struct ci13xxx_ep *mEp, struct ci13xxx_req *mReq)
{
u32 tmptoken;
+ struct td_node *node, *tmpnode, *firstnode;
if (mReq->req.status != -EALREADY)
return -EINVAL;
- tmptoken = readl(&mReq->ptr->token);
-
- if ((TD_STATUS_ACTIVE & tmptoken) != 0)
- return -EBUSY;
+ firstnode = list_first_entry(&mReq->tds,
+ struct td_node, td);
- if (mReq->zptr) {
- if ((TD_STATUS_ACTIVE & readl(&mReq->zptr->token)) != 0)
+ list_for_each_entry_safe(node, tmpnode, &mReq->tds, td) {
+ tmptoken = readl(&node->ptr->token);
+ if ((TD_STATUS_ACTIVE & tmptoken) != 0)
return -EBUSY;
- dma_pool_free(mEp->td_pool, mReq->zptr, mReq->zdma);
- mReq->zptr = NULL;
+ if (node != firstnode) {
+ dma_pool_free(mEp->td_pool, node->ptr, node->dma);
+ list_del_init(&node->td);
+ node->ptr = NULL;
+ kfree(node);
+ }
}
mReq->req.status = 0;
@@ -542,6 +574,7 @@ static int _ep_nuke(struct ci13xxx_ep *mEp)
__releases(mEp->lock)
__acquires(mEp->lock)
{
+ struct td_node *node, *tmpnode, *firstnode;
if (mEp == NULL)
return -EINVAL;
@@ -553,6 +586,19 @@ __acquires(mEp->lock)
struct ci13xxx_req *mReq = \
list_entry(mEp->qh.queue.next,
struct ci13xxx_req, queue);
+
+ firstnode = list_first_entry(&mReq->tds,
+ struct td_node, td);
+
+ list_for_each_entry_safe(node, tmpnode, &mReq->tds, td) {
+ if (node != firstnode) {
+ dma_pool_free(mEp->td_pool, node->ptr,
node->dma);
+ list_del_init(&node->td);
+ node->ptr = NULL;
+ kfree(node);
+ }
+ }
+
list_del_init(&mReq->queue);
mReq->req.status = -ESHUTDOWN;
@@ -840,16 +886,20 @@ __acquires(mEp->lock)
struct ci13xxx_req *mReq, *mReqTemp;
struct ci13xxx_ep *mEpTemp = mEp;
int retval = 0;
+ struct td_node *firstnode;
list_for_each_entry_safe(mReq, mReqTemp, &mEp->qh.queue,
queue) {
+ firstnode = list_first_entry(&mReq->tds,
+ struct td_node, td);
+
retval = _hardware_dequeue(mEp, mReq);
if (retval == -EBUSY) {
retval = 0;
break;
}
list_del_init(&mReq->queue);
- trace_ci_ep_complete_req(mEp, readl(&mReq->ptr->token), retval);
+ trace_ci_ep_complete_req(mEp, readl(&firstnode->ptr->token),
retval);
if (mReq->req.complete != NULL) {
spin_unlock(mEp->lock);
if ((mEp->type == USB_ENDPOINT_XFER_CONTROL) &&
@@ -1166,19 +1216,26 @@ static struct usb_request *ep_alloc_request(struct
usb_ep *ep, gfp_t gfp_flags)
{
struct ci13xxx_ep *mEp = container_of(ep, struct ci13xxx_ep, ep);
struct ci13xxx_req *mReq = NULL;
+ struct td_node *node;
if (ep == NULL)
return NULL;
mReq = kzalloc(sizeof(struct ci13xxx_req), gfp_flags);
- if (mReq != NULL) {
+ node = kzalloc(sizeof(struct td_node), gfp_flags);
+ if (mReq != NULL && node != NULL) {
INIT_LIST_HEAD(&mReq->queue);
+ INIT_LIST_HEAD(&mReq->tds);
+ INIT_LIST_HEAD(&node->td);
- mReq->ptr = dma_pool_alloc(mEp->td_pool, gfp_flags,
- &mReq->dma);
- if (mReq->ptr == NULL) {
+ node->ptr = dma_pool_alloc(mEp->td_pool, gfp_flags,
+ &node->dma);
+ if (node->ptr == NULL) {
+ kfree(node);
kfree(mReq);
mReq = NULL;
+ } else {
+ list_add_tail(&node->td, &mReq->tds);
}
}
@@ -1196,6 +1253,7 @@ static void ep_free_request(struct usb_ep *ep, struct
usb_request *req)
{
struct ci13xxx_ep *mEp = container_of(ep, struct ci13xxx_ep, ep);
struct ci13xxx_req *mReq = container_of(req, struct ci13xxx_req, req);
+ struct td_node *firstnode;
unsigned long flags;
if (ep == NULL || req == NULL) {
@@ -1207,8 +1265,11 @@ static void ep_free_request(struct usb_ep *ep, struct
usb_request *req)
spin_lock_irqsave(mEp->lock, flags);
- if (mReq->ptr)
- dma_pool_free(mEp->td_pool, mReq->ptr, mReq->dma);
+ firstnode = list_first_entry(&mReq->tds,
+ struct td_node, td);
+
+ if (firstnode->ptr)
+ dma_pool_free(mEp->td_pool, firstnode->ptr, firstnode->dma);
kfree(mReq);
trace_ci_ep_free_req(mEp, 0);
diff --git a/drivers/usb/chipidea/udc.h b/drivers/usb/chipidea/udc.h
index 46c5210..3bd9ac9 100644
--- a/drivers/usb/chipidea/udc.h
+++ b/drivers/usb/chipidea/udc.h
@@ -57,6 +57,13 @@ struct ci13xxx_qh {
struct usb_ctrlrequest setup;
} __attribute__ ((aligned (64)));
+
+struct td_node {
+ struct list_head td;
+ dma_addr_t dma;
+ struct ci13xxx_td *ptr;
+};
+
/**
* struct ci13xxx_req - usb request representation
* @req: request structure for gadget drivers
@@ -69,10 +76,7 @@ struct ci13xxx_qh {
struct ci13xxx_req {
struct usb_request req;
struct list_head queue;
- struct ci13xxx_td *ptr;
- dma_addr_t dma;
- struct ci13xxx_td *zptr;
- dma_addr_t zdma;
+ struct list_head tds;
};
#ifdef CONFIG_USB_CHIPIDEA_UDC
--
1.8.2.rc2
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
