kernel: Move to Linux 4.13.8-openpower2

This replaces our existing non-upstream xhci fix with another
non-upstream xhci fix. It goes back to the original
usb_hcd_pci_shutdown() handler and instead performs a hardware reset of
the controller in xhci_shutdown().

Discussion of this change can be found here:
https://marc.info/?l=linux-usb&m=150853502520762&w=2

This fixes a particular issue on p9dsu, and after some testing does not
appear to regress on other platforms.

Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>

3 files changed, 28 insertions, 27 deletions

diff --git a/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch b/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch
new file mode 100644
index 00000000..1db0d05c
--- /dev/null
+++ b/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch
@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Brian King <brking@linux.vnet.ibm.com>
+Date: Wed, 25 Oct 2017 10:42:59 +1100
+Subject: [PATCH 1/5] xhci: Reset controller on xhci shutdown
+
+Fixes kexec boot. Without a hard reset, some USB chips will fail to
+initialize in a kexec booted kernel.
+
+Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
+Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
+---
+ drivers/usb/host/xhci.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
+index ee198ea47f49..0e362e5c8b49 100644
+--- a/drivers/usb/host/xhci.c
++++ b/drivers/usb/host/xhci.c
+@@ -729,6 +729,7 @@ static void xhci_shutdown(struct usb_hcd *hcd)
+ 	/* Yet another workaround for spurious wakeups at shutdown with HSW */
+ 	if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)
+ 		pci_set_power_state(to_pci_dev(hcd->self.sysdev), PCI_D3hot);
++	pci_reset_function_locked(to_pci_dev(hcd->self.sysdev));
+ }
+ 
+ #ifdef CONFIG_PM
diff --git a/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch b/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
deleted file mode 100644
index 4a8bb31e..00000000
--- a/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Thadeu Lima De Souza Cascardo <thadeul@br.ibm.com>
-Date: Tue, 25 Mar 2014 10:45:16 -0400
-Subject: [PATCH 1/5] xhci: Use xhci_pci_remove for xhci device shutdown
-
-Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
-Signed-off-by: Joel Stanley <joel@jms.id.au>
-Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
----
- drivers/usb/host/xhci-pci.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
-index 76f392954733..1c8d7dcb3779 100644
---- a/drivers/usb/host/xhci-pci.c
-+++ b/drivers/usb/host/xhci-pci.c
-@@ -488,7 +488,7 @@ static struct pci_driver xhci_pci_driver = {
- 	.remove =	xhci_pci_remove,
- 	/* suspend and resume implemented later */
- 
--	.shutdown = 	usb_hcd_pci_shutdown,
-+	.shutdown = 	xhci_pci_remove,
- #ifdef CONFIG_PM
- 	.driver = {
- 		.pm = &usb_hcd_pci_pm_ops
diff --git a/openpower/linux/0005-Release-OpenPower-kernel.patch b/openpower/linux/0005-Release-OpenPower-kernel.patch
index c4aab84f..4d915153 100644
--- a/openpower/linux/0005-Release-OpenPower-kernel.patch
+++ b/openpower/linux/0005-Release-OpenPower-kernel.patch
@@ -9,7 +9,7 @@ Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 66ec023da822..41f1e259ce85 100644
+index 66ec023da822..4b8c4cb589ac 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,7 +1,7 @@
@@ -17,7 +17,7 @@ index 66ec023da822..41f1e259ce85 100644
  PATCHLEVEL = 13
  SUBLEVEL = 8
 -EXTRAVERSION =
-+EXTRAVERSION = -openpower1
++EXTRAVERSION = -openpower2
  NAME = Fearless Coyote
  
  # *DOCUMENTATION*