linux: Update to v4.2.1-openpower1
This brings in the 4.2.1 stable release, and the accraid RAID driver for
PMC-Sierra RAID on Habanero.
The RAID driver is submitted upstream to the linux-scsi mailing list,
but is not yet in a tree.
The stable release brings in a few commits that are of interest to
OpenPower platforms:
94d718d024e xfs: return errors from partial I/O failures to files
2937b784b19 xfs: Fix file type directory corruption for btree directories
95310b79776 libxfs: readahead of dir3 data blocks should use the read verifier
0a3b19cef4f sched: Fix cpu_active_mask/cpu_online_mask race
Signed-off-by: Joel Stanley <joel@jms.id.au>
diff --git a/openpower/linux/linux-0016-aacraid-Use-pci_enable_msix_range.patch b/openpower/linux/linux-0016-aacraid-Use-pci_enable_msix_range.patch
new file mode 100644
index 0000000..b3ba206
--- /dev/null
+++ b/openpower/linux/linux-0016-aacraid-Use-pci_enable_msix_range.patch
@@ -0,0 +1,74 @@
+From e27d0ec1620e6c79a1cfe7286ad142f6c0701011 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 16/18] aacraid: Use pci_enable_msix_range()
+
+As pci_enable_msix() deprecated, replaced with pci_enable_msix_range()
+
+Reviewed-by: Tomas Henzl <thenzl@redhat.com>
+Reviewed-by: Murthy Bhat <Murthy.Bhat@pmcs.com>
+Reviewed-by: Karthikeya Sunkesula <Karthikeya.Sunkesula@pmcs.com>
+Signed-off-by: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
+Signed-off-by: Joel Stanley <joel@jms.id.au>
+---
+ drivers/scsi/aacraid/aacraid.h | 2 +-
+ drivers/scsi/aacraid/comminit.c | 20 ++++++--------------
+ 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
+--- a/drivers/scsi/aacraid/aacraid.h
++++ b/drivers/scsi/aacraid/aacraid.h
+@@ -12,7 +12,7 @@
+ * D E F I N E S
+ *----------------------------------------------------------------------------*/
+
+-#define AAC_MAX_MSIX 8 /* vectors */
++#define AAC_MAX_MSIX 32 /* vectors */
+ #define AAC_PCI_MSI_ENABLE 0x8000
+
+ enum {
+diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
+index b4b6088..0e954e3 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)
+
+ void aac_define_int_mode(struct aac_dev *dev)
+ {
+- int i, msi_count;
++ int i, msi_count, min_msix;
+
+ msi_count = i = 0;
+ /* max. vectors from GET_COMM_PREFERRED_SETTINGS */
+@@ -366,22 +366,14 @@ void aac_define_int_mode(struct aac_dev *dev)
+
+ if (msi_count > 1 &&
+ pci_find_capability(dev->pdev, PCI_CAP_ID_MSIX)) {
+- i = pci_enable_msix(dev->pdev,
++ min_msix = 2;
++ i = pci_enable_msix_range(dev->pdev,
+ dev->msixentry,
++ min_msix,
+ msi_count);
+- /* Check how many MSIX vectors are allocated */
+- if (i >= 0) {
++ if (i > 0) {
+ dev->msi_enabled = 1;
+- if (i) {
+- msi_count = i;
+- if (pci_enable_msix(dev->pdev,
+- dev->msixentry,
+- msi_count)) {
+- dev->msi_enabled = 0;
+- printk(KERN_ERR "%s%d: MSIX not supported!! Will try MSI 0x%x.\n",
+- dev->name, dev->id, i);
+- }
+- }
++ msi_count = i;
+ } else {
+ dev->msi_enabled = 0;
+ printk(KERN_ERR "%s%d: MSIX not supported!! Will try MSI 0x%x.\n",
+--
+2.5.0
+