diff mbox series

[SRU,I,1/2] UBUNTU: SAUCE: Revert "Revert "xhci: Set HCD flag to defer primary roothub registration""

Message ID 20220407200058.26387-2-luke.nowakowskikrijger@canonical.com
State New
Headers show
Series [SRU,I,1/2] UBUNTU: SAUCE: Revert "Revert "xhci: Set HCD flag to defer primary roothub registration"" | expand

Commit Message

Luke Nowakowski-Krijger April 7, 2022, 8 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1968210

This reverts commit 15993bb4c60646d562583bae0272f46179833932.

Reintroduce this commit as it fixes an issue with certain intel xHCI
controllers where device enumeration happens before xHC is running,
causing USB devices not to be detected at boot time.

This commit will be reintroduced upstream due to previous bugs
being fixed, but lets reintroduce it now to fix the problem users are
experiencing.

Signed-off-by: Luke Nowakowski-Krijger <luke.nowakowskikrijger@canonical.com>
---
 drivers/usb/host/xhci.c | 1 +
 1 file changed, 1 insertion(+)
diff mbox series

Patch

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 57b67050b284..a8300bc8f634 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -692,6 +692,7 @@  int xhci_run(struct usb_hcd *hcd)
 		if (ret)
 			xhci_free_command(xhci, command);
 	}
+	set_bit(HCD_FLAG_DEFER_RH_REGISTER, &hcd->flags);
 	xhci_dbg_trace(xhci, trace_xhci_dbg_init,
 			"Finished xhci_run for USB2 roothub");