fix xhci feature merge issue in current usb-next
Subsystems (2)
cover fix xhci feature merge issue in current usb-next
Hi Greg
Two different conflicting features touching xhci got into current usb-next for 5.19
One adds support for xHC hosts with just one roothub, second adds support to defer first roothub registration until second roothub is added.
commit 873f323618c2 ("xhci: prepare for operation w/o shared hcd") commit b7a4f9b5d0e4 ("xhci: Set HCD flag to defer primary roothub registration")
We ended up trying to defer roothub registratinog for xHC with just one roothub.
This patch fixes the issue and goes on top of current usb-next
This patch shouldn't be needed for stable as the new feature to support one roothub xHC isn't marked for stable either, but setting Fixes flag in case someone later picks it up for stable.
Mathias Nyman (1):
xhci: Don't defer primary roothub registration if there is only one
roothub
drivers/usb/host/xhci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/1 xhci: Don't defer primary roothub registration if there is only one roothub
The support for xHCI controllers with only one roothub, and the code to defer primary roothub registation until second roothub got merged to usb-next for 5.19 at the same time.
commit 873f323618c2 ("xhci: prepare for operation w/o shared hcd") commit b7a4f9b5d0e4 ("xhci: Set HCD flag to defer primary roothub registration")
These got merged in such a way that the flag to defer primary roothub registration is set even for xHC controllers with just one roothub.
Fix this by setting the defer flag in a codepath taken only if we have two roothubs
--- drivers/usb/host/xhci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/host/xhci.c +2 -2
@@ -696,8 +696,6 @@ int xhci_run(struct usb_hcd *hcd)xhci_dbg_trace (xhci, trace_xhci_dbg_init,"Finished %s for main hcd" , __func__); -set_bit (HCD_FLAG_DEFER_RH_REGISTER , &hcd->flags); -xhci_create_dbc_dev (xhci);xhci_debugfs_init (xhci);
@@ -705,6 +703,8 @@ int xhci_run(struct usb_hcd *hcd)if (xhci_has_one_roothub (xhci))return xhci_run_finished (xhci); +set_bit (HCD_FLAG_DEFER_RH_REGISTER , &hcd->flags); +return 0 ; }EXPORT_SYMBOL_GPL (xhci_run);
Signature · 1 line
2.25.1
Greg KH
maintainerQuoted 22 lines · Mathias Nyman
Hi Greg
Two different conflicting features touching xhci got into current usb-next for 5.19
One adds support for xHC hosts with just one roothub, second adds support to defer first roothub registration until second roothub is added.
commit
873f323618c2("xhci: prepare for operation w/o shared hcd") commitb7a4f9b5d0e4("xhci: Set HCD flag to defer primary roothub registration")We ended up trying to defer roothub registratinog for xHC with just one roothub.
This patch fixes the issue and goes on top of current usb-next
This patch shouldn't be needed for stable as the new feature to support one roothub xHC isn't marked for stable either, but setting Fixes flag in case someone later picks it up for stable.
Quoted 6 lines
Mathias Nyman (1):
xhci: Don't defer primary roothub registration if there is only one
roothubdrivers/usb/host/xhci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Sorry about the merge issue, now queued up, thanks!
greg k-h