Skip to content

Commit 783bda5

Browse files
shimodaygregkh
authored andcommitted
usb: host: xhci-rcar: Fix timeout in xhci_suspend()
When a USB device is connected to the host controller and the system enters suspend, the following error happens in xhci_suspend(): xhci-hcd ee000000.usb: WARN: xHC CMD_RUN timeout Since the firmware/internal CPU control the USBSTS.STS_HALT and the process speed is down when the roothub port enters U3, long delay for the handshake of STS_HALT is neeed in xhci_suspend(). So, this patch adds to set the XHCI_SLOW_SUSPEND. Fixes: 435cc11 ("usb: host: xhci-plat: set resume_quirk() for R-Car controllers") Cc: <[email protected]> # v4.12+ Signed-off-by: Yoshihiro Shimoda <[email protected]> Link: https://lore.kernel.org/r/1564734815-17964-1-git-send-email-yoshihiro.shimoda.uh@renesas.com Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent a29d56c commit 783bda5

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

drivers/usb/host/xhci-rcar.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,15 @@ int xhci_rcar_init_quirk(struct usb_hcd *hcd)
238238
* pointers. So, this driver clears the AC64 bit of xhci->hcc_params
239239
* to call dma_set_coherent_mask(dev, DMA_BIT_MASK(32)) in
240240
* xhci_gen_setup().
241+
*
242+
* And, since the firmware/internal CPU control the USBSTS.STS_HALT
243+
* and the process speed is down when the roothub port enters U3,
244+
* long delay for the handshake of STS_HALT is neeed in xhci_suspend().
241245
*/
242246
if (xhci_rcar_is_gen2(hcd->self.controller) ||
243-
xhci_rcar_is_gen3(hcd->self.controller))
244-
xhci->quirks |= XHCI_NO_64BIT_SUPPORT;
247+
xhci_rcar_is_gen3(hcd->self.controller)) {
248+
xhci->quirks |= XHCI_NO_64BIT_SUPPORT | XHCI_SLOW_SUSPEND;
249+
}
245250

246251
if (!xhci_rcar_wait_for_pll_active(hcd))
247252
return -ETIMEDOUT;

0 commit comments

Comments
 (0)