linux: Update to v4.2.6-openpower1
- Rebased on upstream stable release v4.2.6
- Dropped "ast: Default to 8bpp on big endian", as we do not build
for big endian, and there was no interest in upstreaming this patch
- Dropped "fbcon: initialize blink interval before calling" as this is
in the upstream stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig
index bdf2c77..110bd42 100644
--- a/openpower/configs/firestone_defconfig
+++ b/openpower/configs/firestone_defconfig
@@ -43,7 +43,7 @@
BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_VERSION="4.2.5"
+BR2_LINUX_KERNEL_VERSION="4.2.6"
BR2_KERNEL_HEADERS_4_2=y
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig
index 3dc2f02..cd74454 100644
--- a/openpower/configs/garrison_defconfig
+++ b/openpower/configs/garrison_defconfig
@@ -45,7 +45,7 @@
BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_VERSION="4.2.5"
+BR2_LINUX_KERNEL_VERSION="4.2.6"
BR2_KERNEL_HEADERS_4_2=y
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig
index 1713606..f7bbf68 100644
--- a/openpower/configs/habanero_defconfig
+++ b/openpower/configs/habanero_defconfig
@@ -43,7 +43,7 @@
BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_VERSION="4.2.5"
+BR2_LINUX_KERNEL_VERSION="4.2.6"
BR2_KERNEL_HEADERS_4_2=y
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
diff --git a/openpower/configs/openpower_mambo_defconfig b/openpower/configs/openpower_mambo_defconfig
index 6f29cc8..ea50756 100644
--- a/openpower/configs/openpower_mambo_defconfig
+++ b/openpower/configs/openpower_mambo_defconfig
@@ -31,7 +31,7 @@
BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_VERSION="4.2.5"
+BR2_LINUX_KERNEL_VERSION="4.2.6"
BR2_KERNEL_HEADERS_4_2=y
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig
index 1b343a2..07fc849 100644
--- a/openpower/configs/palmetto_defconfig
+++ b/openpower/configs/palmetto_defconfig
@@ -42,7 +42,7 @@
BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_VERSION="4.2.5"
+BR2_LINUX_KERNEL_VERSION="4.2.6"
BR2_KERNEL_HEADERS_4_2=y
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
diff --git a/openpower/linux/linux-0001-powerpc-Add-openpower_defconfig.patch b/openpower/linux/linux-0001-powerpc-Add-openpower_defconfig.patch
index 3dfb56e..5724b60 100644
--- a/openpower/linux/linux-0001-powerpc-Add-openpower_defconfig.patch
+++ b/openpower/linux/linux-0001-powerpc-Add-openpower_defconfig.patch
@@ -1,7 +1,7 @@
-From 3700065f5c1b076e49aa81eff729012fd2da6b54 Mon Sep 17 00:00:00 2001
+From bbf8dfe1ddb782c0ed75a14c3dcbb473c8563987 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Fri, 12 Dec 2014 08:03:11 +0800
-Subject: [PATCH 01/17] powerpc: Add openpower_defconfig
+Subject: [PATCH 01/15] powerpc: Add openpower_defconfig
Simplifies building an openpower kernel a little. It is based on the
configuration used by the op-build openpower buildroot overlay.
@@ -15,7 +15,7 @@
diff --git a/arch/powerpc/configs/openpower_defconfig b/arch/powerpc/configs/openpower_defconfig
new file mode 100644
-index 0000000..4d6779a
+index 000000000000..4d6779a3c753
--- /dev/null
+++ b/arch/powerpc/configs/openpower_defconfig
@@ -0,0 +1,217 @@
@@ -237,5 +237,5 @@
+CONFIG_CRYPTO_ECHAINIV=y
+# CONFIG_CRYPTO_HW is not set
--
-2.5.0
+2.6.2
diff --git a/openpower/linux/linux-0002-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch b/openpower/linux/linux-0002-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
index b97fe3d..edfa9d2 100644
--- a/openpower/linux/linux-0002-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
+++ b/openpower/linux/linux-0002-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
@@ -1,7 +1,7 @@
-From bb607985cc1eec5693851dd68af1ab0a87986ec5 Mon Sep 17 00:00:00 2001
+From fedf5abf0669ce6e812d4dd095e74ef65eec9058 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 02/17] xhci: Use xhci_pci_remove for xhci device shutdown
+Subject: [PATCH 02/15] 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>
@@ -10,10 +10,10 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
-index c79d336..5492bc6 100644
+index c47d3e480586..a7447462b663 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
-@@ -419,7 +419,7 @@ static struct pci_driver xhci_pci_driver = {
+@@ -420,7 +420,7 @@ static struct pci_driver xhci_pci_driver = {
.remove = xhci_pci_remove,
/* suspend and resume implemented later */
@@ -23,5 +23,5 @@
.driver = {
.pm = &usb_hcd_pci_pm_ops
--
-2.5.0
+2.6.2
diff --git a/openpower/linux/linux-0003-drm-ast-Default-to-8bpp-on-big-endian.patch b/openpower/linux/linux-0003-drm-ast-Default-to-8bpp-on-big-endian.patch
deleted file mode 100644
index c163f4d..0000000
--- a/openpower/linux/linux-0003-drm-ast-Default-to-8bpp-on-big-endian.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 962e22b1eb505a50671f47b62d52c7d23acf69f3 Mon Sep 17 00:00:00 2001
-From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-Date: Fri, 31 Oct 2014 15:06:38 +1100
-Subject: [PATCH 03/17] drm/ast: Default to 8bpp on big endian
-
-This chip is LE only (some versions support HW swappers but not
-the latest and the driver doesn't anyway).
-
-I tried using the "foreign endian" fb flag but it appears to be
-busted, so instead, default to endian-neutral 8bpp for BE.
-
-Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-Signed-off-by: Joel Stanley <joel@jms.id.au>
----
- drivers/gpu/drm/ast/ast_fb.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c
-index ff68eef..c532c69 100644
---- a/drivers/gpu/drm/ast/ast_fb.c
-+++ b/drivers/gpu/drm/ast/ast_fb.c
-@@ -345,7 +345,20 @@ int ast_fbdev_init(struct drm_device *dev)
- /* disable all the possible outputs/crtcs before entering KMS mode */
- drm_helper_disable_unused_functions(dev);
-
-+ /*
-+ * This chip is LE only (some versions support HW swappers but not
-+ * the latest and the driver doesn't anyway).
-+ *
-+ * I tried using the "foreign endian" fb flag but it appears to be
-+ * busted, so instead, default to endian-neutral 8bpp for BE.
-+ *
-+ * (and it's faster !)
-+ */
-+#if defined(__BIG_ENDIAN)
-+ ret = drm_fb_helper_initial_config(&afbdev->helper, 8);
-+#else
- ret = drm_fb_helper_initial_config(&afbdev->helper, 32);
-+#endif
- if (ret)
- goto fini;
-
---
-2.5.0
-
diff --git a/openpower/linux/linux-0004-powerpc-kexec-Reset-secondary-cpu-endianess-before-k.patch b/openpower/linux/linux-0003-powerpc-kexec-Reset-secondary-cpu-endianess-before-k.patch
similarity index 87%
rename from openpower/linux/linux-0004-powerpc-kexec-Reset-secondary-cpu-endianess-before-k.patch
rename to openpower/linux/linux-0003-powerpc-kexec-Reset-secondary-cpu-endianess-before-k.patch
index 48c89a8..78d6a8b 100644
--- a/openpower/linux/linux-0004-powerpc-kexec-Reset-secondary-cpu-endianess-before-k.patch
+++ b/openpower/linux/linux-0003-powerpc-kexec-Reset-secondary-cpu-endianess-before-k.patch
@@ -1,7 +1,7 @@
-From 7d09146cc906efed651f227864c8603fc57ee325 Mon Sep 17 00:00:00 2001
+From a0fa3be3772983f7b96cc4133542a0eac25f6ed9 Mon Sep 17 00:00:00 2001
From: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
Date: Mon, 29 Jun 2015 13:43:51 +1000
-Subject: [PATCH 04/17] powerpc/kexec: Reset secondary cpu endianess before
+Subject: [PATCH 03/15] powerpc/kexec: Reset secondary cpu endianess before
kexec
If the target kernel does not inlcude the FIXUP_ENDIAN check, coming
@@ -19,7 +19,7 @@
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
-index 4e314b9..6e4168c 100644
+index 4e314b90c75d..6e4168cf4698 100644
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@ -475,9 +475,18 @@ _GLOBAL(kexec_wait)
@@ -44,5 +44,5 @@
/* this can be in text because we won't change it until we are
* running in real anyways
--
-2.5.0
+2.6.2
diff --git a/openpower/linux/linux-0005-powerpc-kexec-Reset-HILE-before-kexec_sequence.patch b/openpower/linux/linux-0004-powerpc-kexec-Reset-HILE-before-kexec_sequence.patch
similarity index 88%
rename from openpower/linux/linux-0005-powerpc-kexec-Reset-HILE-before-kexec_sequence.patch
rename to openpower/linux/linux-0004-powerpc-kexec-Reset-HILE-before-kexec_sequence.patch
index 05e884d..89e25f2 100644
--- a/openpower/linux/linux-0005-powerpc-kexec-Reset-HILE-before-kexec_sequence.patch
+++ b/openpower/linux/linux-0004-powerpc-kexec-Reset-HILE-before-kexec_sequence.patch
@@ -1,7 +1,7 @@
-From 67b97ec555099b7f84cd98c6f8e93cac588aa830 Mon Sep 17 00:00:00 2001
+From 3ac7b2ce48a25617a838b58dce149244c5f216ef Mon Sep 17 00:00:00 2001
From: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
Date: Wed, 22 Jul 2015 11:09:15 +1000
-Subject: [PATCH 05/17] powerpc/kexec: Reset HILE before kexec_sequence
+Subject: [PATCH 04/15] powerpc/kexec: Reset HILE before kexec_sequence
On powernv secondary cpus are returned to OPAL, and will then enter
the target kernel in big-endian. However if it is set the HILE bit
@@ -18,7 +18,7 @@
1 file changed, 7 insertions(+)
diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
-index 53737e0..59076db 100644
+index 53737e019ae3..59076db194c0 100644
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -243,6 +243,13 @@ static void pnv_kexec_cpu_down(int crash_shutdown, int secondary)
@@ -36,5 +36,5 @@
}
#endif /* CONFIG_KEXEC */
--
-2.5.0
+2.6.2
diff --git a/openpower/linux/linux-0006-Revert-powerpc-Reject-binutils-2.24-when-building-li.patch b/openpower/linux/linux-0005-Revert-powerpc-Reject-binutils-2.24-when-building-li.patch
similarity index 83%
rename from openpower/linux/linux-0006-Revert-powerpc-Reject-binutils-2.24-when-building-li.patch
rename to openpower/linux/linux-0005-Revert-powerpc-Reject-binutils-2.24-when-building-li.patch
index 3968fbc..c0d298b 100644
--- a/openpower/linux/linux-0006-Revert-powerpc-Reject-binutils-2.24-when-building-li.patch
+++ b/openpower/linux/linux-0005-Revert-powerpc-Reject-binutils-2.24-when-building-li.patch
@@ -1,7 +1,7 @@
-From a24b6a40ae28997b8543b5912dbcb69be94c3e69 Mon Sep 17 00:00:00 2001
+From 8ff76b10e7d83cb4ac2ec13e792644493613a2c2 Mon Sep 17 00:00:00 2001
From: Joel Stanley <joel@jms.id.au>
Date: Fri, 11 Sep 2015 14:43:18 +0930
-Subject: [PATCH 06/17] Revert "powerpc: Reject binutils 2.24 when building
+Subject: [PATCH 05/15] Revert "powerpc: Reject binutils 2.24 when building
little endian"
This reverts commit 60e065f70bdb0b0e916389024922ad40f3270c96.
@@ -15,7 +15,7 @@
1 file changed, 8 deletions(-)
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
-index 05f464e..b2ae85d 100644
+index 05f464eb6952..b2ae85dca1f7 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -358,14 +358,6 @@ checkbin:
@@ -34,5 +34,5 @@
CLEAN_FILES += $(TOUT)
--
-2.5.0
+2.6.2
diff --git a/openpower/linux/linux-0007-aacraid-Fix-for-LD-name-and-UID-not-exposed-to-OS.patch b/openpower/linux/linux-0006-aacraid-Fix-for-LD-name-and-UID-not-exposed-to-OS.patch
similarity index 88%
rename from openpower/linux/linux-0007-aacraid-Fix-for-LD-name-and-UID-not-exposed-to-OS.patch
rename to openpower/linux/linux-0006-aacraid-Fix-for-LD-name-and-UID-not-exposed-to-OS.patch
index 0137c0b..712e090 100644
--- a/openpower/linux/linux-0007-aacraid-Fix-for-LD-name-and-UID-not-exposed-to-OS.patch
+++ b/openpower/linux/linux-0006-aacraid-Fix-for-LD-name-and-UID-not-exposed-to-OS.patch
@@ -1,7 +1,7 @@
-From 6e9462ff5c5a1a4acdea277a8a5ba5c82c287b62 Mon Sep 17 00:00:00 2001
+From 5c0ce63abf423b06ad4a9dd0340dc691cf6af7ea Mon Sep 17 00:00:00 2001
From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
Date: Fri, 28 Aug 2015 06:38:33 -0400
-Subject: [PATCH 07/17] aacraid: Fix for LD name and UID not exposed to OS
+Subject: [PATCH 06/15] aacraid: Fix for LD name and UID not exposed to OS
Driver sends the right size of the response buffer.
@@ -15,7 +15,7 @@
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
-index 9b3dd6e..fe59b00 100644
+index 9b3dd6ef6a0b..fe59b0084575 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -570,7 +570,7 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd)
@@ -37,5 +37,5 @@
0, 1,
(fib_callback) get_container_serial_callback,
--
-2.5.0
+2.6.2
diff --git a/openpower/linux/linux-0008-aacraid-Add-Power-Management-support.patch b/openpower/linux/linux-0007-aacraid-Add-Power-Management-support.patch
similarity index 97%
rename from openpower/linux/linux-0008-aacraid-Add-Power-Management-support.patch
rename to openpower/linux/linux-0007-aacraid-Add-Power-Management-support.patch
index d0b5a34..c26a5ba 100644
--- a/openpower/linux/linux-0008-aacraid-Add-Power-Management-support.patch
+++ b/openpower/linux/linux-0007-aacraid-Add-Power-Management-support.patch
@@ -1,7 +1,7 @@
-From 608f633800ba170ccdcaf8797fce5787f038eefb Mon Sep 17 00:00:00 2001
+From fd4cc1e0ec6ca370ece67af9e6a3cde5cb9becb6 Mon Sep 17 00:00:00 2001
From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
Date: Fri, 28 Aug 2015 06:38:34 -0400
-Subject: [PATCH 08/17] aacraid: Add Power Management support
+Subject: [PATCH 07/15] aacraid: Add Power Management support
* .suspend() and .resume() routines implemented in the driver
* aac_release_resources() initiates firmware shutdown
@@ -22,7 +22,7 @@
6 files changed, 232 insertions(+), 78 deletions(-)
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
-index 40fe65c..62b0999 100644
+index 40fe65c91b41..62b099940345 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -547,6 +547,7 @@ struct adapter_ops
@@ -52,7 +52,7 @@
unsigned int aac_command_normal(struct aac_queue * q);
unsigned int aac_intr_normal(struct aac_dev *dev, u32 Index,
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
-index 45db84a..45a0a04 100644
+index 45db84ad322f..45a0a044dfdb 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -43,8 +43,6 @@
@@ -228,7 +228,7 @@
- msi_count;
-}
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
-index 9eec027..37375cf 100644
+index 9eec02733c86..37375cf7d126 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -1317,6 +1317,149 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
@@ -393,7 +393,7 @@
};
diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
-index 9570612..ac16380 100644
+index 9570612b80ce..ac1638069335 100644
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -623,6 +623,7 @@ int _aac_rx_init(struct aac_dev *dev)
@@ -405,7 +405,7 @@
/*
* First clear out all interrupts. Then enable the one's that we
diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c
-index e66477c..869aea2 100644
+index e66477c98240..869aea23c041 100644
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -372,6 +372,7 @@ int aac_sa_init(struct aac_dev *dev)
@@ -417,7 +417,7 @@
dev->a_ops.adapter_deliver = aac_rx_deliver_producer;
dev->a_ops.adapter_ioremap = aac_sa_ioremap;
diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c
-index e63cf9f..b147341 100644
+index e63cf9f22f36..b147341ac24d 100644
--- a/drivers/scsi/aacraid/src.c
+++ b/drivers/scsi/aacraid/src.c
@@ -726,6 +726,7 @@ int aac_src_init(struct aac_dev *dev)
@@ -437,5 +437,5 @@
/*
* First clear out all interrupts. Then enable the one's that we
--
-2.5.0
+2.6.2
diff --git a/openpower/linux/linux-0009-aacraid-Change-interrupt-mode-to-MSI-for-Series-6.patch b/openpower/linux/linux-0008-aacraid-Change-interrupt-mode-to-MSI-for-Series-6.patch
similarity index 88%
rename from openpower/linux/linux-0009-aacraid-Change-interrupt-mode-to-MSI-for-Series-6.patch
rename to openpower/linux/linux-0008-aacraid-Change-interrupt-mode-to-MSI-for-Series-6.patch
index f7443a7..872fdc7 100644
--- a/openpower/linux/linux-0009-aacraid-Change-interrupt-mode-to-MSI-for-Series-6.patch
+++ b/openpower/linux/linux-0008-aacraid-Change-interrupt-mode-to-MSI-for-Series-6.patch
@@ -1,7 +1,7 @@
-From 9b99db2b1e54238f98477cdad37dba34731792be Mon Sep 17 00:00:00 2001
+From 3b9ff8cca5a7d0745311e06c71286090ffd17392 Mon Sep 17 00:00:00 2001
From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
Date: Fri, 28 Aug 2015 06:38:35 -0400
-Subject: [PATCH 09/17] aacraid: Change interrupt mode to MSI for Series 6
+Subject: [PATCH 08/15] aacraid: Change interrupt mode to MSI for Series 6
This change always sets MSI interrupt mode for series-6 controller.
@@ -16,7 +16,7 @@
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
-index fe59b00..05f2a02 100644
+index fe59b0084575..05f2a0295f4d 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -259,7 +259,7 @@ MODULE_PARM_DESC(commit, "Control whether a COMMIT_CONFIG is issued to the"
@@ -29,7 +29,7 @@
MODULE_PARM_DESC(startup_timeout, "The duration of time in seconds to wait for"
" adapter to have it's kernel up and\n"
diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c
-index b147341..eb07b3d 100644
+index b147341ac24d..eb07b3d4ed38 100644
--- a/drivers/scsi/aacraid/src.c
+++ b/drivers/scsi/aacraid/src.c
@@ -742,7 +742,7 @@ int aac_src_init(struct aac_dev *dev)
@@ -42,5 +42,5 @@
dev->aac_msix[0].vector_no = 0;
dev->aac_msix[0].dev = dev;
--
-2.5.0
+2.6.2
diff --git a/openpower/linux/linux-0010-aacraid-Tune-response-path-if-IsFastPath-bit-set.patch b/openpower/linux/linux-0009-aacraid-Tune-response-path-if-IsFastPath-bit-set.patch
similarity index 98%
rename from openpower/linux/linux-0010-aacraid-Tune-response-path-if-IsFastPath-bit-set.patch
rename to openpower/linux/linux-0009-aacraid-Tune-response-path-if-IsFastPath-bit-set.patch
index 6b00b29..81d0dcf 100644
--- a/openpower/linux/linux-0010-aacraid-Tune-response-path-if-IsFastPath-bit-set.patch
+++ b/openpower/linux/linux-0009-aacraid-Tune-response-path-if-IsFastPath-bit-set.patch
@@ -1,7 +1,7 @@
-From 841c01b02751a163bd66ab6ad0c5b7b7e147b47d Mon Sep 17 00:00:00 2001
+From abcbb5d7d8e9e6144487bfcc22d14efe3f76de40 Mon Sep 17 00:00:00 2001
From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
Date: Fri, 28 Aug 2015 06:38:37 -0400
-Subject: [PATCH 10/17] aacraid: Tune response path if IsFastPath bit set
+Subject: [PATCH 09/15] aacraid: Tune response path if IsFastPath bit set
If 'IsFastPath' bit is set, then response path assumes no error and skips error check.
@@ -14,7 +14,7 @@
1 file changed, 137 insertions(+), 122 deletions(-)
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
-index 05f2a02..e4c2437 100644
+index 05f2a0295f4d..e4c243748a97 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -2977,11 +2977,16 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
@@ -315,5 +315,5 @@
/*
* OR in the scsi status (already shifted up a bit)
--
-2.5.0
+2.6.2
diff --git a/openpower/linux/linux-0011-aacraid-Enable-64bit-write-to-controller-register.patch b/openpower/linux/linux-0010-aacraid-Enable-64bit-write-to-controller-register.patch
similarity index 91%
rename from openpower/linux/linux-0011-aacraid-Enable-64bit-write-to-controller-register.patch
rename to openpower/linux/linux-0010-aacraid-Enable-64bit-write-to-controller-register.patch
index 7215274..ec349ff 100644
--- a/openpower/linux/linux-0011-aacraid-Enable-64bit-write-to-controller-register.patch
+++ b/openpower/linux/linux-0010-aacraid-Enable-64bit-write-to-controller-register.patch
@@ -1,7 +1,7 @@
-From a7aac5e60943c0d40f2b7d9ce0a6462e4479800d Mon Sep 17 00:00:00 2001
+From 2eed91e90f6fa1bfdc21c5c84eeff9d656cfb2f6 Mon Sep 17 00:00:00 2001
From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
Date: Fri, 28 Aug 2015 06:38:36 -0400
-Subject: [PATCH 11/17] aacraid: Enable 64bit write to controller register
+Subject: [PATCH 10/15] aacraid: Enable 64bit write to controller register
If writeq() not supported, then do atomic two 32bit write
@@ -17,7 +17,7 @@
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
-index 62b0999..e54f597 100644
+index 62b099940345..e54f597a058d 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -844,6 +844,10 @@ struct src_registers {
@@ -44,7 +44,7 @@
/*
* The following is the device specific extension.
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
-index 45a0a04..b4b6088 100644
+index 45a0a044dfdb..b4b6088fcb33 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -424,6 +424,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
@@ -56,7 +56,7 @@
dev->sg_tablesize = host->sg_tablesize = (dev->max_fib_size
- sizeof(struct aac_fibhdr)
diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c
-index eb07b3d..1409a0b 100644
+index eb07b3d4ed38..1409a0b945ea 100644
--- a/drivers/scsi/aacraid/src.c
+++ b/drivers/scsi/aacraid/src.c
@@ -447,6 +447,10 @@ static int aac_src_deliver_message(struct fib *fib)
@@ -88,5 +88,5 @@
}
--
-2.5.0
+2.6.2
diff --git a/openpower/linux/linux-0012-aacraid-IOCTL-fix.patch b/openpower/linux/linux-0011-aacraid-IOCTL-fix.patch
similarity index 87%
rename from openpower/linux/linux-0012-aacraid-IOCTL-fix.patch
rename to openpower/linux/linux-0011-aacraid-IOCTL-fix.patch
index f4057e3..a06e485 100644
--- a/openpower/linux/linux-0012-aacraid-IOCTL-fix.patch
+++ b/openpower/linux/linux-0011-aacraid-IOCTL-fix.patch
@@ -1,7 +1,7 @@
-From 97d883832a9083aad13b736b2e513307edd1216d Mon Sep 17 00:00:00 2001
+From 21b4be79f2475bc5acd600400c47110695675ac0 Mon Sep 17 00:00:00 2001
From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
Date: Fri, 28 Aug 2015 06:38:39 -0400
-Subject: [PATCH 12/17] aacraid: IOCTL fix
+Subject: [PATCH 11/15] aacraid: IOCTL fix
Driver blocks ioctls once it received shutdown/suspend request during
suspend/hybernation. This patch unblocks ioctls on resume path.
@@ -16,7 +16,7 @@
1 file changed, 5 insertions(+)
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
-index 37375cf..3b6e5c6 100644
+index 37375cf7d126..3b6e5c67e853 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -1448,6 +1448,11 @@ static int aac_resume(struct pci_dev *pdev)
@@ -32,5 +32,5 @@
return 0;
--
-2.5.0
+2.6.2
diff --git a/openpower/linux/linux-0013-aacraid-Reset-irq-affinity-hints.patch b/openpower/linux/linux-0012-aacraid-Reset-irq-affinity-hints.patch
similarity index 96%
rename from openpower/linux/linux-0013-aacraid-Reset-irq-affinity-hints.patch
rename to openpower/linux/linux-0012-aacraid-Reset-irq-affinity-hints.patch
index d32e6fb..3434b4b 100644
--- a/openpower/linux/linux-0013-aacraid-Reset-irq-affinity-hints.patch
+++ b/openpower/linux/linux-0012-aacraid-Reset-irq-affinity-hints.patch
@@ -1,7 +1,7 @@
-From 39231523523eadf49e7cc88426dfebc1bf3fcfbe Mon Sep 17 00:00:00 2001
+From 691bc6c6570ffbd9e1c4733dd12cd513ff6e19ec Mon Sep 17 00:00:00 2001
From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
Date: Fri, 28 Aug 2015 06:38:38 -0400
-Subject: [PATCH 13/17] aacraid: Reset irq affinity hints
+Subject: [PATCH 12/15] aacraid: Reset irq affinity hints
Reset irq affinity hints before releasing IRQ.
Removed duplicate code of IRQ acquire/release.
@@ -18,7 +18,7 @@
3 files changed, 88 insertions(+), 75 deletions(-)
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
-index e54f597..7b95227 100644
+index e54f597a058d..7b95227af478 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -2110,6 +2110,8 @@ static inline unsigned int cap_to_cyls(sector_t capacity, unsigned divisor)
@@ -31,7 +31,7 @@
struct fib *aac_fib_alloc(struct aac_dev *dev);
int aac_fib_setup(struct aac_dev *dev);
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
-index 4da5749..a1f90fe 100644
+index 4da574925284..a1f90fe849c9 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1270,13 +1270,12 @@ retry_next:
@@ -171,7 +171,7 @@
+ pci_disable_msix(dev->pdev);
+}
diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c
-index 1409a0b..2aa34ea 100644
+index 1409a0b945ea..2aa34ea8ceb1 100644
--- a/drivers/scsi/aacraid/src.c
+++ b/drivers/scsi/aacraid/src.c
@@ -798,9 +798,7 @@ int aac_srcv_init(struct aac_dev *dev)
@@ -238,5 +238,5 @@
dev->dbg_base_mapped = dev->base;
dev->dbg_size = dev->base_size;
--
-2.5.0
+2.6.2
diff --git a/openpower/linux/linux-0014-aacraid-Use-pci_enable_msix_range.patch b/openpower/linux/linux-0013-aacraid-Use-pci_enable_msix_range.patch
similarity index 91%
rename from openpower/linux/linux-0014-aacraid-Use-pci_enable_msix_range.patch
rename to openpower/linux/linux-0013-aacraid-Use-pci_enable_msix_range.patch
index 41c281b..69621fa 100644
--- a/openpower/linux/linux-0014-aacraid-Use-pci_enable_msix_range.patch
+++ b/openpower/linux/linux-0013-aacraid-Use-pci_enable_msix_range.patch
@@ -1,7 +1,7 @@
-From f0b1e9c3d16c488ef8a92e87c99bdd30ea7c3f11 Mon Sep 17 00:00:00 2001
+From 9db12f2808069bb0d284cf3745d3aad2727d8efa Mon Sep 17 00:00:00 2001
From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
Date: Fri, 28 Aug 2015 06:38:40 -0400
-Subject: [PATCH 14/17] aacraid: Use pci_enable_msix_range()
+Subject: [PATCH 13/15] aacraid: Use pci_enable_msix_range()
As pci_enable_msix() deprecated, replaced with pci_enable_msix_range()
@@ -16,7 +16,7 @@
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
-index 7b95227..2de5ebc 100644
+index 7b95227af478..2de5ebcce138 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -12,7 +12,7 @@
@@ -29,7 +29,7 @@
enum {
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
-index b4b6088..0e954e3 100644
+index b4b6088fcb33..0e954e37f0b5 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -338,7 +338,7 @@ static int aac_comm_init(struct aac_dev * dev)
@@ -70,5 +70,5 @@
dev->msi_enabled = 0;
printk(KERN_ERR "%s%d: MSIX not supported!! Will try MSI 0x%x.\n",
--
-2.5.0
+2.6.2
diff --git a/openpower/linux/linux-0015-aacraid-Update-driver-version.patch b/openpower/linux/linux-0014-aacraid-Update-driver-version.patch
similarity index 83%
rename from openpower/linux/linux-0015-aacraid-Update-driver-version.patch
rename to openpower/linux/linux-0014-aacraid-Update-driver-version.patch
index a815580..5eeed92 100644
--- a/openpower/linux/linux-0015-aacraid-Update-driver-version.patch
+++ b/openpower/linux/linux-0014-aacraid-Update-driver-version.patch
@@ -1,7 +1,7 @@
-From 89253aff92b94764266fad985ef25103836575d0 Mon Sep 17 00:00:00 2001
+From 4ce229595057fb71ff775bd9b84a9f72848275b3 Mon Sep 17 00:00:00 2001
From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
Date: Fri, 28 Aug 2015 06:38:41 -0400
-Subject: [PATCH 15/17] aacraid: Update driver version
+Subject: [PATCH 14/15] aacraid: Update driver version
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Reviewed-by: Murthy Bhat <Murthy.Bhat@pmcs.com>
@@ -13,7 +13,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
-index 2de5ebc..074878b 100644
+index 2de5ebcce138..074878b55a0b 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -62,7 +62,7 @@ enum {
@@ -26,5 +26,5 @@
#endif
#define MAXIMUM_NUM_CONTAINERS 32
--
-2.5.0
+2.6.2
diff --git a/openpower/linux/linux-0017-Release-4.2.5-openpower1.patch b/openpower/linux/linux-0015-Release-4.2.6-openpower1.patch
similarity index 70%
rename from openpower/linux/linux-0017-Release-4.2.5-openpower1.patch
rename to openpower/linux/linux-0015-Release-4.2.6-openpower1.patch
index 13e5a90..dcbb6cb 100644
--- a/openpower/linux/linux-0017-Release-4.2.5-openpower1.patch
+++ b/openpower/linux/linux-0015-Release-4.2.6-openpower1.patch
@@ -1,7 +1,7 @@
-From b9e362ebebec9d427afd0bf21b1e370929736785 Mon Sep 17 00:00:00 2001
+From 56015eb38198431a6fe83f8d0d516242ce05e3df Mon Sep 17 00:00:00 2001
From: Joel Stanley <joel@jms.id.au>
Date: Tue, 20 Oct 2015 15:01:06 +1030
-Subject: [PATCH 17/17] Release 4.2.5-openpower1
+Subject: [PATCH 15/15] Release 4.2.6-openpower1
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
@@ -9,18 +9,18 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 96076dc..e6d6eac2 100644
+index 9ef37399b4e8..028e6976b210 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 4
PATCHLEVEL = 2
- SUBLEVEL = 5
+ SUBLEVEL = 6
-EXTRAVERSION =
+EXTRAVERSION = -openpower1
NAME = Hurr durr I'ma sheep
# *DOCUMENTATION*
--
-2.5.0
+2.6.2
diff --git a/openpower/linux/linux-0016-fbcon-initialize-blink-interval-before-calling-fb_se.patch b/openpower/linux/linux-0016-fbcon-initialize-blink-interval-before-calling-fb_se.patch
deleted file mode 100644
index ff76e76..0000000
--- a/openpower/linux/linux-0016-fbcon-initialize-blink-interval-before-calling-fb_se.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a9f6fe770be903195109d0839f8192052859251d Mon Sep 17 00:00:00 2001
-From: Scot Doyle <lkml14@scotdoyle.com>
-Date: Fri, 9 Oct 2015 15:08:10 +0000
-Subject: [PATCH 16/17] fbcon: initialize blink interval before calling
- fb_set_par
-
-Since commit 27a4c827c34ac4256a190cc9d24607f953c1c459
- fbcon: use the cursor blink interval provided by vt
-
-a PPC64LE kernel fails to boot when fbcon_add_cursor_timer uses an
-uninitialized ops->cur_blink_jiffies. Prevent by initializing
-in fbcon_init before the call to info->fbops->fb_set_par.
-
-Reported-and-tested-by: Alistair Popple <alistair@popple.id.au>
-Signed-off-by: Scot Doyle <lkml14@scotdoyle.com>
-Cc: <stable@vger.kernel.org> [v4.2]
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Joel Stanley <joel@jms.id.au>
----
- drivers/video/console/fbcon.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
-index 1aaf893..92f3949 100644
---- a/drivers/video/console/fbcon.c
-+++ b/drivers/video/console/fbcon.c
-@@ -1093,6 +1093,7 @@ static void fbcon_init(struct vc_data *vc, int init)
- con_copy_unimap(vc, svc);
-
- ops = info->fbcon_par;
-+ ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms);
- p->con_rotate = initial_rotation;
- set_blitting_type(vc, info);
-
---
-2.5.0
-