| Samuel Mendoza-Jonas | 69b3de0 | 2017-10-25 13:20:17 +1100 | [diff] [blame] | 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | From: Brian King <brking@linux.vnet.ibm.com> |
| 3 | Date: Wed, 25 Oct 2017 10:42:59 +1100 |
| Joel Stanley | 6453c89 | 2018-03-29 17:37:51 +1100 | [diff] [blame] | 4 | Subject: [PATCH 1/4] xhci: Reset controller on xhci shutdown |
| Samuel Mendoza-Jonas | 69b3de0 | 2017-10-25 13:20:17 +1100 | [diff] [blame] | 5 | |
| 6 | Fixes kexec boot. Without a hard reset, some USB chips will fail to |
| 7 | initialize in a kexec booted kernel. |
| 8 | |
| 9 | Signed-off-by: Brian King <brking@linux.vnet.ibm.com> |
| 10 | Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com> |
| Joel Stanley | 8a681bf | 2017-11-03 13:59:32 +1100 | [diff] [blame] | 11 | Signed-off-by: Joel Stanley <joel@jms.id.au> |
| Samuel Mendoza-Jonas | 69b3de0 | 2017-10-25 13:20:17 +1100 | [diff] [blame] | 12 | --- |
| 13 | drivers/usb/host/xhci.c | 1 + |
| 14 | 1 file changed, 1 insertion(+) |
| 15 | |
| 16 | diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c |
| Joel Stanley | 6453c89 | 2018-03-29 17:37:51 +1100 | [diff] [blame] | 17 | index a7c99e121cc6..f953c94b2c5e 100644 |
| Samuel Mendoza-Jonas | 69b3de0 | 2017-10-25 13:20:17 +1100 | [diff] [blame] | 18 | --- a/drivers/usb/host/xhci.c |
| 19 | +++ b/drivers/usb/host/xhci.c |
| Joel Stanley | a864873 | 2018-02-05 14:12:27 +1030 | [diff] [blame] | 20 | @@ -722,6 +722,7 @@ static void xhci_shutdown(struct usb_hcd *hcd) |
| Samuel Mendoza-Jonas | 69b3de0 | 2017-10-25 13:20:17 +1100 | [diff] [blame] | 21 | /* Yet another workaround for spurious wakeups at shutdown with HSW */ |
| 22 | if (xhci->quirks & XHCI_SPURIOUS_WAKEUP) |
| 23 | pci_set_power_state(to_pci_dev(hcd->self.sysdev), PCI_D3hot); |
| 24 | + pci_reset_function_locked(to_pci_dev(hcd->self.sysdev)); |
| 25 | } |
| 26 | |
| 27 | #ifdef CONFIG_PM |