kernel: Move to Linux 4.13.11-openpower1

The "scsi: aacraid: Fix controller initialization failure" patch is now
included in the stable tree.

Signed-off-by: Joel Stanley <joel@jms.id.au>

5 files changed, 12 insertions, 79 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
index 1db0d05c..64fc38b1 100644
--- a/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch
+++ b/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch
@@ -1,19 +1,20 @@
 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
+Subject: [PATCH 1/4] 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>
+Signed-off-by: Joel Stanley <joel@jms.id.au>
 ---
  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
+index 51535ba2bcd4..42341203c7d9 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)
diff --git a/openpower/linux/0002-powerpc-mce-Move-64-bit-machine-check-code-into-mce..patch b/openpower/linux/0002-powerpc-mce-Move-64-bit-machine-check-code-into-mce..patch
index e4b9a1a0..6a5783fd 100644
--- a/openpower/linux/0002-powerpc-mce-Move-64-bit-machine-check-code-into-mce..patch
+++ b/openpower/linux/0002-powerpc-mce-Move-64-bit-machine-check-code-into-mce..patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Michael Ellerman <mpe@ellerman.id.au>
 Date: Wed, 4 Oct 2017 13:42:51 +1100
-Subject: [PATCH 2/5] powerpc/mce: Move 64-bit machine check code into mce.c
+Subject: [PATCH 2/4] powerpc/mce: Move 64-bit machine check code into mce.c
 
 We already have mce.c which is built for 64bit and contains other parts
 of the machine check code, so move these bits in there too.
diff --git a/openpower/linux/0003-powerpc-64s-Add-workaround-for-P9-vector-CI-load-iss.patch b/openpower/linux/0003-powerpc-64s-Add-workaround-for-P9-vector-CI-load-iss.patch
index 53d64fb8..d5c04ce6 100644
--- a/openpower/linux/0003-powerpc-64s-Add-workaround-for-P9-vector-CI-load-iss.patch
+++ b/openpower/linux/0003-powerpc-64s-Add-workaround-for-P9-vector-CI-load-iss.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Michael Neuling <mikey@neuling.org>
 Date: Wed, 4 Oct 2017 13:42:52 +1100
-Subject: [PATCH 3/5] powerpc/64s: Add workaround for P9 vector CI load issue
+Subject: [PATCH 3/4] powerpc/64s: Add workaround for P9 vector CI load issue
 
 POWER9 DD2.1 and earlier has an issue where some cache inhibited
 vector load will return bad data. The workaround is two part, one
diff --git a/openpower/linux/0005-Release-OpenPower-kernel.patch b/openpower/linux/0004-Release-OpenPower-kernel.patch
index 4d915153..07ad022d 100644
--- a/openpower/linux/0005-Release-OpenPower-kernel.patch
+++ b/openpower/linux/0004-Release-OpenPower-kernel.patch
@@ -1,23 +1,23 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Mendoza-Jonas <sam@mendozajonas.com>
-Date: Mon, 23 Oct 2017 12:57:15 +1100
-Subject: [PATCH 5/5] Release OpenPower kernel
+From: Joel Stanley <joel@jms.id.au>
+Date: Fri, 3 Nov 2017 13:56:40 +1100
+Subject: [PATCH 4/4] Release OpenPower kernel
 
-Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
+Signed-off-by: Joel Stanley <joel@jms.id.au>
 ---
  Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 66ec023da822..4b8c4cb589ac 100644
+index 8280953c8a45..a2394578649f 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,7 +1,7 @@
  VERSION = 4
  PATCHLEVEL = 13
- SUBLEVEL = 8
+ SUBLEVEL = 11
 -EXTRAVERSION =
-+EXTRAVERSION = -openpower2
++EXTRAVERSION = -openpower1
  NAME = Fearless Coyote
  
  # *DOCUMENTATION*
diff --git a/openpower/linux/0004-scsi-aacraid-Fix-controller-initialization-failure.patch b/openpower/linux/0004-scsi-aacraid-Fix-controller-initialization-failure.patch
deleted file mode 100644
index 8911c2ec..00000000
--- a/openpower/linux/0004-scsi-aacraid-Fix-controller-initialization-failure.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Raghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
-Date: Mon, 16 Oct 2017 17:22:31 -0700
-Subject: [PATCH 4/5] scsi: aacraid: Fix controller initialization failure
-
-This is a fix to an issue where the driver sends its periodic WELLNESS
-command to the controller after the driver shut it down.This causes the
-controller to crash. The window where this can happen is small, but it
-can be hit at around 4 hours of constant resets.
-
-Cc: <stable@vger.kernel.org>
-Fixes: fbd185986eba (aacraid: Fix AIF triggered IOP_RESET)
-Signed-off-by: Raghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
-Reviewed-by: Dave Carroll <david.carroll@microsemi.com>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-(cherry picked from commit 45348de2c8a7a1e64c5be27b22c9786b4152dd41)
-Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
----
- drivers/scsi/aacraid/comminit.c | 8 +++++---
- drivers/scsi/aacraid/linit.c    | 7 ++++++-
- 2 files changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
-index 9ee025b1d0e0..289b6fe306fd 100644
---- a/drivers/scsi/aacraid/comminit.c
-+++ b/drivers/scsi/aacraid/comminit.c
-@@ -302,9 +302,11 @@ int aac_send_shutdown(struct aac_dev * dev)
- 		return -ENOMEM;
- 	aac_fib_init(fibctx);
- 
--	mutex_lock(&dev->ioctl_mutex);
--	dev->adapter_shutdown = 1;
--	mutex_unlock(&dev->ioctl_mutex);
-+	if (!dev->adapter_shutdown) {
-+		mutex_lock(&dev->ioctl_mutex);
-+		dev->adapter_shutdown = 1;
-+		mutex_unlock(&dev->ioctl_mutex);
-+	}
- 
- 	cmd = (struct aac_close *) fib_data(fibctx);
- 	cmd->command = cpu_to_le32(VM_CloseAll);
-diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
-index 0f277df73af0..231bd3345f44 100644
---- a/drivers/scsi/aacraid/linit.c
-+++ b/drivers/scsi/aacraid/linit.c
-@@ -1401,8 +1401,9 @@ static void __aac_shutdown(struct aac_dev * aac)
- {
- 	int i;
- 
-+	mutex_lock(&aac->ioctl_mutex);
- 	aac->adapter_shutdown = 1;
--	aac_send_shutdown(aac);
-+	mutex_unlock(&aac->ioctl_mutex);
- 
- 	if (aac->aif_thread) {
- 		int i;
-@@ -1415,7 +1416,11 @@ static void __aac_shutdown(struct aac_dev * aac)
- 		}
- 		kthread_stop(aac->thread);
- 	}
-+
-+	aac_send_shutdown(aac);
-+
- 	aac_adapter_disable_int(aac);
-+
- 	if (aac_is_src(aac)) {
- 		if (aac->max_msix > 1) {
- 			for (i = 0; i < aac->max_msix; i++) {