Skip to content

Commit 1933fe8

Browse files
matnymangregkh
authored andcommitted
xhci: Fresco FL1100 controller should not have BROKEN_MSI quirk set.
commit e484409 upstream. The Fresco Logic FL1100 controller needs the TRUST_TX_LENGTH quirk like other Fresco controllers, but should not have the BROKEN_MSI quirks set. BROKEN_MSI quirk causes issues in detecting usb drives connected to docks with this FL1100 controller. The BROKEN_MSI flag was apparently accidentally set together with the TRUST_TX_LENGTH quirk Original patch went to stable so this should go there as well. Fixes: ea0f69d ("xhci: Enable trust tx length quirk for Fresco FL11 USB controller") Cc: stable@vger.kernel.org cc: Nikolay Martynov <mar.kolya@gmail.com> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Link: https://lore.kernel.org/r/20211221112825.54690-2-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent b855333 commit 1933fe8

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

drivers/usb/host/xhci-pci.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
122122
/* Look for vendor-specific quirks */
123123
if (pdev->vendor == PCI_VENDOR_ID_FRESCO_LOGIC &&
124124
(pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK ||
125-
pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_FL1100 ||
126125
pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_FL1400)) {
127126
if (pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK &&
128127
pdev->revision == 0x0) {
@@ -157,6 +156,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
157156
pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_FL1009)
158157
xhci->quirks |= XHCI_BROKEN_STREAMS;
159158

159+
if (pdev->vendor == PCI_VENDOR_ID_FRESCO_LOGIC &&
160+
pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_FL1100)
161+
xhci->quirks |= XHCI_TRUST_TX_LENGTH;
162+
160163
if (pdev->vendor == PCI_VENDOR_ID_NEC)
161164
xhci->quirks |= XHCI_NEC_HOST;
162165

0 commit comments

Comments
 (0)