Commit 8e77d3d5 authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

Revert "usb: xhci-pci: Set PROBE_PREFER_ASYNCHRONOUS" 

This reverts commit 4c2604a9.

Asynch probe caused regression in a setup with both Renesas and Intel xHC
controllers. Devices connected to the Renesas disconnected shortly after
boot. With Asynch probe the busnumbers got interleaved.

xhci_hcd 0000:00:14.0: new USB bus registered, assigned bus number 1
xhci_hcd 0000:04:00.0: new USB bus registered, assigned bus number 2
xhci_hcd 0000:00:14.0: new USB bus registered, assigned bus number 3
xhci_hcd 0000:04:00.0: new USB bus registered, assigned bus number 4

Reason why this commit causes regression is still unknown, but revert it
while debugging the issue.

Fixes: 4c2604a9 ("usb: xhci-pci: Set PROBE_PREFER_ASYNCHRONOUS")
Cc: stable <stable@kernel.org>
Link: https://lore.kernel.org/linux-usb/20230307132120.5897c5af@deangelis.fenrir.org.uk


Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20230330143056.1390020-3-mathias.nyman@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ecaa4902

drivers/usb/host/xhci-pci.c

+3 −4
Original line number Diff line number Diff line
@@ -771,12 +771,11 @@ static struct pci_driver xhci_pci_driver = { 
	/* suspend and resume implemented later */



	.shutdown = 	usb_hcd_pci_shutdown,

	.driver = {

#ifdef CONFIG_PM

		.pm = &usb_hcd_pci_pm_ops,

#endif

		.probe_type = PROBE_PREFER_ASYNCHRONOUS,

	.driver = {

		.pm = &usb_hcd_pci_pm_ops

	},

#endif

};



static int __init xhci_pci_init(void)