Skip to content

Commit 829baf3

Browse files
kishongregkh
authored andcommitted
xhci: Set HCD flag to defer primary roothub registration
[ Upstream commit b7a4f9b ] Set "HCD_FLAG_DEFER_RH_REGISTER" to hcd->flags in xhci_run() to defer registering primary roothub in usb_add_hcd() if xhci has two roothubs. This will make sure both primary roothub and secondary roothub will be registered along with the second HCD. This is required for cold plugged USB devices to be detected in certain PCIe USB cards (like Inateck USB card connected to AM64 EVM or J7200 EVM). This patch has been added and reverted earier as it triggered a race in usb device enumeration. That race is now fixed in 5.16-rc3, and in stable back to 5.4 commit 6cca13d ("usb: hub: Fix locking issues with address0_mutex") commit 6ae6dc2 ("usb: hub: Fix usb enumeration issue due to address0 race") [minor rebase change, and commit message update -Mathias] CC: [email protected] # 5.4+ Suggested-by: Mathias Nyman <[email protected]> Tested-by: Chris Chiu <[email protected]> Signed-off-by: Kishon Vijay Abraham I <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 813f4b4 commit 829baf3

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/usb/host/xhci.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -693,6 +693,8 @@ int xhci_run(struct usb_hcd *hcd)
693693
xhci_dbg_trace(xhci, trace_xhci_dbg_init,
694694
"Finished xhci_run for USB2 roothub");
695695

696+
set_bit(HCD_FLAG_DEFER_RH_REGISTER, &hcd->flags);
697+
696698
xhci_create_dbc_dev(xhci);
697699

698700
xhci_debugfs_init(xhci);

0 commit comments

Comments
 (0)