FAILED: patch "[PATCH] usb: musb: fix gadget state on disconnect" failed to apply to 6.6-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.6-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]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 67a59f82196c8c4f50c83329f0577acfb1349b50
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025072131-trailing-chaos-96f3@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 67a59f82196c8c4f50c83329f0577acfb1349b50 Mon Sep 17 00:00:00 2001
From: Drew Hamilton <[email protected]>
Date: Tue, 1 Jul 2025 11:41:26 -0400
Subject: [PATCH] usb: musb: fix gadget state on disconnect
When unplugging the USB cable or disconnecting a gadget in usb peripheral mode with echo "" > /sys/kernel/config/usb_gadget/<your_gadget>/UDC, /sys/class/udc/musb-hdrc.0/state does not change from USB_STATE_CONFIGURED.
Testing on dwc2/3 shows they both update the state to USB_STATE_NOTATTACHED.
Add calls to usb_gadget_set_state in musb_g_disconnect and musb_gadget_stop to fix both cases.
drivers/usb/musb/musb_gadget.c +2 -0
@@ -1913,6 +1913,7 @@ static int musb_gadget_stop(struct usb_gadget *g)* gadget driver here and have everything work; * that currently misbehaves. */ +usb_gadget_set_state (g,USB_STATE_NOTATTACHED );/* Force check of devctl register for PM runtime */ pm_runtime_mark_last_busy (musb->controller);
@@ -2019,6 +2020,7 @@ void musb_g_disconnect(struct musb *musb)case OTG_STATE_B_PERIPHERAL :case OTG_STATE_B_IDLE :musb_set_state (musb,OTG_STATE_B_IDLE ); +usb_gadget_set_state (&musb->g,USB_STATE_NOTATTACHED );break ;case OTG_STATE_B_SRP_INIT :break ;
Sasha Levin
maintainerPATCH 1/1 usb: musb: fix gadget state on disconnect
From: Drew Hamilton <[email protected]>
[ Upstream commit 67a59f82196c8c4f50c83329f0577acfb1349b50 ]
When unplugging the USB cable or disconnecting a gadget in usb peripheral mode with echo "" > /sys/kernel/config/usb_gadget/<your_gadget>/UDC, /sys/class/udc/musb-hdrc.0/state does not change from USB_STATE_CONFIGURED.
Testing on dwc2/3 shows they both update the state to USB_STATE_NOTATTACHED.
Add calls to usb_gadget_set_state in musb_g_disconnect and musb_gadget_stop to fix both cases.
--- drivers/usb/musb/musb_gadget.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/musb/musb_gadget.c +2 -0
@@ -1925,6 +1925,7 @@ static int musb_gadget_stop(struct usb_gadget *g)* gadget driver here and have everything work; * that currently misbehaves. */ +usb_gadget_set_state (g,USB_STATE_NOTATTACHED );/* Force check of devctl register for PM runtime */ pm_runtime_mark_last_busy (musb->controller);
@@ -2031,6 +2032,7 @@ void musb_g_disconnect(struct musb *musb)case OTG_STATE_B_PERIPHERAL :case OTG_STATE_B_IDLE :musb_set_state (musb,OTG_STATE_B_IDLE ); +usb_gadget_set_state (&musb->g,USB_STATE_NOTATTACHED );break ;case OTG_STATE_B_SRP_INIT :break ;
Signature · 1 line
2.39.5