Skip to contentSkip to conversation

FAILED: patch "[PATCH] usb: musb: use new USB_RESUME_TIMEOUT" failed to apply to 3.14-stable tree

PATCH In review [email protected] 3 participants 4 messages May 2, 2015 – May 5, 2015

Subsystems (3)
Stable branch USB MUSB multipoint high speed dual-role controller
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

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 <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 309be239369609929d5d3833ee043f7c5afc95d1 Mon Sep 17 00:00:00 2001

From: Felipe Balbi <[email protected]>
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 <[email protected]>>

Cc Bin Liu <[email protected]>
Cc <[email protected]> # v3.10+
Signed-off-by Felipe Balbi <[email protected]>
drivers/usb/musb/musb_core.c +4 -3
index a48b5a9c6c47..3789b08ef67b 100644
@@ -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;
drivers/usb/musb/musb_virthub.c +1 -1
index 294e159f4afe..5428ed11440d 100644
@@ -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));
 	}
 }
#1 lore raw

PATCH 1/1 usb: musb: use new USB_RESUME_TIMEOUT

From: Felipe Balbi <[email protected]>

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 <[email protected]>>

Cc Bin Liu <[email protected]>
Signed-off-by Felipe Balbi <[email protected]>
---
 drivers/usb/musb/musb_core.c    | 6 ++++--
 drivers/usb/musb/musb_virthub.c | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
drivers/usb/musb/musb_core.c +4 -2
index 07576907e2c6..ec69b90475c7 100644
@@ -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;
drivers/usb/musb/musb_virthub.c +1 -1
index e2d2d8c9891b..0241a3a0d63e 100644
@@ -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));
 	}
 }
Signature · 1 line
2.4.0.rc3
#2 lore raw

Re: [PATCH] usb: musb: use new USB_RESUME_TIMEOUT

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Quoted 8 lines · Felipe Balbi

From: Felipe Balbi <[email protected]>

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 <[email protected]>>

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-----

#3 lore raw

Re: [PATCH] usb: musb: use new USB_RESUME_TIMEOUT

Quoted 6 lines · Jiri Slaby

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Quoted 2 lines · Felipe Balbi

From: Felipe Balbi <[email protected]>

Quoted 8 lines
Quoted 6 lines

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 <[email protected]>>

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.

Signature · 1 line
balbi