Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b10ec178 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Greg Kroah-Hartman
Browse files

usb: musb: fix MUSB_QUIRK_B_DISCONNECT_99 handling 



commit b65ba0c362be665192381cc59e3ac3ef6f0dd1e1 upstream.

In commit 92af4fc6ec33 ("usb: musb: Fix suspend with devices
connected for a64"), the logic to support the
MUSB_QUIRK_B_DISCONNECT_99 quirk was modified to only conditionally
schedule the musb->irq_work delayed work.

This commit badly breaks ECM Gadget on AM335X. Indeed, with this
commit, one can observe massive packet loss:

$ ping 192.168.0.100
...
15 packets transmitted, 3 received, 80% packet loss, time 14316ms

Reverting this commit brings back a properly functioning ECM
Gadget. An analysis of the commit seems to indicate that a mistake was
made: the previous code was not falling through into the
MUSB_QUIRK_B_INVALID_VBUS_91, but now it is, unless the condition is
taken.

Changing the logic to be as it was before the problematic commit *and*
only conditionally scheduling musb->irq_work resolves the regression:

$ ping 192.168.0.100
...
64 packets transmitted, 64 received, 0% packet loss, time 64475ms

Fixes: 92af4fc6ec33 ("usb: musb: Fix suspend with devices connected for a64")
Cc: stable@vger.kernel.org
Tested-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Tested-by: default avatarDrew Fustini <drew@beagleboard.org>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@bootlin.com>
Link: https://lore.kernel.org/r/20210528140446.278076-1-thomas.petazzoni@bootlin.com


Signed-off-by: default avatarFabian Godehardt <fg@emlix.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8f6f8443

drivers/usb/musb/musb_core.c

+1 −2
Original line number Diff line number Diff line
@@ -1873,9 +1873,8 @@ static void musb_pm_runtime_check_session(struct musb *musb) 
			schedule_delayed_work(&musb->irq_work,

					      msecs_to_jiffies(1000));

			musb->quirk_retries--;

			break;

		}

		/* fall through */

		break;

	case MUSB_QUIRK_B_INVALID_VBUS_91:

		if (musb->quirk_retries && !musb->flush_irq_work) {

			musb_dbg(musb,