From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:41228 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752543AbbEBNY7 (ORCPT ); Sat, 2 May 2015 09:24:59 -0400 Subject: Patch "usb: musb: use new USB_RESUME_TIMEOUT" has been added to the 4.0-stable tree To: balbi@ti.com, b-liu@ti.com, gregkh@linuxfoundation.org Cc: , From: Date: Sat, 02 May 2015 15:23:56 +0200 Message-ID: <1430573036199156@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled usb: musb: use new USB_RESUME_TIMEOUT to the 4.0-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: usb-musb-use-new-usb_resume_timeout.patch and it can be found in the queue-4.0 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 309be239369609929d5d3833ee043f7c5afc95d1 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Fri, 13 Feb 2015 14:46:27 -0600 Subject: usb: musb: use new USB_RESUME_TIMEOUT From: Felipe Balbi commit 309be239369609929d5d3833ee043f7c5afc95d1 upstream. Make sure we're using the new macro, so our resume signaling will always pass certification. Based on original work by Bin Liu > Cc: Bin Liu Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman --- drivers/usb/musb/musb_core.c | 7 ++++--- drivers/usb/musb/musb_virthub.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -99,6 +99,7 @@ #include #include #include +#include #include "musb_core.h" @@ -562,7 +563,7 @@ static irqreturn_t musb_stage0_irq(struc (USB_PORT_STAT_C_SUSPEND << 16) | MUSB_PORT_STAT_RESUME; musb->rh_timer = jiffies - + msecs_to_jiffies(20); + + msecs_to_jiffies(USB_RESUME_TIMEOUT); musb->need_finish_resume = 1; musb->xceiv->otg->state = OTG_STATE_A_HOST; @@ -2471,7 +2472,7 @@ static int musb_resume(struct device *de if (musb->need_finish_resume) { musb->need_finish_resume = 0; schedule_delayed_work(&musb->finish_resume_work, - msecs_to_jiffies(20)); + msecs_to_jiffies(USB_RESUME_TIMEOUT)); } /* @@ -2514,7 +2515,7 @@ static int musb_runtime_resume(struct de if (musb->need_finish_resume) { musb->need_finish_resume = 0; schedule_delayed_work(&musb->finish_resume_work, - msecs_to_jiffies(20)); + msecs_to_jiffies(USB_RESUME_TIMEOUT)); } return 0; --- a/drivers/usb/musb/musb_virthub.c +++ b/drivers/usb/musb/musb_virthub.c @@ -136,7 +136,7 @@ void musb_port_suspend(struct musb *musb /* later, GetPortStatus will stop RESUME signaling */ musb->port1_status |= MUSB_PORT_STAT_RESUME; schedule_delayed_work(&musb->finish_resume_work, - msecs_to_jiffies(20)); + msecs_to_jiffies(USB_RESUME_TIMEOUT)); } } Patches currently in stable-queue which might be from balbi@ti.com are queue-4.0/usb-host-xhci-use-new-usb_resume_timeout.patch queue-4.0/usb-dwc2-hcd-use-new-usb_resume_timeout.patch queue-4.0/usb-host-sl811-use-new-usb_resume_timeout.patch queue-4.0/usb-musb-use-new-usb_resume_timeout.patch queue-4.0/usb-define-a-generic-usb_resume_timeout-macro.patch queue-4.0/usb-host-oxu210hp-use-new-usb_resume_timeout.patch queue-4.0/usb-host-isp116x-use-new-usb_resume_timeout.patch queue-4.0/usb-isp1760-hcd-use-new-usb_resume_timeout.patch queue-4.0/usb-host-r8a66597-use-new-usb_resume_timeout.patch queue-4.0/usb-musb-core-fix-tx-rx-endpoint-order.patch queue-4.0/usb-core-hub-use-new-usb_resume_timeout.patch queue-4.0/usb-host-fusbh200-use-new-usb_resume_timeout.patch queue-4.0/usb-gadget-printer-enqueue-printer-s-response-for-setup-request.patch queue-4.0/usb-host-ehci-use-new-usb_resume_timeout.patch queue-4.0/usb-host-uhci-use-new-usb_resume_timeout.patch queue-4.0/usb-host-fotg210-use-new-usb_resume_timeout.patch queue-4.0/usb-phy-find-the-right-match-in-devm_usb_phy_match.patch