patch "usb: chipidea: udc: fix sleeping function called from invalid context" added to usb-linus

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

usb: chipidea: udc: fix sleeping function called from invalid context

to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.

If you have any questions about this process, please let me know.

From 7368760d1bcdabf515c41a502568b489de3da683 Mon Sep 17 00:00:00 2001
From: Peter Chen <[email protected]>
Date: Mon, 16 Mar 2020 11:10:34 +0800
Subject: usb: chipidea: udc: fix sleeping function called from invalid context

The code calls pm_runtime_get_sync with irq disabled, it causes below warning:

BUG: sleeping function called from invalid context at
wer/runtime.c:1075
in_atomic(): 1, irqs_disabled(): 128, non_block: 0, pid:
er/u8:1
CPU: 1 PID: 37 Comm: kworker/u8:1 Not tainted
20200304-00181-gbebfd2a5be98 #1588
Hardware name: NVIDIA Tegra SoC (Flattened Device Tree)
Workqueue: ci_otg ci_otg_work

[<c010e8bd>] (unwind_backtrace) from [<c010a315>] 1/0x14)
[<c010a315>] (show_stack) from [<c0987d29>] 5/0x94)
[<c0987d29>] (dump_stack) from [<c013e77f>] +0xeb/0x118)
[<c013e77f>] (___might_sleep) from [<c052fa1d>] esume+0x75/0x78)
[<c052fa1d>] (__pm_runtime_resume) from [<c0627a33>] 0x23/0x74)
[<c0627a33>] (ci_udc_pullup) from [<c062fb93>] nect+0x2b/0xcc)
[<c062fb93>] (usb_gadget_connect) from [<c062769d>] _connect+0x59/0x104)
[<c062769d>] (ci_hdrc_gadget_connect) from [<c062778b>] ssion+0x43/0x48)
[<c062778b>] (ci_udc_vbus_session) from [<c062f997>] s_connect+0x17/0x9c)
[<c062f997>] (usb_gadget_vbus_connect) from [<c062634d>] bd/0x128)
[<c062634d>] (ci_otg_work) from [<c0134719>] rk+0x149/0x404)
[<c0134719>] (process_one_work) from [<c0134acb>] 0xf7/0x3bc)
[<c0134acb>] (worker_thread) from [<c0139433>] x118)
[<c0139433>] (kthread) from [<c01010bd>] (ret_from_fork+0x11/0x34)

---
 drivers/usb/chipidea/udc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

index ffaf46f5d062..4c4ac30db498 100644
@@ -1530,18 +1530,19 @@ static const struct usb_ep_ops usb_ep_ops = {
 static void ci_hdrc_gadget_connect(struct usb_gadget *_gadget, int is_active)
 {
 	struct ci_hdrc *ci = container_of(_gadget, struct ci_hdrc, gadget);
-	unsigned long flags;
 
 	if (is_active) {
 		pm_runtime_get_sync(&_gadget->dev);
 		hw_device_reset(ci);
-		spin_lock_irqsave(&ci->lock, flags);
+		spin_lock_irq(&ci->lock);
 		if (ci->driver) {
 			hw_device_state(ci, ci->ep0out->qh.dma);
 			usb_gadget_set_state(_gadget, USB_STATE_POWERED);
+			spin_unlock_irq(&ci->lock);
 			usb_udc_vbus_handler(_gadget, true);
+		} else {
+			spin_unlock_irq(&ci->lock);
 		}
-		spin_unlock_irqrestore(&ci->lock, flags);
 	} else {
 		usb_udc_vbus_handler(_gadget, false);
 		if (ci->driver)

2.25.1