Re: aacraid: kernel: AAC: Host adapter dead -1 (bisected)

["Andrey Jr. Melnikov" <temnota.am@gmail.com>]

In article <201701151205.37563.a.miskiewicz@gmail.com> you wrote:
> Newsgroups: gmane.linux.kernel


> Hi.

> There is a bug with handling of adaptec raid cards (in my case it is Adaptec 
> 3405) where kernel logs hundreds of "AAC: Host adapter dead -1" messages.

> Bug was reported previously on lkml but there was no progres in solving it.

> There is also bugzilla entry:
> https://bugzilla.kernel.org/show_bug.cgi?id=151661

> I've bisected that to commit bellow and indeed, reverting it from kernel 4.9.3 
> makes messages go away.


Don't try to switch Adaptec 3405/3805 RAID cards to MSI-X interrupt mode.
Fix https://bugzilla.kernel.org/show_bug.cgi?id=151661

Signed-off-by: Andrey Jr. Melnikov <temnota.am@gmail.com>

---

diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 969c312de1be..2ad8403dea40 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -12,6 +12,9 @@
  *              D E F I N E S
  *----------------------------------------------------------------------------*/
 
+#define AAC_SUBID_3805		0x02bc
+#define AAC_SUBID_3405		0x02bb
+
 #define AAC_MAX_MSIX		32	/* vectors */
 #define AAC_PCI_MSI_ENABLE	0x8000
 
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 341ea327ae79..a61138504927 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -52,6 +52,11 @@ static inline int aac_is_msix_mode(struct aac_dev *dev)
 {
 	u32 status;
 
+	/* Don't allow switch 3405/3805 cards to MSI-X interrupt mode */
+	if (dev->pdev->subsystem_device == AAC_SUBID_3405 ||
+	    dev->pdev->subsystem_device == AAC_SUBID_3405)
+		return 0;
+
 	status = src_readl(dev, MUnit.OMR);
 	return (status & AAC_INT_MODE_MSIX);
 }