On Fri, Aug 02, 2019 at 05:33:35PM +0900, Yoshihiro Shimoda wrote:

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: 435cc1138ec9 ("usb: host: xhci-plat: set resume_quirk() for R-Car controllers") Cc: stable@vger.kernel.org # v4.12+ Signed-off-by: Yoshihiro Shimoda yoshihiro.shimoda.uh@renesas.com

Reviewed-by: Simon Horman horms+renesas@verge.net.au

---

drivers/usb/host/xhci-rcar.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c index 671bce1..8616c52 100644 --- a/drivers/usb/host/xhci-rcar.c +++ b/drivers/usb/host/xhci-rcar.c @@ -238,10 +238,15 @@ int xhci_rcar_init_quirk(struct usb_hcd *hcd) * pointers. So, this driver clears the AC64 bit of xhci->hcc_params * to call dma_set_coherent_mask(dev, DMA_BIT_MASK(32)) in * xhci_gen_setup().

• *
  

• * And, 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().
  

  */ if (xhci_rcar_is_gen2(hcd->self.controller) ||

• 	xhci_rcar_is_gen3(hcd->self.controller))
  

• xhci->quirks |= XHCI_NO_64BIT_SUPPORT;
  

• 	xhci_rcar_is_gen3(hcd->self.controller)) {
  

• xhci->quirks |= XHCI_NO_64BIT_SUPPORT | XHCI_SLOW_SUSPEND;
  

• }

nit: As there is still only one line guarded by the conditional I don't think that { } need to be added.

if (!xhci_rcar_wait_for_pll_active(hcd)) return -ETIMEDOUT; -- 2.7.4