On Fri, 13 Feb 2015, Alan Stern wrote:
> On Fri, 13 Feb 2015, Felipe Balbi wrote:
>
> > Make sure we're using the new macro, so our
> > resume signaling will always pass certification.
> >
> > Signed-off-by: Felipe Balbi <balbi@xxxxxx>
> > ---
> > drivers/usb/host/ehci-hub.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
> > index 118edb7bdca2..11e487b6fac4 100644
> > --- a/drivers/usb/host/ehci-hub.c
> > +++ b/drivers/usb/host/ehci-hub.c
> > @@ -942,7 +942,7 @@ int ehci_hub_control(
> > temp &= ~PORT_WAKE_BITS;
> > ehci_writel(ehci, temp | PORT_RESUME, status_reg);
> > ehci->reset_done[wIndex] = jiffies
> > - + msecs_to_jiffies(20);
> > + + msecs_to_jiffies(USB_RESUME_TIMEOUT);
> > set_bit(wIndex, &ehci->resuming_ports);
> > usb_hcd_start_port_resume(&hcd->self, wIndex);
> > break;
>
> You missed a second occurrence in ehci_irq(), just following a comment
> that says:
>
> /* start 20 msec resume signaling from this port,
> * and make hub_wq collect PORT_STAT_C_SUSPEND to
> * stop that signaling. Use 5 ms extra for safety,
> * like usb_port_resume() does.
> */
There's a third occurrence as well, in ehci_bus_resume():
/* msleep for 20ms only if code is trying to resume port */
if (resume_needed) {
spin_unlock_irq(&ehci->lock);
msleep(20);
spin_lock_irq(&ehci->lock);
if (ehci->shutdown)
goto shutdown;
}
Alan Stern
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
