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

usb: xhci: Fix ASMedia ASM1042A and ASM3242 DMA addressing 



I've confirmed that both the ASMedia ASM1042A and ASM3242 have the same
problem as the ASM1142 and ASM2142/ASM3142, where they lose some of the
upper bits of 64-bit DMA addresses. As with the other chips, this can
cause problems on systems where the upper bits matter, and adding the
XHCI_NO_64BIT_SUPPORT quirk completely fixes the issue.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarForest Crossman <cyrozap@gmail.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20210311115353.2137560-4-mathias.nyman@linux.intel.com


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

drivers/usb/host/xhci-pci.c

+6 −2
Original line number Diff line number Diff line
@@ -66,6 +66,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_3242_XHCI			0x3242



static const char hcd_name[] = "xhci_hcd";
@@ -276,11 +277,14 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) 
		pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI)

		xhci->quirks |= XHCI_BROKEN_STREAMS;

	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&

		pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI)

		pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI) {

		xhci->quirks |= XHCI_TRUST_TX_LENGTH;

		xhci->quirks |= XHCI_NO_64BIT_SUPPORT;

	}

	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&

	    (pdev->device == PCI_DEVICE_ID_ASMEDIA_1142_XHCI ||

	     pdev->device == PCI_DEVICE_ID_ASMEDIA_2142_XHCI))

	     pdev->device == PCI_DEVICE_ID_ASMEDIA_2142_XHCI ||

	     pdev->device == PCI_DEVICE_ID_ASMEDIA_3242_XHCI))

		xhci->quirks |= XHCI_NO_64BIT_SUPPORT;



	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&