usb: gadget: aspeed: Fix EP0 stall handling

When stalling EP0, we need to wait for an ACK interrupt,
otherwise we may get out of sync on the next setup packet
data phase. Also we need to ignore the direction when
processing that interrupt as the HW reports a potential
mismatch.

Implement this by adding a stall state to EP0. This fixes
some reported issues with mass storage and some hosts.

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/ep0.c b/drivers/usb/gadget/udc/aspeed-vhub/ep0.c
index 5e4714d7febb30222282a8a5e3ede58db1299b0d..b64dca7933b0f639ab866c4e73af8b5435e76243 100644 (file)
--- a/drivers/usb/gadget/udc/aspeed-vhub/ep0.c
+++ b/drivers/usb/gadget/udc/aspeed-vhub/ep0.c
@@ -105,18 +105,20 @@ void ast_vhub_ep0_handle_setup(struct ast_vhub_ep *ep)
               (crq.bRequestType & USB_DIR_IN) ? "in" : "out",
               ep->ep0.state);
 
-       /* Check our state, cancel pending requests if needed */
-       if (ep->ep0.state != ep0_state_token) {
+       /*
+        * Check our state, cancel pending requests if needed
+        *
+        * Note: Under some circumstances, we can get a new setup
+        * packet while waiting for the stall ack, just accept it.
+        *
+        * In any case, a SETUP packet in wrong state should have
+        * reset the HW state machine, so let's just log, nuke
+        * requests, move on.
+        */
+       if (ep->ep0.state != ep0_state_token &&
+           ep->ep0.state != ep0_state_stall) {
                EPDBG(ep, "wrong state\n");
                ast_vhub_nuke(ep, -EIO);
-
-               /*
-                * Accept the packet regardless, this seems to happen
-                * when stalling a SETUP packet that has an OUT data
-                * phase.
-                */
-               ast_vhub_nuke(ep, 0);
-               goto stall;
        }
 
        /* Calculate next state for EP0 */
@@ -165,7 +167,7 @@ void ast_vhub_ep0_handle_setup(struct ast_vhub_ep *ep)
  stall:
        EPDBG(ep, "stalling\n");
        writel(VHUB_EP0_CTRL_STALL, ep->ep0.ctlstat);
-       ep->ep0.state = ep0_state_status;
+       ep->ep0.state = ep0_state_stall;
        ep->ep0.dir_in = false;
        return;
 
@@ -299,8 +301,8 @@ void ast_vhub_ep0_handle_ack(struct ast_vhub_ep *ep, bool in_ack)
                if ((ep->ep0.dir_in && (stat & VHUB_EP0_TX_BUFF_RDY)) ||
                    (!ep->ep0.dir_in && (stat & VHUB_EP0_RX_BUFF_RDY)) ||
                    (ep->ep0.dir_in != in_ack)) {
+                       /* In that case, ignore interrupt */
                        dev_warn(dev, "irq state mismatch");
-                       stall = true;
                        break;
                }
                /*
@@ -335,12 +337,22 @@ void ast_vhub_ep0_handle_ack(struct ast_vhub_ep *ep, bool in_ack)
                        dev_warn(dev, "status direction mismatch\n");
                        stall = true;
                }
+               break;
+       case ep0_state_stall:
+               /*
+                * There shouldn't be any request left, but nuke just in case
+                * otherwise the stale request will block subsequent ones
+                */
+               ast_vhub_nuke(ep, -EIO);
+               break;
        }
 
-       /* Reset to token state */
-       ep->ep0.state = ep0_state_token;
-       if (stall)
+       /* Reset to token state or stall */
+       if (stall) {
                writel(VHUB_EP0_CTRL_STALL, ep->ep0.ctlstat);
+               ep->ep0.state = ep0_state_stall;
+       } else
+               ep->ep0.state = ep0_state_token;
 }
 
 static int ast_vhub_ep0_queue(struct usb_ep* u_ep, struct usb_request *u_req,
@@ -390,8 +402,12 @@ static int ast_vhub_ep0_queue(struct usb_ep* u_ep, struct usb_request *u_req,
        spin_lock_irqsave(&vhub->lock, flags);
 
        /* EP0 can only support a single request at a time */
-       if (!list_empty(&ep->queue) || ep->ep0.state == ep0_state_token) {
+       if (!list_empty(&ep->queue) ||
+           ep->ep0.state == ep0_state_token ||
+           ep->ep0.state == ep0_state_stall) {
                dev_warn(dev, "EP0: Request in wrong state\n");
+               EPVDBG(ep, "EP0: list_empty=%d state=%d\n",
+                      list_empty(&ep->queue), ep->ep0.state);
                spin_unlock_irqrestore(&vhub->lock, flags);
                return -EBUSY;
        }

diff --git a/drivers/usb/gadget/udc/aspeed-vhub/vhub.h b/drivers/usb/gadget/udc/aspeed-vhub/vhub.h
index 2e7ef387f4f0d81d1a4d32095a7fea2bd016e266..00f922604a1c6b9484c0efabc79c2ffd7270b495 100644 (file)
--- a/drivers/usb/gadget/udc/aspeed-vhub/vhub.h
+++ b/drivers/usb/gadget/udc/aspeed-vhub/vhub.h
@@ -257,6 +257,7 @@ enum ep0_state {
        ep0_state_token,
        ep0_state_data,
        ep0_state_status,
+       ep0_state_stall,
 };
 
 /*