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

Commit e7ad225b authored by Forest Crossman's avatar Forest Crossman Committed by Greg Kroah-Hartman
Browse files

usb: xhci: define IDs for various ASMedia host controllers 



commit 1841cb255da41e87bed9573915891d056f80e2e7 upstream.

Not all ASMedia host controllers have a device ID that matches its part
number. #define some of these IDs to make it clearer at a glance which
chips require what quirks.

Acked-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarForest Crossman <cyrozap@gmail.com>
Link: https://lore.kernel.org/r/20200728042408.180529-2-cyrozap@gmail.com


Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7173ac5c

drivers/usb/host/xhci-pci.c

+5 −3
Original line number Diff line number Diff line
@@ -55,7 +55,9 @@ 
#define PCI_DEVICE_ID_AMD_PROMONTORYA_3			0x43ba

#define PCI_DEVICE_ID_AMD_PROMONTORYA_2			0x43bb

#define PCI_DEVICE_ID_AMD_PROMONTORYA_1			0x43bc

#define PCI_DEVICE_ID_ASMEDIA_1042_XHCI			0x1042

#define PCI_DEVICE_ID_ASMEDIA_1042A_XHCI		0x1142

#define PCI_DEVICE_ID_ASMEDIA_2142_XHCI			0x2142



static const char hcd_name[] = "xhci_hcd";
@@ -245,13 +247,13 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) 
		xhci->quirks |= XHCI_BROKEN_STREAMS;



	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&

			pdev->device == 0x1042)

		pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI)

		xhci->quirks |= XHCI_BROKEN_STREAMS;

	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&

			pdev->device == 0x1142)

		pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI)

		xhci->quirks |= XHCI_TRUST_TX_LENGTH;

	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&

			pdev->device == 0x2142)

		pdev->device == PCI_DEVICE_ID_ASMEDIA_2142_XHCI)

		xhci->quirks |= XHCI_NO_64BIT_SUPPORT;



	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&