Skip to content

Commit 4d6bdf7

Browse files
Dave Carrollgregkh
authored andcommitted
scsi: aacraid: Fix INTx/MSI-x issue with older controllers
commit 8af8e1c22f9994bb1849c01d66c24fe23f9bc9a0 upstream. 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 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 52e02d6 commit 4d6bdf7

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

drivers/scsi/aacraid/comminit.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,13 @@ struct aac_common aac_config = {
5050

5151
static inline int aac_is_msix_mode(struct aac_dev *dev)
5252
{
53-
u32 status;
53+
u32 status = 0;
5454

55-
status = src_readl(dev, MUnit.OMR);
55+
if (dev->pdev->device == PMC_DEVICE_S6 ||
56+
dev->pdev->device == PMC_DEVICE_S7 ||
57+
dev->pdev->device == PMC_DEVICE_S8) {
58+
status = src_readl(dev, MUnit.OMR);
59+
}
5660
return (status & AAC_INT_MODE_MSIX);
5761
}
5862

0 commit comments

Comments
 (0)