Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 191edc5e authored by Kai-Heng Feng's avatar Kai-Heng Feng Committed by Greg Kroah-Hartman
Browse files

xhci: Fix front USB ports on ASUS PRIME B350M-A 



When a USB device gets plugged on ASUS PRIME B350M-A's front ports, the
xHC stops working:
[  549.114587] xhci_hcd 0000:02:00.0: WARN: xHC CMD_RUN timeout
[  549.114608] suspend_common(): xhci_pci_suspend+0x0/0xc0 returns -110
[  549.114638] xhci_hcd 0000:02:00.0: can't suspend (hcd_pci_runtime_suspend returned -110)

Delay before running xHC command CMD_RUN can workaround the issue.

Use a new quirk to make the delay only targets to the affected xHC.

Signed-off-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d56e57ca

drivers/usb/host/xhci-pci.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -126,6 +126,9 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) 
	if (pdev->vendor == PCI_VENDOR_ID_AMD && usb_amd_find_chipset_info())

	if (pdev->vendor == PCI_VENDOR_ID_AMD && usb_amd_find_chipset_info())

		xhci->quirks |= XHCI_AMD_PLL_FIX;

		xhci->quirks |= XHCI_AMD_PLL_FIX;





	if (pdev->vendor == PCI_VENDOR_ID_AMD && pdev->device == 0x43bb)

		xhci->quirks |= XHCI_SUSPEND_DELAY;



	if (pdev->vendor == PCI_VENDOR_ID_AMD)

	if (pdev->vendor == PCI_VENDOR_ID_AMD)

		xhci->quirks |= XHCI_TRUST_TX_LENGTH;

		xhci->quirks |= XHCI_TRUST_TX_LENGTH;

drivers/usb/host/xhci.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -877,6 +877,9 @@ int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup) 
	clear_bit(HCD_FLAG_POLL_RH, &xhci->shared_hcd->flags);

	clear_bit(HCD_FLAG_POLL_RH, &xhci->shared_hcd->flags);

	del_timer_sync(&xhci->shared_hcd->rh_timer);

	del_timer_sync(&xhci->shared_hcd->rh_timer);





	if (xhci->quirks & XHCI_SUSPEND_DELAY)

		usleep_range(1000, 1500);



	spin_lock_irq(&xhci->lock);

	spin_lock_irq(&xhci->lock);

	clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);

	clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);

	clear_bit(HCD_FLAG_HW_ACCESSIBLE, &xhci->shared_hcd->flags);

	clear_bit(HCD_FLAG_HW_ACCESSIBLE, &xhci->shared_hcd->flags);

drivers/usb/host/xhci.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -1826,6 +1826,7 @@ struct xhci_hcd { 
#define XHCI_U2_DISABLE_WAKE	(1 << 27)

#define XHCI_U2_DISABLE_WAKE	(1 << 27)

#define XHCI_ASMEDIA_MODIFY_FLOWCONTROL	(1 << 28)

#define XHCI_ASMEDIA_MODIFY_FLOWCONTROL	(1 << 28)

#define XHCI_HW_LPM_DISABLE	(1 << 29)

#define XHCI_HW_LPM_DISABLE	(1 << 29)

#define XHCI_SUSPEND_DELAY	(1 << 30)





	unsigned int		num_active_eps;

	unsigned int		num_active_eps;

	unsigned int		limit_active_eps;

	unsigned int		limit_active_eps;