Commit 914873a0 authored by Jose Alberto Reguero's avatar Jose Alberto Reguero Committed by Wen Zhiwei
Browse files

usb: xhci: Fix problem with xhci resume from suspend 

stable inclusion
from stable-v6.6.57
commit cb8b441f73a607574449aa16333a38e0d9d459bf
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB2M97

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=cb8b441f73a607574449aa16333a38e0d9d459bf



--------------------------------

commit d44238d8254a36249d576c96473269dbe500f5e4 upstream.

I have a ASUS PN51 S mini pc that has two xhci devices. One from AMD,
and other from ASMEDIA. The one from ASMEDIA have problems when resume
from suspend, and keep broken until unplug the  power cord. I use this
kernel parameter: xhci-hcd.quirks=128 and then it works ok. I make a
path to reset only the ASMEDIA xhci.

Signed-off-by: default avatarJose Alberto Reguero <jose.alberto.reguero@gmail.com>
Cc: stable <stable@kernel.org>
Link: https://lore.kernel.org/r/20240919184202.22249-1-jose.alberto.reguero@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 636bab75

drivers/usb/host/xhci-pci.c

+5 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
#define PCI_DEVICE_ID_ASMEDIA_1042A_XHCI		0x1142

#define PCI_DEVICE_ID_ASMEDIA_1142_XHCI			0x1242

#define PCI_DEVICE_ID_ASMEDIA_2142_XHCI			0x2142

#define PCI_DEVICE_ID_ASMEDIA_3042_XHCI			0x3042

#define PCI_DEVICE_ID_ASMEDIA_3242_XHCI			0x3242



#define PCI_DEVICE_ID_CADENCE				0x17CD
@@ -516,6 +517,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) 
		pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI)

		xhci->quirks |= XHCI_ASMEDIA_MODIFY_FLOWCONTROL;



	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&

	    pdev->device == PCI_DEVICE_ID_ASMEDIA_3042_XHCI)

		xhci->quirks |= XHCI_RESET_ON_RESUME;



	if (pdev->vendor == PCI_VENDOR_ID_TI && pdev->device == 0x8241)

		xhci->quirks |= XHCI_LIMIT_ENDPOINT_INTERVAL_7;