lkml.org 
[lkml]   [2015]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19 076/177] usb: host: ehci: use new USB_RESUME_TIMEOUT
    Date
    3.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Felipe Balbi <balbi@ti.com>

    commit ea16328f80ca8d74434352157f37ef60e2f55ce2 upstream.

    Make sure we're using the new macro, so our
    resume signaling will always pass certification.

    Signed-off-by: Felipe Balbi <balbi@ti.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/host/ehci-hcd.c | 10 +++++-----
    drivers/usb/host/ehci-hub.c | 9 ++++++---
    2 files changed, 11 insertions(+), 8 deletions(-)

    --- a/drivers/usb/host/ehci-hcd.c
    +++ b/drivers/usb/host/ehci-hcd.c
    @@ -792,12 +792,12 @@ static irqreturn_t ehci_irq (struct usb_
    ehci->reset_done[i] == 0))
    continue;

    - /* 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.
    + /* start USB_RESUME_TIMEOUT msec resume signaling from
    + * this port, and make hub_wq collect
    + * PORT_STAT_C_SUSPEND to stop that signaling.
    */
    - ehci->reset_done[i] = jiffies + msecs_to_jiffies(25);
    + ehci->reset_done[i] = jiffies +
    + msecs_to_jiffies(USB_RESUME_TIMEOUT);
    set_bit(i, &ehci->resuming_ports);
    ehci_dbg (ehci, "port %d remote wakeup\n", i + 1);
    usb_hcd_start_port_resume(&hcd->self, i);
    --- a/drivers/usb/host/ehci-hub.c
    +++ b/drivers/usb/host/ehci-hub.c
    @@ -471,10 +471,13 @@ static int ehci_bus_resume (struct usb_h
    ehci_writel(ehci, temp, &ehci->regs->port_status [i]);
    }

    - /* msleep for 20ms only if code is trying to resume port */
    + /*
    + * msleep for USB_RESUME_TIMEOUT ms only if code is trying to resume
    + * port
    + */
    if (resume_needed) {
    spin_unlock_irq(&ehci->lock);
    - msleep(20);
    + msleep(USB_RESUME_TIMEOUT);
    spin_lock_irq(&ehci->lock);
    if (ehci->shutdown)
    goto shutdown;
    @@ -942,7 +945,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;



    \
     
     \ /
      Last update: 2015-05-02 22:01    [W:4.207 / U:0.248 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site