Skip to contentSkip to conversation

xhci fix for usb-linus

PATCH New Mathias Nyman 1 participant 2 messages Dec 21, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover xhci fix for usb-linus

Hi Greg

One small patch, remove an extra quirk set for Fresco FL1100 controllers. External docks with this controller have issues enumerating usb devices.

Nice if it could still make 5.16, if not then 5.17 is fine

Thanks
-Mathias

Mathias Nyman (1):
xhci: Fresco FL1100 controller should not have BROKEN_MSI quirk set.

 drivers/usb/host/xhci-pci.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 xhci: Fresco FL1100 controller should not have BROKEN_MSI quirk set.

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 ea0f69d82119 ("xhci: Enable trust tx length quirk for Fresco FL11 USB controller")
cc Nikolay Martynov <[email protected]>
---
 drivers/usb/host/xhci-pci.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/host/xhci-pci.c +4 -1
index 3af017883231..5c351970cdf1 100644
@@ -123,7 +123,6 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
 	/* Look for vendor-specific quirks */
 	if (pdev->vendor == PCI_VENDOR_ID_FRESCO_LOGIC &&
 			(pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK ||
-			 pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_FL1100 ||
 			 pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_FL1400)) {
 		if (pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK &&
 				pdev->revision == 0x0) {
@@ -158,6 +157,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
 			pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_FL1009)
 		xhci->quirks |= XHCI_BROKEN_STREAMS;
 
+	if (pdev->vendor == PCI_VENDOR_ID_FRESCO_LOGIC &&
+			pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_FL1100)
+		xhci->quirks |= XHCI_TRUST_TX_LENGTH;
+
 	if (pdev->vendor == PCI_VENDOR_ID_NEC)
 		xhci->quirks |= XHCI_NEC_HOST;
 
Signature · 1 line
2.25.1