Hi, > From: Sasha Levin > Sent: Saturday, June 04, 2016 6:36 AM > > From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@xxxxxxxxxxx> > > This patch has been added to the 4.1 stable tree. If you have any > objections, please let us know. I'm afraid but I found that this patch doesn't need on v4.1. The original issue is caused by v4.2 as the followings: commit 6c05cb145d6716f00d452aeb27916efb6d190cca usb: xhci: make USB_XHCI_PLATFORM selectable If I don't applied the commit 6c05cb145d6716 on v4.1, the xhci-platform and xhci-rcar were built both. This is my expectation. I'll be carefull to add the stable version tag from now... Best regards, Yoshihiro Shimoda > =============== > > [ Upstream commit f879fc32aa0c96fbac261b3d857a1239d554ad01 ] > > 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@xxxxxxxxxxxxxxx> # v3.17+ > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@xxxxxxxxxxx> > Reviewed-by: Felipe Balbi <felipe.balbi@xxxxxxxxxxxxxxx> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > Signed-off-by: Sasha Levin <sasha.levin@xxxxxxxxxx> > --- > drivers/usb/host/Kconfig | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig > index 41cd6e5..6e8fb54 100644 > --- a/drivers/usb/host/Kconfig > +++ b/drivers/usb/host/Kconfig > @@ -33,6 +33,7 @@ config USB_XHCI_PCI > > config USB_XHCI_PLATFORM > tristate "Generic xHCI driver for a platform device" > + select USB_XHCI_RCAR if ARCH_RENESAS > ---help--- > Adds an xHCI host driver for a generic platform device, which > provides a memory space and an irq. > @@ -51,7 +52,7 @@ config USB_XHCI_MVEBU > > config USB_XHCI_RCAR > tristate "xHCI support for Renesas R-Car SoCs" > - select USB_XHCI_PLATFORM > + depends on USB_XHCI_PLATFORM > depends on ARCH_RENESAS || COMPILE_TEST > ---help--- > Say 'Y' to enable the support for the xHCI host controller > -- > 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html