| Message ID | 20230330143056.1390020-3-mathias.nyman@linux.intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Commit | 8e77d3d59d7b5da13deda1d832c51b8bbdbe2037 |
| Headers | show |
| Series | xhci fixes for usb-linus | expand |
On Thu, Mar 30, 2023 at 05:30:55PM +0300, Mathias Nyman wrote: > This reverts commit 4c2604a9a6899bab195edbee35fc8d64ce1444aa. > > 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. > > Link: https://lore.kernel.org/linux-usb/20230307132120.5897c5af@deangelis.fenrir.org.uk > Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> I'll add a Fixes: and cc: stable on this, ok? thanks, greg k-h
On 30.3.2023 17.40, Greg KH wrote: > On Thu, Mar 30, 2023 at 05:30:55PM +0300, Mathias Nyman wrote: >> This reverts commit 4c2604a9a6899bab195edbee35fc8d64ce1444aa. >> >> 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. >> >> Link: https://lore.kernel.org/linux-usb/20230307132120.5897c5af@deangelis.fenrir.org.uk >> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> > > I'll add a Fixes: and cc: stable on this, ok? Yes, please. Thanks Mathias
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index fb988e4ea924..6db07ca419c3 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -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)
This reverts commit 4c2604a9a6899bab195edbee35fc8d64ce1444aa. 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. Link: https://lore.kernel.org/linux-usb/20230307132120.5897c5af@deangelis.fenrir.org.uk Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> --- drivers/usb/host/xhci-pci.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)