scsi: aacraid: Fix INTx/MSI-x issue with older controllers

commit 78cbccd ("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: <[email protected]> # v4.7+ Fixes: 78cbccd ("aacraid: Fix for KDUMP driver hang") Reported-by: Arkadiusz Miskiewicz <[email protected]> Signed-off-by: Dave Carroll <[email protected]> Reviewed-by: Raghava Aditya Renukunta <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
libos-nuse · Feb 10, 2017 · 8af8e1c · 8af8e1c
1 parent ffdadd6
commit 8af8e1c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git 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);
 }