diff options
| author |   Himanshu Madhani <himanshu.madhani@cavium.com> | 2017-10-13 09:34:03 -0700 |
|---|---|---|
| committer |   Martin K. Petersen <martin.petersen@oracle.com> | 2017-10-16 22:54:29 -0400 |
| commit | e7240af5108fc8b068b1b21988e48f0c5005cae6 (patch) | |
| tree | 221dff72c14c7e89597a2af783e6cdc751639ae0 /drivers/scsi/qla2xxx/qla_isr.c | |
| parent | scsi: lpfc: Fix a precedence bug in lpfc_nvme_io_cmd_wqe_cmpl() (diff) | |
| download | linux-dev-e7240af5108fc8b068b1b21988e48f0c5005cae6.tar.xz linux-dev-e7240af5108fc8b068b1b21988e48f0c5005cae6.zip | |
scsi: qla2xxx: Reinstate module parameter ql2xenablemsix
[mkp: fixed whitespace]
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_isr.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_isr.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 9d9668aac6f6..ef7afd5eefe3 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -3486,11 +3486,14 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp) scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev); /* If possible, enable MSI-X. */ - if (!IS_QLA2432(ha) && !IS_QLA2532(ha) && !IS_QLA8432(ha) && - !IS_CNA_CAPABLE(ha) && !IS_QLA2031(ha) && !IS_QLAFX00(ha) && - !IS_QLA27XX(ha)) + if (ql2xenablemsix == 0 || (!IS_QLA2432(ha) && !IS_QLA2532(ha) && + !IS_QLA8432(ha) && !IS_CNA_CAPABLE(ha) && !IS_QLA2031(ha) && + !IS_QLAFX00(ha) && !IS_QLA27XX(ha))) goto skip_msi; + if (ql2xenablemsix == 2) + goto skip_msix; + if (ha->pdev->subsystem_vendor == PCI_VENDOR_ID_HP && (ha->pdev->subsystem_device == 0x7040 || ha->pdev->subsystem_device == 0x7041 || |