From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 27 Jan 2023 07:30:03 +0000 (+0100)
Subject: 5.10-stable patches
X-Git-Tag: v5.10.166~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34fb7fcacd85566e16c2b5f065b716430c79673e;p=thirdparty%2Fkernel%2Fstable-queue.git

5.10-stable patches

added patches:
	xhci-set-hcd-flag-to-defer-primary-roothub-registration.patch
---

diff --git a/queue-5.10/series b/queue-5.10/series
index 1b5bf9dfe56..c73509c9dd1 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -97,3 +97,4 @@ panic-expose-warn_count-to-sysfs.patch
 docs-fix-path-paste-o-for-sys-kernel-warn_count.patch
 exit-use-read_once-for-all-oops-warn-limit-reads.patch
 bluetooth-hci_sync-cancel-cmd_timer-if-hci_open-fail.patch
+xhci-set-hcd-flag-to-defer-primary-roothub-registration.patch
diff --git a/queue-5.10/xhci-set-hcd-flag-to-defer-primary-roothub-registration.patch b/queue-5.10/xhci-set-hcd-flag-to-defer-primary-roothub-registration.patch
new file mode 100644
index 00000000000..fc0172028b7
--- /dev/null
+++ b/queue-5.10/xhci-set-hcd-flag-to-defer-primary-roothub-registration.patch
@@ -0,0 +1,47 @@
+From b7a4f9b5d0e4b6dd937678c546c0b322dd1a4054 Mon Sep 17 00:00:00 2001
+From: Kishon Vijay Abraham I <kishon@ti.com>
+Date: Tue, 10 May 2022 14:46:30 +0530
+Subject: xhci: Set HCD flag to defer primary roothub registration
+
+From: Kishon Vijay Abraham I <kishon@ti.com>
+
+commit b7a4f9b5d0e4b6dd937678c546c0b322dd1a4054 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 6cca13de26ee ("usb: hub: Fix locking issues with address0_mutex")
+commit 6ae6dc22d2d1 ("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: Mathias Nyman <mathias.nyman@linux.intel.com>
+Tested-by: Chris Chiu <chris.chiu@canonical.com>
+Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
+Link: https://lore.kernel.org/r/20220510091630.16564-3-kishon@ti.com
+Signed-off-by: Adrian Zaharia <Adrian.Zaharia@windriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/host/xhci.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/usb/host/xhci.c
++++ b/drivers/usb/host/xhci.c
+@@ -696,6 +696,8 @@ int xhci_run(struct usb_hcd *hcd)
+ 	xhci_dbg_trace(xhci, trace_xhci_dbg_init,
+ 			"Finished xhci_run for USB2 roothub");
+ 
++	set_bit(HCD_FLAG_DEFER_RH_REGISTER, &hcd->flags);
++
+ 	xhci_dbc_init(xhci);
+ 
+ 	xhci_debugfs_init(xhci);