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

Commit 93233aa7 authored by Xu Yang's avatar Xu Yang Committed by Greg Kroah-Hartman
Browse files

usb: chipidea: udc: enable suspend interrupt after usb reset 



[ Upstream commit e4fdcc10092fb244218013bfe8ff01c55d54e8e4 ]

Currently, suspend interrupt is enabled before pullup enable operation.
This will cause a suspend interrupt assert right after pullup DP. This
suspend interrupt is meaningless, so this will ignore such interrupt
by enable it after usb reset completed.

Signed-off-by: default avatarXu Yang <xu.yang_2@nxp.com>
Acked-by: default avatarPeter Chen <peter.chen@kernel.org>
Link: https://lore.kernel.org/r/20240823073832.1702135-1-xu.yang_2@nxp.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 940e83f3

drivers/usb/chipidea/udc.c

+7 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static int hw_device_state(struct ci_hdrc *ci, u32 dma) 
		hw_write(ci, OP_ENDPTLISTADDR, ~0, dma);

		/* interrupt, error, port change, reset, sleep/suspend */

		hw_write(ci, OP_USBINTR, ~0,

			     USBi_UI|USBi_UEI|USBi_PCI|USBi_URI|USBi_SLI);

			     USBi_UI|USBi_UEI|USBi_PCI|USBi_URI);

	} else {

		hw_write(ci, OP_USBINTR, ~0, 0);

	}
@@ -748,6 +748,7 @@ __releases(ci->lock) 
__acquires(ci->lock)

{

	int retval;

	u32 intr;



	spin_unlock(&ci->lock);

	if (ci->gadget.speed != USB_SPEED_UNKNOWN)
@@ -761,6 +762,11 @@ __acquires(ci->lock) 
	if (retval)

		goto done;



	/* clear SLI */

	hw_write(ci, OP_USBSTS, USBi_SLI, USBi_SLI);

	intr = hw_read(ci, OP_USBINTR, ~0);

	hw_write(ci, OP_USBINTR, ~0, intr | USBi_SLI);



	ci->status = usb_ep_alloc_request(&ci->ep0in->ep, GFP_ATOMIC);

	if (ci->status == NULL)

		retval = -ENOMEM;