- up to 4.4.48; add aacraid: fix for AAC: Host adapter dead -1

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 9ce205c992649ba31de9b3865ab3c42902e5be69..f615d9416ac36a5e2e9d0bb5f8177ae7d572a27f 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -38,3 +38,47 @@
  # use the deterministic mode of AR if available
  KBUILD_ARFLAGS := $(call ar-option,D)
  
+From 8af8e1c22f9994bb1849c01d66c24fe23f9bc9a0 Mon Sep 17 00:00:00 2001
+From: Dave Carroll <david.carroll@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@vger.kernel.org> # v4.7+
+Fixes: 78cbccd3bd68 ("aacraid: Fix for KDUMP driver hang")
+Reported-by: Arkadiusz Miskiewicz <a.miskiewicz@gmail.com>
+Signed-off-by: Dave Carroll <david.carroll@microsemi.com>
+Reviewed-by: Raghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@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
+

diff --git a/kernel.spec b/kernel.spec
index 788e26d2050220bf864b0d81e6a7ecd654d1d364..e39e6c6a9f535ac8ea756f7bfbf2dec75c86f46c 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -72,7 +72,7 @@
 
 %define                rel             1
 %define                basever         4.4
-%define                postver         .47
+%define                postver         .48
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       -%{basever}
@@ -124,7 +124,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5: 9a78fa2eb6c68ca5a40ed5af08142599
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:  4140c092d355a837ccab1707c8ad0d33
+# Patch0-md5:  0a994db6cc903ddb952e4c965321deac
 %endif
 Source1:       kernel.sysconfig