dwc2_gadget_exit_clock_gating invoke call_gadget to hold hsotg->lock,
causing dwc2_hsotg_ep_disable_lock unable to acquire the lock,
lead to a deadlock.

To ensure that enabling clock gating before stopping UDC does not
cause the deadlock, we lock exit_clock_gating using
spin_lock_irqsave and spin_unlock_irqrestore.

Signed-off-by: xiaoxiao_li <lxxstone@gmail.com>
---
 drivers/usb/dwc2/gadget.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index d216e26c7..c8b02c27d 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -4607,7 +4607,9 @@ static int dwc2_hsotg_udc_stop(struct usb_gadget *gadget)
 	/* Exit clock gating when driver is stopped. */
 	if (hsotg->params.power_down == DWC2_POWER_DOWN_PARAM_NONE &&
 	    hsotg->bus_suspended && !hsotg->params.no_clock_gating) {
+		spin_lock_irqsave(&hsotg->lock, flags);
 		dwc2_gadget_exit_clock_gating(hsotg, 0);
+		spin_unlock_irqrestore(&hsotg->lock, flags);
 	}
 
 	/* all endpoints should be shutdown */
-- 
2.35.1

On Tue, Mar 10, 2026 at 04:00:00PM +0800, xiaoxiao_li wrote:
> dwc2_gadget_exit_clock_gating invoke call_gadget to hold hsotg->lock,
> causing dwc2_hsotg_ep_disable_lock unable to acquire the lock,
> lead to a deadlock.
> 
> To ensure that enabling clock gating before stopping UDC does not
> cause the deadlock, we lock exit_clock_gating using
> spin_lock_irqsave and spin_unlock_irqrestore.
> 
> Signed-off-by: xiaoxiao_li <lxxstone@gmail.com>

Please use your real name for your From: and Signed-off-by: line.


> ---
>  drivers/usb/dwc2/gadget.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
> index d216e26c7..c8b02c27d 100644
> --- a/drivers/usb/dwc2/gadget.c
> +++ b/drivers/usb/dwc2/gadget.c
> @@ -4607,7 +4607,9 @@ static int dwc2_hsotg_udc_stop(struct usb_gadget *gadget)
>  	/* Exit clock gating when driver is stopped. */
>  	if (hsotg->params.power_down == DWC2_POWER_DOWN_PARAM_NONE &&
>  	    hsotg->bus_suspended && !hsotg->params.no_clock_gating) {
> +		spin_lock_irqsave(&hsotg->lock, flags);
>  		dwc2_gadget_exit_clock_gating(hsotg, 0);
> +		spin_unlock_irqrestore(&hsotg->lock, flags);

If the call to dwc2_gadget_exit_clock_gating() wants the lock, how will
calling it outside of it fix the problem?  I'm confused by your
changelog text, what am I missing here?  And what changed to cause this
to not work properly?

thanks,

greg k-h