[packages/kernel/LINUX_4_1] - rel 2; aacraid: fix for AAC: Host adapter dead -1

[arekm]

commit f1cd6d12c64f96c24fb04b1282f90f138f636257
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri Feb 10 11:08:39 2017 +0100

    - rel 2; aacraid: fix for AAC: Host adapter dead -1

 kernel-small_fixes.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
 kernel.spec              |  2 +-
 2 files changed, 45 insertions(+), 1 deletion(-)
---
diff --git a/kernel.spec b/kernel.spec
index c072ca6..412c4e0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,7 +71,7 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		1
+%define		rel		2
 %define		basever		4.1
 %define		postver		.38
 
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 575bbe1..00e17ae 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -125,3 +125,47 @@ index 29531ec..65fbfb7 100644
  	if (!mp->m_eofblocks_workqueue)
  		goto out_destroy_log;
 
+From 8af8e1c22f9994bb1849c01d66c24fe23f9bc9a0 Mon Sep 17 00:00:00 2001
+From: Dave Carroll <david.carroll at microsemi.com>
+Date: Thu, 9 Feb 2017 11:04:47 -0700
+Subject: scsi: aacraid: Fix INTx/MSI-x issue with older controllers
+
+commit 78cbccd3bd68 ("aacraid: Fix for KDUMP driver hang")
+
+caused a problem on older controllers which do not support MSI-x (namely
+ASR3405,ASR3805). This patch conditionalizes the previous patch to
+controllers which support MSI-x
+
+Cc: <stable at vger.kernel.org> # v4.7+
+Fixes: 78cbccd3bd68 ("aacraid: Fix for KDUMP driver hang")
+Reported-by: Arkadiusz Miskiewicz <a.miskiewicz at gmail.com>
+Signed-off-by: Dave Carroll <david.carroll at microsemi.com>
+Reviewed-by: Raghava Aditya Renukunta <RaghavaAditya.Renukunta at microsemi.com>
+Signed-off-by: Martin K. Petersen <martin.petersen at oracle.com>
+---
+ drivers/scsi/aacraid/comminit.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
+index 4f56b10..5b48bed 100644
+--- a/drivers/scsi/aacraid/comminit.c
++++ b/drivers/scsi/aacraid/comminit.c
+@@ -50,9 +50,13 @@ struct aac_common aac_config = {
+ 
+ static inline int aac_is_msix_mode(struct aac_dev *dev)
+ {
+-	u32 status;
++	u32 status = 0;
+ 
+-	status = src_readl(dev, MUnit.OMR);
++	if (dev->pdev->device == PMC_DEVICE_S6 ||
++		dev->pdev->device == PMC_DEVICE_S7 ||
++		dev->pdev->device == PMC_DEVICE_S8) {
++		status = src_readl(dev, MUnit.OMR);
++	}
+ 	return (status & AAC_INT_MODE_MSIX);
+ }
+ 
+-- 
+cgit v0.12
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/f1cd6d12c64f96c24fb04b1282f90f138f636257