Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

usb: host: xhci-rcar: Avoid long wait in xhci_reset()

The firmware of R-Car USB 3.0 host controller will control the reset.
So, if the xhci driver doesn't do firmware downloading (e.g. kernel
configuration is CONFIG_USB_XHCI_PLATFORM=y and CONFIG_USB_XHCI_RCAR
is not set), the reset of USB 3.0 host controller doesn't work
correctly. Then, the host controller will cause long wait in
xhci_reset() because the CMD_RESET bit of op_regs->command is not
cleared for 10 seconds.

So, this patch modifies the Kconfig to enable both CONFIG_USB_XHCI_PLATFORM
and CONFIG_USB_XHCI_RCAR.

Fixes: 4ac8918f3a7 (usb: host: xhci-plat: add support for the R-Car H2 and M2 xHCI controllers)
Cc: <stable@vger.kernel.org> # v3.17+
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Yoshihiro Shimoda and committed by
Greg Kroah-Hartman
f879fc32 9f3b3f6a

+2 -1
+2 -1
drivers/usb/host/Kconfig
··· 35 35 36 36 config USB_XHCI_PLATFORM 37 37 tristate "Generic xHCI driver for a platform device" 38 + select USB_XHCI_RCAR if ARCH_RENESAS 38 39 ---help--- 39 40 Adds an xHCI host driver for a generic platform device, which 40 41 provides a memory space and an irq. ··· 64 63 65 64 config USB_XHCI_RCAR 66 65 tristate "xHCI support for Renesas R-Car SoCs" 67 - select USB_XHCI_PLATFORM 66 + depends on USB_XHCI_PLATFORM 68 67 depends on ARCH_RENESAS || COMPILE_TEST 69 68 ---help--- 70 69 Say 'Y' to enable the support for the xHCI host controller