Skip to contentSkip to conversation

Patch "usb: musb: host: rely on port_mode to call musb_start()" has been added to the 4.1-stable tree

PATCH [email protected] 1 participant 1 message Jul 30, 2015

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

usb: musb: host: rely on port_mode to call musb_start()

to the 4.1-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-host-rely-on-port_mode-to-call-musb_start.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From be9d39881fc4fa39a64b6eed6bab5d9ee5125344 Mon Sep 17 00:00:00 2001

From: Felipe Balbi <[email protected]>
Date: Tue, 2 Jun 2015 13:03:36 -0500
Subject: usb: musb: host: rely on port_mode to call musb_start()

From: Felipe Balbi <[email protected]>

commit be9d39881fc4fa39a64b6eed6bab5d9ee5125344 upstream.

Currently, we're calling musb_start() twice for DRD ports in some situations. This has been observed to cause enumeration issues after suspend/resume cycles with AM335x.

In order to fix the problem, we just have to fix the check on musb_has_gadget() so that it only returns true if current mode is Host and ignore the fact that we have or not a gadget driver loaded.

Fixes ae44df2e21b5 (usb: musb: call musb_start() only once in OTG mode)
Cc Sebastian Andrzej Siewior <[email protected]>
---
 drivers/usb/musb/musb_virthub.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/usb/musb/musb_virthub.c +1 -3
@@ -273,9 +273,7 @@ static int musb_has_gadget(struct musb *
 #ifdef CONFIG_USB_MUSB_HOST
 	return 1;
 #else
-	if (musb->port_mode == MUSB_PORT_MODE_HOST)
-		return 1;
-	return musb->g.dev.driver != NULL;
+	return musb->port_mode == MUSB_PORT_MODE_HOST;
 #endif
 }
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/usb-f_mass_storage-limit-number-of-reported-luns.patch queue-4.1/usb-dwc3-reset-the-transfer-resource-index-on-set_interface.patch queue-4.1/usb-musb-host-rely-on-port_mode-to-call-musb_start.patch queue-4.1/usb-gadget-mv_udc_core-fix-phy_regs-i-o-memory-leak.patch queue-4.1/usb-dwc3-gadget-don-t-clear-ep_busy-too-early.patch queue-4.1/usb-gadget-composite-fix-null-pointer-dereference.patch queue-4.1/usb-dwc3-gadget-return-error-if-command-sent-to-depcmd-register-fails.patch queue-4.1/usb-phy-mxs-suspend-to-ram-causes-null-pointer-dereference.patch queue-4.1/usb-gadget-f_fs-do-not-set-cancel-function-on-synchronous-read-write.patch queue-4.1/usb-dwc3-gadget-return-error-if-command-sent-to-dgcmd-register-fails.patch