| From dcc7620cad5ad1326a78f4031a7bf4f0e5b42984 Mon Sep 17 00:00:00 2001 |
| From: Guenter Roeck <linux@roeck-us.net> |
| Date: Thu, 9 Mar 2017 15:39:37 +0200 |
| Subject: [PATCH] usb: host: xhci-plat: Fix timeout on removal of hot pluggable |
| xhci controllers |
| |
| commit dcc7620cad5ad1326a78f4031a7bf4f0e5b42984 upstream. |
| |
| Upstream commit 98d74f9ceaef ("xhci: fix 10 second timeout on removal of |
| PCI hotpluggable xhci controllers") fixes a problem with hot pluggable PCI |
| xhci controllers which can result in excessive timeouts, to the point where |
| the system reports a deadlock. |
| |
| The same problem is seen with hot pluggable xhci controllers using the |
| xhci-plat driver, such as the driver used for Type-C ports on rk3399. |
| Similar to hot-pluggable PCI controllers, the driver for this chip |
| removes the xhci controller from the system when the Type-C cable is |
| disconnected. |
| |
| The solution for PCI devices works just as well for non-PCI devices |
| and avoids the problem. |
| |
| Signed-off-by: Guenter Roeck <linux@roeck-us.net> |
| Cc: stable <stable@vger.kernel.org> |
| Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c |
| index 6d33b42ffcf5..bd02a6cd8e2c 100644 |
| --- a/drivers/usb/host/xhci-plat.c |
| +++ b/drivers/usb/host/xhci-plat.c |
| @@ -286,6 +286,8 @@ static int xhci_plat_remove(struct platform_device *dev) |
| struct xhci_hcd *xhci = hcd_to_xhci(hcd); |
| struct clk *clk = xhci->clk; |
| |
| + xhci->xhc_state |= XHCI_STATE_REMOVING; |
| + |
| usb_remove_hcd(xhci->shared_hcd); |
| usb_phy_shutdown(hcd->usb_phy); |
| |
| -- |
| 2.12.0 |
| |
