* FAILED: patch "[PATCH] usb: musb: use new USB_RESUME_TIMEOUT" failed to apply to 3.14-stable tree
@ 2015-05-02 13:14 gregkh
2015-05-04 15:15 ` [PATCH] usb: musb: use new USB_RESUME_TIMEOUT Felipe Balbi
0 siblings, 1 reply; 4+ messages in thread
From: gregkh @ 2015-05-02 13:14 UTC (permalink / raw)
To: balbi, b-liu, stable; +Cc: stable
The patch below does not apply to the 3.14-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From 309be239369609929d5d3833ee043f7c5afc95d1 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Fri, 13 Feb 2015 14:46:27 -0600
Subject: [PATCH] usb: musb: use new USB_RESUME_TIMEOUT
Make sure we're using the new macro, so our
resume signaling will always pass certification.
Based on original work by Bin Liu <Bin Liu <b-liu@ti.com>>
Cc: Bin Liu <b-liu@ti.com>
Cc: <stable@vger.kernel.org> # v3.10+
Signed-off-by: Felipe Balbi <balbi@ti.com>
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index a48b5a9c6c47..3789b08ef67b 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -99,6 +99,7 @@
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/dma-mapping.h>
+#include <linux/usb.h>
#include "musb_core.h"
@@ -549,7 +550,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
(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;
@@ -2463,7 +2464,7 @@ static int musb_resume(struct device *dev)
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));
}
/*
@@ -2506,7 +2507,7 @@ static int musb_runtime_resume(struct device *dev)
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;
diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c
index 294e159f4afe..5428ed11440d 100644
--- 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, bool do_suspend)
/* 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));
}
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] usb: musb: use new USB_RESUME_TIMEOUT
2015-05-02 13:14 FAILED: patch "[PATCH] usb: musb: use new USB_RESUME_TIMEOUT" failed to apply to 3.14-stable tree gregkh
@ 2015-05-04 15:15 ` Felipe Balbi
2015-05-05 7:17 ` Jiri Slaby
0 siblings, 1 reply; 4+ messages in thread
From: Felipe Balbi @ 2015-05-04 15:15 UTC (permalink / raw)
To: gregkh; +Cc: balbi, b-liu, stable
[-- Attachment #1: Type: text/plain, Size: 1874 bytes --]
From: Felipe Balbi <balbi@ti.com>
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 <Bin Liu <b-liu@ti.com>>
Cc: Bin Liu <b-liu@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
drivers/usb/musb/musb_core.c | 6 ++++--
drivers/usb/musb/musb_virthub.c | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 07576907e2c6..ec69b90475c7 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -99,6 +99,7 @@
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/dma-mapping.h>
+#include <linux/usb.h>
#include "musb_core.h"
@@ -477,10 +478,11 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
(USB_PORT_STAT_C_SUSPEND << 16)
| MUSB_PORT_STAT_RESUME;
musb->rh_timer = jiffies
- + msecs_to_jiffies(20);
+ + msecs_to_jiffies(USB_RESUME_TIMEOUT);
+
schedule_delayed_work(
&musb->finish_resume_work,
- msecs_to_jiffies(20));
+ msecs_to_jiffies(USB_RESUME_TIMEOUT));
musb->xceiv->state = OTG_STATE_A_HOST;
musb->is_active = 1;
diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c
index e2d2d8c9891b..0241a3a0d63e 100644
--- 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, bool do_suspend)
/* 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));
}
}
--
2.4.0.rc3
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] usb: musb: use new USB_RESUME_TIMEOUT
2015-05-04 15:15 ` [PATCH] usb: musb: use new USB_RESUME_TIMEOUT Felipe Balbi
@ 2015-05-05 7:17 ` Jiri Slaby
2015-05-05 14:33 ` Felipe Balbi
0 siblings, 1 reply; 4+ messages in thread
From: Jiri Slaby @ 2015-05-05 7:17 UTC (permalink / raw)
To: balbi, gregkh; +Cc: b-liu, stable
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
On 05/04/2015, 05:15 PM, Felipe Balbi wrote:
> From: Felipe Balbi <balbi@ti.com>
>
> 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 <Bin Liu <b-liu@ti.com>>
Which trees do you want us to apply these three?
thanks,
- --
js
suse labs
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAEBCAAGBQJVSG6QAAoJEL0lsQQGtHBJIaIQAJqef5yCoh6kDPT4dhq7xcn7
Bkl/o1teJptHS5yFXkhJ5hf5zlK7GaUe94OtciDZ1uL3KqXMWGAtBuf6bD2/OaAB
v6n4+NtLOmURgxNdFWLkSeBpHbNarPA6AhYwpaQWY/YTtuw3JhQ4LubSaaI0VqlZ
9ACrYAYOimjpC17XubVDDG0AaCz1LycKM3ORq6E7sxb7zUlF/yBlam/e/xW0OqfE
5laH8Yc8uaRoyQGmhgCtMxsb/uFroLXSrRgGxAKER1t39vzdHr+tZIIo2Y890Hlu
jIZaNk8B3kwcHe3VpmrxfNtuI0M4oF/yBxBUuomlxnFLYJDYcE/GEx8MI+74Fg91
K+5svGBOollzHnJ+KWXheLz1rOryhGtPEw/7GDD5uF3laJc84VOO+/3ebA1vlcfE
CzpfAcMkm8Fwqnza5Ewg9g5BaQ+XK7gUHeN1jSlFfnymDC9MJGxfm0HwnbxJd3zb
BlP1ePmXqqKS9mYrFbv7t0gBjSl3rcxUyL9bSXEtsrBsjAURKZGc3txqs1ph5osJ
bLGMMLDU2Ro6ZVSQY/GyzJ/6OeOK4b/F3elUrAUW0mCkxtll5rHTITouvCgl7ykI
oaGo3qrUuGrHBn+etkFDTNW/onoOXt/P15ZDWJjNFqGS5XQSyKR/xlFO5SN0/qGR
hQS7nMADsrRsra/u/RS+
=LaWr
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] usb: musb: use new USB_RESUME_TIMEOUT
2015-05-05 7:17 ` Jiri Slaby
@ 2015-05-05 14:33 ` Felipe Balbi
0 siblings, 0 replies; 4+ messages in thread
From: Felipe Balbi @ 2015-05-05 14:33 UTC (permalink / raw)
To: Jiri Slaby; +Cc: balbi, gregkh, b-liu, stable
[-- Attachment #1: Type: text/plain, Size: 631 bytes --]
On Tue, May 05, 2015 at 09:17:38AM +0200, Jiri Slaby wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> On 05/04/2015, 05:15 PM, Felipe Balbi wrote:
> > From: Felipe Balbi <balbi@ti.com>
> >
> > 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 <Bin Liu <b-liu@ti.com>>
>
> Which trees do you want us to apply these three?
I sent this as a reply to Greg's "FAILED to apply to 3.14 stable", so
3.14. I'll be clearer next time.
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-05-05 14:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-02 13:14 FAILED: patch "[PATCH] usb: musb: use new USB_RESUME_TIMEOUT" failed to apply to 3.14-stable tree gregkh
2015-05-04 15:15 ` [PATCH] usb: musb: use new USB_RESUME_TIMEOUT Felipe Balbi
2015-05-05 7:17 ` Jiri Slaby
2015-05-05 14:33 ` Felipe Balbi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.