1 files changed, 17 insertions, 3 deletions

diff --git a/drivers/usb/mtu3/mtu3_gadget.c b/drivers/usb/mtu3/mtu3_gadget.c
index bbcd3332471d..f93732e53fd8 100644
--- a/drivers/usb/mtu3/mtu3_gadget.c
+++ b/drivers/usb/mtu3/mtu3_gadget.c
@@ -8,6 +8,7 @@
  */
 
 #include "mtu3.h"
+#include "mtu3_trace.h"
 
 void mtu3_req_complete(struct mtu3_ep *mep,
                      struct usb_request *req, int status)
@@ -25,6 +26,8 @@ __acquires(mep->mtu->lock)
 
         mtu = mreq->mtu;
         mep->busy = 1;
+
+        trace_mtu3_req_complete(mreq);
         spin_unlock(&mtu->lock);
 
         /* ep0 makes use of PIO, needn't unmap it */
@@ -201,6 +204,7 @@ error:
         spin_unlock_irqrestore(&mtu->lock, flags);
 
         dev_dbg(mtu->dev, "%s active_ep=%d\n", __func__, mtu->active_ep);
+        trace_mtu3_gadget_ep_enable(mep);
 
         return ret;
 }
@@ -212,6 +216,7 @@ static int mtu3_gadget_ep_disable(struct usb_ep *ep)
         unsigned long flags;
 
         dev_dbg(mtu->dev, "%s %s\n", __func__, mep->name);
+        trace_mtu3_gadget_ep_disable(mep);
 
         if (!(mep->flags & MTU3_EP_ENABLED)) {
                 dev_warn(mtu->dev, "%s is already disabled\n", mep->name);
@@ -242,13 +247,17 @@ struct usb_request *mtu3_alloc_request(struct usb_ep *ep, gfp_t gfp_flags)
         mreq->request.dma = DMA_ADDR_INVALID;
         mreq->epnum = mep->epnum;
         mreq->mep = mep;
+        trace_mtu3_alloc_request(mreq);
 
         return &mreq->request;
 }
 
 void mtu3_free_request(struct usb_ep *ep, struct usb_request *req)
 {
-        kfree(to_mtu3_request(req));
+        struct mtu3_request *mreq = to_mtu3_request(req);
+
+        trace_mtu3_free_request(mreq);
+        kfree(mreq);
 }
 
 static int mtu3_gadget_queue(struct usb_ep *ep,
@@ -278,10 +287,12 @@ static int mtu3_gadget_queue(struct usb_ep *ep,
                 __func__, mep->is_in ? "TX" : "RX", mreq->epnum, ep->name,
                 mreq, ep->maxpacket, mreq->request.length);
 
-        if (req->length > GPD_BUF_SIZE) {
+        if (req->length > GPD_BUF_SIZE ||
+            (mtu->gen2cp && req->length > GPD_BUF_SIZE_EL)) {
                 dev_warn(mtu->dev,
                         "req length > supported MAX:%d requested:%d\n",
-                        GPD_BUF_SIZE, req->length);
+                        mtu->gen2cp ? GPD_BUF_SIZE_EL : GPD_BUF_SIZE,
+                        req->length);
                 return -EOPNOTSUPP;
         }
 
@@ -314,6 +325,7 @@ static int mtu3_gadget_queue(struct usb_ep *ep,
 
 error:
         spin_unlock_irqrestore(&mtu->lock, flags);
+        trace_mtu3_gadget_queue(mreq);
 
         return ret;
 }
@@ -331,6 +343,7 @@ static int mtu3_gadget_dequeue(struct usb_ep *ep, struct usb_request *req)
                 return -EINVAL;
 
         dev_dbg(mtu->dev, "%s : req=%p\n", __func__, req);
+        trace_mtu3_gadget_dequeue(mreq);
 
         spin_lock_irqsave(&mtu->lock, flags);
 
@@ -401,6 +414,7 @@ static int mtu3_gadget_ep_set_halt(struct usb_ep *ep, int value)
 
 done:
         spin_unlock_irqrestore(&mtu->lock, flags);
+        trace_mtu3_gadget_ep_set_halt(mep);
 
         return ret;
 }