Merge branch 'master' of git://git.denx.de/u-boot-usb

[u-boot] / drivers / usb / gadget / ci_udc.c

diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c
index 993be315a8cff2ec1fa365550226eff4b917b24a..05c01ce5d6ea31d90b1f23987bdc0e267fe526f1 100644 (file)
--- a/drivers/usb/gadget/ci_udc.c
+++ b/drivers/usb/gadget/ci_udc.c
@@ -14,7 +14,7 @@
 #include <net.h>
 #include <malloc.h>
 #include <asm/byteorder.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/unaligned.h>
 #include <linux/types.h>
@@ -87,6 +87,7 @@ static int ci_ep_enable(struct usb_ep *ep,
 static int ci_ep_disable(struct usb_ep *ep);
 static int ci_ep_queue(struct usb_ep *ep,
                struct usb_request *req, gfp_t gfp_flags);
+static int ci_ep_dequeue(struct usb_ep *ep, struct usb_request *req);
 static struct usb_request *
 ci_ep_alloc_request(struct usb_ep *ep, unsigned int gfp_flags);
 static void ci_ep_free_request(struct usb_ep *ep, struct usb_request *_req);
@@ -99,6 +100,7 @@ static struct usb_ep_ops ci_ep_ops = {
        .enable         = ci_ep_enable,
        .disable        = ci_ep_disable,
        .queue          = ci_ep_queue,
+       .dequeue        = ci_ep_dequeue,
        .alloc_request  = ci_ep_alloc_request,
        .free_request   = ci_ep_free_request,
 };
@@ -258,10 +260,12 @@ static struct usb_request *
 ci_ep_alloc_request(struct usb_ep *ep, unsigned int gfp_flags)
 {
        struct ci_ep *ci_ep = container_of(ep, struct ci_ep, ep);
-       int num;
+       int num = -1;
        struct ci_req *ci_req;
 
-       num = ci_ep->desc->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
+       if (ci_ep->desc)
+               num = ci_ep->desc->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
+
        if (num == 0 && controller.ep0_req)
                return &controller.ep0_req->req;
 
@@ -281,9 +285,11 @@ static void ci_ep_free_request(struct usb_ep *ep, struct usb_request *req)
 {
        struct ci_ep *ci_ep = container_of(ep, struct ci_ep, ep);
        struct ci_req *ci_req = container_of(req, struct ci_req, req);
-       int num;
+       int num = -1;
+
+       if (ci_ep->desc)
+               num = ci_ep->desc->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
 
-       num = ci_ep->desc->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
        if (num == 0) {
                if (!controller.ep0_req)
                        return;
@@ -420,7 +426,7 @@ static void ci_ep_submit_next_request(struct ci_ep *ci_ep)
        int bit, num, len, in;
        struct ci_req *ci_req;
        u8 *buf;
-       uint32_t length, actlen;
+       uint32_t len_left, len_this_dtd;
        struct ept_queue_item *dtd, *qtd;
 
        ci_ep->req_primed = true;
@@ -438,25 +444,23 @@ static void ci_ep_submit_next_request(struct ci_ep *ci_ep)
 
        ci_req->dtd_count = 0;
        buf = ci_req->hw_buf;
-       actlen = 0;
+       len_left = len;
        dtd = item;
 
        do {
-               length = min(ci_req->req.length - actlen,
-                            (unsigned)EP_MAX_LENGTH_TRANSFER);
+               len_this_dtd = min(len_left, (unsigned)EP_MAX_LENGTH_TRANSFER);
 
-               dtd->info = INFO_BYTES(length) | INFO_ACTIVE;
+               dtd->info = INFO_BYTES(len_this_dtd) | INFO_ACTIVE;
                dtd->page0 = (unsigned long)buf;
                dtd->page1 = ((unsigned long)buf & 0xfffff000) + 0x1000;
                dtd->page2 = ((unsigned long)buf & 0xfffff000) + 0x2000;
                dtd->page3 = ((unsigned long)buf & 0xfffff000) + 0x3000;
                dtd->page4 = ((unsigned long)buf & 0xfffff000) + 0x4000;
 
-               len -= length;
-               actlen += length;
-               buf += length;
+               len_left -= len_this_dtd;
+               buf += len_this_dtd;
 
-               if (len) {
+               if (len_left) {
                        qtd = (struct ept_queue_item *)
                               memalign(ILIST_ALIGN, ILIST_ENT_SZ);
                        dtd->next = (unsigned long)qtd;
@@ -465,7 +469,7 @@ static void ci_ep_submit_next_request(struct ci_ep *ci_ep)
                }
 
                ci_req->dtd_count++;
-       } while (len);
+       } while (len_left);
 
        item = dtd;
        /*
@@ -521,6 +525,30 @@ static void ci_ep_submit_next_request(struct ci_ep *ci_ep)
        writel(bit, &udc->epprime);
 }
 
+static int ci_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
+{
+       struct ci_ep *ci_ep = container_of(_ep, struct ci_ep, ep);
+       struct ci_req *ci_req;
+
+       list_for_each_entry(ci_req, &ci_ep->queue, queue) {
+               if (&ci_req->req == _req)
+                       break;
+       }
+
+       if (&ci_req->req != _req)
+               return -EINVAL;
+
+       list_del_init(&ci_req->queue);
+
+       if (ci_req->req.status == -EINPROGRESS) {
+               ci_req->req.status = -ECONNRESET;
+               if (ci_req->req.complete)
+                       ci_req->req.complete(_ep, _req);
+       }
+
+       return 0;
+}
+
 static int ci_ep_queue(struct usb_ep *ep,
                struct usb_request *req, gfp_t gfp_flags)
 {
@@ -990,18 +1018,10 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
                return ret;
 
        ret = ci_udc_probe();
-#if defined(CONFIG_USB_EHCI_MX6) || defined(CONFIG_USB_EHCI_MXS)
-       /*
-        * FIXME: usb_lowlevel_init()->ehci_hcd_init() should be doing all
-        * HW-specific initialization, e.g. ULPI-vs-UTMI PHY selection
-        */
-       if (!ret) {
-               struct ci_udc *udc = (struct ci_udc *)controller.ctrl->hcor;
-
-               /* select ULPI phy */
-               writel(PTS(PTS_ENABLE) | PFSC, &udc->portsc);
+       if (ret) {
+               DBG("udc probe failed, returned %d\n", ret);
+               return ret;
        }
-#endif
 
        ret = driver->bind(&controller.gadget);
        if (ret) {