usb: gadget: aspeed: Don't reject requests on suspended devices

A disconnect may just suspend the hub in absence of a physical
disconnect detection. If we start rejecting requests, the mass
storage function gets into a spin trying to requeue the same
request for ever and hangs.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

diff --git a/drivers/usb/gadget/udc/aspeed-vhub/dev.c b/drivers/usb/gadget/udc/aspeed-vhub/dev.c
index 678bbdbd0971083f458c0eeb35bbab8cd0d5f130..71e2416858fde658589a29ee18cc6836e09d3b2c 100644 (file)
--- a/drivers/usb/gadget/udc/aspeed-vhub/dev.c
+++ b/drivers/usb/gadget/udc/aspeed-vhub/dev.c
@@ -204,14 +204,19 @@ int ast_vhub_std_dev_request(struct ast_vhub_ep *ep,
        u16 wValue, wIndex;
 
        /* No driver, we shouldn't be enabled ... */
-       if (!d->driver || !d->enabled || d->suspended) {
+       if (!d->driver || !d->enabled) {
                EPDBG(ep,
-                     "Device is wrong state driver=%p enabled=%d"
-                     " suspended=%d\n",
-                     d->driver, d->enabled, d->suspended);
+                     "Device is wrong state driver=%p enabled=%d\n",
+                     d->driver, d->enabled);
                return std_req_stall;
        }
 
+       /*
+        * Note: we used to reject/stall requests while suspended,
+        * we don't do that anymore as we seem to have cases of
+        * mass storage getting very upset.
+        */
+
        /* First packet, grab speed */
        if (d->gadget.speed == USB_SPEED_UNKNOWN) {
                d->gadget.speed = ep->vhub->speed;

diff --git a/drivers/usb/gadget/udc/aspeed-vhub/ep0.c b/drivers/usb/gadget/udc/aspeed-vhub/ep0.c
index b64dca7933b0f639ab866c4e73af8b5435e76243..022b777b85f8f081219b06eaf4d9cfbfc4d81f19 100644 (file)
--- a/drivers/usb/gadget/udc/aspeed-vhub/ep0.c
+++ b/drivers/usb/gadget/udc/aspeed-vhub/ep0.c
@@ -379,7 +379,7 @@ static int ast_vhub_ep0_queue(struct usb_ep* u_ep, struct usb_request *u_req,
                return -EINVAL;
 
        /* Disabled device */
-       if (ep->dev && (!ep->dev->enabled || ep->dev->suspended))
+       if (ep->dev && !ep->dev->enabled)
                return -ESHUTDOWN;
 
        /* Data, no buffer and not internal ? */

diff --git a/drivers/usb/gadget/udc/aspeed-vhub/epn.c b/drivers/usb/gadget/udc/aspeed-vhub/epn.c
index 35941dc125f9aa9790a78efb88edd56b5c6c1425..7475c74aa5c5ea86b6da895e2689533c31d23856 100644 (file)
--- a/drivers/usb/gadget/udc/aspeed-vhub/epn.c
+++ b/drivers/usb/gadget/udc/aspeed-vhub/epn.c
@@ -352,7 +352,7 @@ static int ast_vhub_epn_queue(struct usb_ep* u_ep, struct usb_request *u_req,
 
        /* Endpoint enabled ? */
        if (!ep->epn.enabled || !u_ep->desc || !ep->dev || !ep->d_idx ||
-           !ep->dev->enabled || ep->dev->suspended) {
+           !ep->dev->enabled) {
                EPDBG(ep, "Enqueuing request on wrong or disabled EP\n");
                return -ESHUTDOWN;
        }