Skip to content

Commit b71c669

Browse files
cyrozapgregkh
authored andcommitted
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: Forest Crossman <cyrozap@gmail.com> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Link: https://lore.kernel.org/r/20210311115353.2137560-4-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 253f588 commit b71c669

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

drivers/usb/host/xhci-pci.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
#define PCI_DEVICE_ID_ASMEDIA_1042A_XHCI 0x1142
6767
#define PCI_DEVICE_ID_ASMEDIA_1142_XHCI 0x1242
6868
#define PCI_DEVICE_ID_ASMEDIA_2142_XHCI 0x2142
69+
#define PCI_DEVICE_ID_ASMEDIA_3242_XHCI 0x3242
6970

7071
static const char hcd_name[] = "xhci_hcd";
7172

@@ -276,11 +277,14 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
276277
pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI)
277278
xhci->quirks |= XHCI_BROKEN_STREAMS;
278279
if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
279-
pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI)
280+
pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI) {
280281
xhci->quirks |= XHCI_TRUST_TX_LENGTH;
282+
xhci->quirks |= XHCI_NO_64BIT_SUPPORT;
283+
}
281284
if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
282285
(pdev->device == PCI_DEVICE_ID_ASMEDIA_1142_XHCI ||
283-
pdev->device == PCI_DEVICE_ID_ASMEDIA_2142_XHCI))
286+
pdev->device == PCI_DEVICE_ID_ASMEDIA_2142_XHCI ||
287+
pdev->device == PCI_DEVICE_ID_ASMEDIA_3242_XHCI))
284288
xhci->quirks |= XHCI_NO_64BIT_SUPPORT;
285289

286290
if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&

0 commit comments

Comments
 (0)