From a64c38002e6dee55d05a652a7de68c498a871e71 Mon Sep 17 00:00:00 2001 From: Samuel Mendoza-Jonas Date: Mon, 23 Oct 2017 15:22:55 +1100 Subject: kernel: Move to Linux 4.13.8-openpower1 Move to v4.13.8 and include another patch from next: 45348de "scsi: aacraid: Fix controller initialization failure" This fixes a problem with the PM8069 controller used on the p9dsu platform causing the controller to crash after a reset. Signed-off-by: Samuel Mendoza-Jonas --- openpower/configs/barreleye_defconfig | 2 +- openpower/configs/firenze_defconfig | 2 +- openpower/configs/firestone_defconfig | 2 +- openpower/configs/garrison_defconfig | 2 +- openpower/configs/habanero_defconfig | 2 +- openpower/configs/openpower_mambo_defconfig | 2 +- openpower/configs/openpower_p9_mambo_defconfig | 2 +- openpower/configs/p9dsu_defconfig | 2 +- openpower/configs/palmetto_defconfig | 2 +- openpower/configs/pseries_defconfig | 2 +- openpower/configs/romulus_defconfig | 2 +- openpower/configs/witherspoon_defconfig | 2 +- openpower/configs/zaius_defconfig | 2 +- openpower/configs/zz_defconfig | 2 +- ...-xhci_pci_remove-for-xhci-device-shutdown.patch | 2 +- ...-Move-64-bit-machine-check-code-into-mce..patch | 2 +- ...-Add-workaround-for-P9-vector-CI-load-iss.patch | 2 +- .../linux/0004-Release-OpenPower-kernel.patch | 23 -------- ...aid-Fix-controller-initialization-failure.patch | 68 ++++++++++++++++++++++ .../linux/0005-Release-OpenPower-kernel.patch | 23 ++++++++ 20 files changed, 108 insertions(+), 40 deletions(-) delete mode 100644 openpower/linux/0004-Release-OpenPower-kernel.patch create mode 100644 openpower/linux/0004-scsi-aacraid-Fix-controller-initialization-failure.patch create mode 100644 openpower/linux/0005-Release-OpenPower-kernel.patch diff --git a/openpower/configs/barreleye_defconfig b/openpower/configs/barreleye_defconfig index c3b4006d..bbab578f 100644 --- a/openpower/configs/barreleye_defconfig +++ b/openpower/configs/barreleye_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.8" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/firenze_defconfig b/openpower/configs/firenze_defconfig index 92463ea1..f35ef254 100644 --- a/openpower/configs/firenze_defconfig +++ b/openpower/configs/firenze_defconfig @@ -13,7 +13,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.8" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig index a2ada306..546376f7 100644 --- a/openpower/configs/firestone_defconfig +++ b/openpower/configs/firestone_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.8" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig index a90a182c..dfdc541d 100644 --- a/openpower/configs/garrison_defconfig +++ b/openpower/configs/garrison_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.8" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig index 387f10e8..f1aaf469 100644 --- a/openpower/configs/habanero_defconfig +++ b/openpower/configs/habanero_defconfig @@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.8" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/openpower_mambo_defconfig b/openpower/configs/openpower_mambo_defconfig index 34024c13..0d99b0f6 100644 --- a/openpower/configs/openpower_mambo_defconfig +++ b/openpower/configs/openpower_mambo_defconfig @@ -11,7 +11,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.8" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/openpower_p9_mambo_defconfig b/openpower/configs/openpower_p9_mambo_defconfig index 3e10c2a2..17aab403 100644 --- a/openpower/configs/openpower_p9_mambo_defconfig +++ b/openpower/configs/openpower_p9_mambo_defconfig @@ -11,7 +11,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.8" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/p9dsu_defconfig b/openpower/configs/p9dsu_defconfig index 09f359e4..a8532728 100644 --- a/openpower/configs/p9dsu_defconfig +++ b/openpower/configs/p9dsu_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.8" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_defconfig" diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig index efb740e3..461afc40 100644 --- a/openpower/configs/palmetto_defconfig +++ b/openpower/configs/palmetto_defconfig @@ -13,7 +13,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.8" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/pseries_defconfig b/openpower/configs/pseries_defconfig index 5a07724b..a813db1b 100644 --- a/openpower/configs/pseries_defconfig +++ b/openpower/configs/pseries_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.8" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/pseries_skiroot_defconfig" diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig index 21f026f3..45388994 100644 --- a/openpower/configs/romulus_defconfig +++ b/openpower/configs/romulus_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.8" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_defconfig" diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig index ced1173f..9f200f12 100644 --- a/openpower/configs/witherspoon_defconfig +++ b/openpower/configs/witherspoon_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.8" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_defconfig" diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig index 0cc79c9b..58633b23 100644 --- a/openpower/configs/zaius_defconfig +++ b/openpower/configs/zaius_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.8" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_defconfig" diff --git a/openpower/configs/zz_defconfig b/openpower/configs/zz_defconfig index 3ea92c97..f92c5dfe 100644 --- a/openpower/configs/zz_defconfig +++ b/openpower/configs/zz_defconfig @@ -13,7 +13,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.8" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_defconfig" 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 index 72599e2b..4a8bb31e 100644 --- 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 @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Thadeu Lima De Souza Cascardo Date: Tue, 25 Mar 2014 10:45:16 -0400 -Subject: [PATCH 1/4] xhci: Use xhci_pci_remove for xhci device shutdown +Subject: [PATCH 1/5] xhci: Use xhci_pci_remove for xhci device shutdown Signed-off-by: Jeremy Kerr Signed-off-by: Joel Stanley 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 6a5783fd..e4b9a1a0 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 Date: Wed, 4 Oct 2017 13:42:51 +1100 -Subject: [PATCH 2/4] powerpc/mce: Move 64-bit machine check code into mce.c +Subject: [PATCH 2/5] 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 d5c04ce6..53d64fb8 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 Date: Wed, 4 Oct 2017 13:42:52 +1100 -Subject: [PATCH 3/4] powerpc/64s: Add workaround for P9 vector CI load issue +Subject: [PATCH 3/5] 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/0004-Release-OpenPower-kernel.patch b/openpower/linux/0004-Release-OpenPower-kernel.patch deleted file mode 100644 index 3589ce5f..00000000 --- a/openpower/linux/0004-Release-OpenPower-kernel.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Samuel Mendoza-Jonas -Date: Tue, 17 Oct 2017 13:32:56 +1100 -Subject: [PATCH 4/4] Release OpenPower kernel - -Signed-off-by: Samuel Mendoza-Jonas ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 0d4f1b19869d..ad0f7fd78596 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,7 +1,7 @@ - VERSION = 4 - PATCHLEVEL = 13 - SUBLEVEL = 7 --EXTRAVERSION = -+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 new file mode 100644 index 00000000..8911c2ec --- /dev/null +++ b/openpower/linux/0004-scsi-aacraid-Fix-controller-initialization-failure.patch @@ -0,0 +1,68 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Raghava Aditya Renukunta +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: +Fixes: fbd185986eba (aacraid: Fix AIF triggered IOP_RESET) +Signed-off-by: Raghava Aditya Renukunta +Reviewed-by: Dave Carroll +Signed-off-by: Martin K. Petersen +(cherry picked from commit 45348de2c8a7a1e64c5be27b22c9786b4152dd41) +Signed-off-by: Samuel Mendoza-Jonas +--- + 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++) { diff --git a/openpower/linux/0005-Release-OpenPower-kernel.patch b/openpower/linux/0005-Release-OpenPower-kernel.patch new file mode 100644 index 00000000..c4aab84f --- /dev/null +++ b/openpower/linux/0005-Release-OpenPower-kernel.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Samuel Mendoza-Jonas +Date: Mon, 23 Oct 2017 12:57:15 +1100 +Subject: [PATCH 5/5] Release OpenPower kernel + +Signed-off-by: Samuel Mendoza-Jonas +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 66ec023da822..41f1e259ce85 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + VERSION = 4 + PATCHLEVEL = 13 + SUBLEVEL = 8 +-EXTRAVERSION = ++EXTRAVERSION = -openpower1 + NAME = Fearless Coyote + + # *DOCUMENTATION* -- cgit v1.2.1