public inbox for linux-scsi@vger.kernel.org
 help / color / mirror / Atom feed
From: Dave Carroll <david.carroll@microsemi.com>
To: "Martin K . Petersen" <martin.petersen@oracle.com>,
	Arkadiusz Miskiewicz <a.miskiewicz@gmail.com>,
	James Bottomley <jejb@linux.vnet.ibm.com>
Cc: Dave Carroll <david.carroll@microsemi.com>,
	linux-scsi <linux-scsi@vger.kernel.org>,
	aacraid@microsemi.com, Scott Benesh <scott.benesh@microsemi.com>,
	stable@vger.kernel.org
Subject: [PATCH] aacraid: Fix INTx/MSI-x issue with older controllers
Date: Thu, 9 Feb 2017 11:04:47 -0700	[thread overview]
Message-ID: <20170209180447.31404-1-david.carroll@microsemi.com> (raw)

commit 78cbccd3bd683 ("[PATCH] 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
Fixes: 78cbccd3bd683c295a44af8050797dc4a41376ff
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>
---
 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..d56df36 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);
 }
 
-- 
2.8.4

             reply	other threads:[~2017-02-09 18:43 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-09 18:04 Dave Carroll [this message]
2017-02-09 23:59 ` [PATCH] aacraid: Fix INTx/MSI-x issue with older controllers Martin K. Petersen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170209180447.31404-1-david.carroll@microsemi.com \
    --to=david.carroll@microsemi.com \
    --cc=a.miskiewicz@gmail.com \
    --cc=aacraid@microsemi.com \
    --cc=jejb@linux.vnet.ibm.com \
    --cc=linux-scsi@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=scott.benesh@microsemi.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox