提交 9c34d25b 编写于 作者: K Kishon Vijay Abraham I 提交者: sanglipeng

xhci: Set HCD flag to defer primary roothub registration

stable inclusion
from stable-v5.10.166
commit 6da7055826a10b3c1de7c7cc22d509ab41310b8b
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7TH9O

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=6da7055826a10b3c1de7c7cc22d509ab41310b8b

--------------------------------

commit b7a4f9b5 upstream.

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 6cca13de ("usb: hub: Fix locking issues with address0_mutex")
commit 6ae6dc22 ("usb: hub: Fix usb enumeration issue due to address0
race")

[minor rebase change, and commit message update -Mathias]

CC: stable@vger.kernel.org # 5.4+
Suggested-by: NMathias Nyman <mathias.nyman@linux.intel.com>
Tested-by: NChris Chiu <chris.chiu@canonical.com>
Signed-off-by: NKishon Vijay Abraham I <kishon@ti.com>
Link: https://lore.kernel.org/r/20220510091630.16564-3-kishon@ti.comSigned-off-by: NAdrian Zaharia <Adrian.Zaharia@windriver.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Nsanglipeng <sanglipeng1@jd.com>
上级 630c907d
...@@ -696,6 +696,8 @@ int xhci_run(struct usb_hcd *hcd) ...@@ -696,6 +696,8 @@ int xhci_run(struct usb_hcd *hcd)
xhci_dbg_trace(xhci, trace_xhci_dbg_init, xhci_dbg_trace(xhci, trace_xhci_dbg_init,
"Finished xhci_run for USB2 roothub"); "Finished xhci_run for USB2 roothub");
set_bit(HCD_FLAG_DEFER_RH_REGISTER, &hcd->flags);
xhci_dbc_init(xhci); xhci_dbc_init(xhci);
xhci_debugfs_init(xhci); xhci_debugfs_init(xhci);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册