Re: [PATCH 04/13] usb: host: uhci: use new USB_RESUME_TIMEOUT

[Felipe Balbi]

On Fri, Feb 13, 2015 at 04:30:15PM -0500, 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 <ba...@ti.com>
> > ---
> >  drivers/usb/host/uhci-hub.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c
> > index 93e17b12fb33..fd809e2cace1 100644
> > --- a/drivers/usb/host/uhci-hub.c
> > +++ b/drivers/usb/host/uhci-hub.c
> > @@ -165,7 +165,7 @@ static void uhci_check_ports(struct uhci_hcd *uhci)
> >                             /* Port received a wakeup request */
> >                             set_bit(port, &uhci->resuming_ports);
> >                             uhci->ports_timeout = jiffies +
> > -                                           msecs_to_jiffies(25);
> > +                                   msecs_to_jiffies(USB_RESUME_TIMEOUT);
> >                             usb_hcd_start_port_resume(
> >                                             &uhci_to_hcd(uhci)->self, port);
> 
> You missed a second occurrence in uhci_hub_control():
> 
>                               else
>                                       /* USB v2.0 7.1.7.7 */
>                                       uhci->ports_timeout = jiffies +
>                                               msecs_to_jiffies(20);

fixed:

commit 9b0fd8b46f4621257ee42bd89d58ca41c12e0a91
Author: Felipe Balbi <ba...@ti.com>
Date:   Fri Feb 13 14:44:17 2015 -0600

    usb: host: uhci: use new USB_RESUME_TIMEOUT
    
    Make sure we're using the new macro, so our
    resume signaling will always pass certification.
    
    Signed-off-by: Felipe Balbi <ba...@ti.com>

diff --git a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c
index 19ba5eafb31e..7b3d1afcc14a 100644
--- a/drivers/usb/host/uhci-hub.c
+++ b/drivers/usb/host/uhci-hub.c
@@ -166,7 +166,7 @@ static void uhci_check_ports(struct uhci_hcd *uhci)
                                /* Port received a wakeup request */
                                set_bit(port, &uhci->resuming_ports);
                                uhci->ports_timeout = jiffies +
-                                               msecs_to_jiffies(25);
+                                       msecs_to_jiffies(USB_RESUME_TIMEOUT);
                                usb_hcd_start_port_resume(
                                                &uhci_to_hcd(uhci)->self, port);
 
@@ -338,7 +338,8 @@ static int uhci_hub_control(struct usb_hcd *hcd, u16 
typeReq, u16 wValue,
                        uhci_finish_suspend(uhci, port, port_addr);
 
                        /* USB v2.0 7.1.7.5 */
-                       uhci->ports_timeout = jiffies + msecs_to_jiffies(50);
+                       uhci->ports_timeout = jiffies +
+                               msecs_to_jiffies(USB_RESUME_TIMEOUT);
                        break;
                case USB_PORT_FEAT_POWER:
                        /* UHCI has no power switching */

-- 
balbi

signature.asc
Description: Digital signature