| From 376fedbfbb8749b4897315f8b58afc523c4898b5 Mon Sep 17 00:00:00 2001 |
| From: Forest Crossman <cyrozap@gmail.com> |
| Date: Mon, 27 Jul 2020 23:24:08 -0500 |
| Subject: [PATCH] usb: xhci: Fix ASMedia ASM1142 DMA addressing |
| |
| commit ec37198acca7b4c17b96247697406e47aafe0605 upstream. |
| |
| I've confirmed that the ASMedia ASM1142 has the same problem as the |
| ASM2142/ASM3142, in that it too reports that it supports 64-bit DMA |
| addresses when in fact it does not. As with the ASM2142/ASM3142, this |
| can cause problems on systems where the upper bits matter, and adding |
| the XHCI_NO_64BIT_SUPPORT quirk completely fixes the issue. |
| |
| Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com> |
| Signed-off-by: Forest Crossman <cyrozap@gmail.com> |
| Cc: stable <stable@vger.kernel.org> |
| Link: https://lore.kernel.org/r/20200728042408.180529-3-cyrozap@gmail.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c |
| index 5e9b6729e921..ec24b6ae22d6 100644 |
| --- a/drivers/usb/host/xhci-pci.c |
| +++ b/drivers/usb/host/xhci-pci.c |
| @@ -57,6 +57,7 @@ |
| #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_1142_XHCI 0x1242 |
| #define PCI_DEVICE_ID_ASMEDIA_2142_XHCI 0x2142 |
| |
| static const char hcd_name[] = "xhci_hcd"; |
| @@ -253,7 +254,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) |
| pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI) |
| xhci->quirks |= XHCI_TRUST_TX_LENGTH; |
| if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && |
| - pdev->device == PCI_DEVICE_ID_ASMEDIA_2142_XHCI) |
| + (pdev->device == PCI_DEVICE_ID_ASMEDIA_1142_XHCI || |
| + pdev->device == PCI_DEVICE_ID_ASMEDIA_2142_XHCI)) |
| xhci->quirks |= XHCI_NO_64BIT_SUPPORT; |
| |
| if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && |
| -- |
| 2.27.0 |
| |
