xhci: Don't issue Reset Device command to Etron xHCI host

Sometimes the hub driver does not recognize the USB device connected
to the external USB2.0 hub when the system resumes from S4.

After the SetPortFeature(PORT_RESET) request is completed, the hub
driver calls the HCD reset_device callback, which will issue a Reset
Device command and free all structures associated with endpoints
that were disabled.

This happens when the xHCI driver issue a Reset Device command to
inform the Etron xHCI host that the USB device associated with a
device slot has been reset. Seems that the Etron xHCI host can not
perform this command correctly, affecting the USB device.

To work around this, the xHCI driver should obtain a new device slot
with reference to commit 651aaf36a7d7 ("usb: xhci: Handle USB transaction
error on address command"), which is another way to inform the Etron
xHCI host that the USB device has been reset.

Add a new XHCI_ETRON_HOST quirk flag to invoke the workaround in
xhci_discover_or_reset_device().

Fixes: 2a8f82c4ceaf ("USB: xhci: Notify the xHC when a device is reset.")
Cc: stable@vger.kernel.org
Signed-off-by: Kuangyi Chiang <ki.chiang65@gmail.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20241106101459.775897-19-mathias.nyman@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index db3c7e738213794c5c5bf1ea751afa1ecf796cb9..4b8c93e59d6da3a3a274b9111e2a3ccf2e789483 100644 (file)
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -396,6 +396,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
        if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
            (pdev->device == PCI_DEVICE_ID_EJ168 ||
             pdev->device == PCI_DEVICE_ID_EJ188)) {
+               xhci->quirks |= XHCI_ETRON_HOST;
                xhci->quirks |= XHCI_RESET_ON_RESUME;
                xhci->quirks |= XHCI_BROKEN_STREAMS;
        }

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index aa8c877f47acbb22e6c4f5f980a9f242776c4e12..ae16253b53fba3113744966332a9a8212264bce6 100644 (file)
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -3733,6 +3733,8 @@ void xhci_free_device_endpoint_resources(struct xhci_hcd *xhci,
                                xhci->num_active_eps);
 }
 
+static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev);
+
 /*
  * This submits a Reset Device Command, which will set the device state to 0,
  * set the device address to 0, and disable all the endpoints except the default
@@ -3803,6 +3805,23 @@ static int xhci_discover_or_reset_device(struct usb_hcd *hcd,
                                                SLOT_STATE_DISABLED)
                return 0;
 
+       if (xhci->quirks & XHCI_ETRON_HOST) {
+               /*
+                * Obtaining a new device slot to inform the xHCI host that
+                * the USB device has been reset.
+                */
+               ret = xhci_disable_slot(xhci, udev->slot_id);
+               xhci_free_virt_device(xhci, udev->slot_id);
+               if (!ret) {
+                       ret = xhci_alloc_dev(hcd, udev);
+                       if (ret == 1)
+                               ret = 0;
+                       else
+                               ret = -EINVAL;
+               }
+               return ret;
+       }
+
        trace_xhci_discover_or_reset_device(slot_ctx);
 
        xhci_dbg(xhci, "Resetting device with slot ID %u\n", slot_id);

diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index d3b250c736b8adc7a66f74346dc04629ba751c0e..a0204e10486d0fa377fb6117b9d0de54a6ed76c3 100644 (file)
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1631,6 +1631,7 @@ struct xhci_hcd {
 #define XHCI_ZHAOXIN_HOST      BIT_ULL(46)
 #define XHCI_WRITE_64_HI_LO    BIT_ULL(47)
 #define XHCI_CDNS_SCTX_QUIRK   BIT_ULL(48)
+#define XHCI_ETRON_HOST        BIT_ULL(49)
 
        unsigned int            num_active_eps;
        unsigned int            limit_active_eps;