LinuxLists.cc - [PATCH 00/22] scsi: Use pci_enable_msix

2014-02-04 11:15:54

Subject: [PATCH 00/22] scsi: Use pci_enable_msix_range()

As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers
using these two interfaces need to be updated to use the
new pci_enable_msi_range() and pci_enable_msix_range()
interfaces.

Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]

Alexander Gordeev (22):
be2iscsi: Use pci_enable_msix_range()
bfa: Do not call pci_enable_msix() once it failed
bfa: Cleanup bfad_setup_intr()
bfa: Use pci_enable_msix_range()
csiostor: Remove superfluous call to pci_disable_msix()
csiostor: Use pci_enable_msix_range()
fnic: Use pci_enable_msix_range()
hpsa: Fallback to MSI rather than to INTx if MSI-X failed
hpsa: Use pci_enable_msix_range()
isci: Use pci_enable_msix_range()
lpfc: Remove superfluous call to pci_disable_msix()
lpfc: Use pci_enable_msix_range()
megaraid: Use pci_enable_msix_range()
mpt2sas: Use pci_enable_msix_range()
mpt3sas: Use pci_enable_msix_range()
pm8001: Fix invalid success return when request_irq() failed
pm8001: Use pci_enable_msix_range()
pmcraid: Get rid of a redundant assignment
pmcraid: Use pci_enable_msix_range()
qla2xxx: Use pci_enable_msix_range()
qla4xxx: Use pci_enable_msix_range()
vmw_pvscsi: Use pci_enable_msix_range()

drivers/scsi/be2iscsi/be_main.c | 6 +-
drivers/scsi/bfa/bfad.c | 62 ++++++++++++-----------------
drivers/scsi/csiostor/csio_hw.h | 2 +-
drivers/scsi/csiostor/csio_isr.c | 26 +++++-------
drivers/scsi/fnic/fnic_isr.c | 4 +-
drivers/scsi/hpsa.c | 23 ++++------
drivers/scsi/isci/init.c | 5 +-
drivers/scsi/lpfc/lpfc_init.c | 30 +++++++-------
drivers/scsi/megaraid/megaraid_sas_base.c | 25 +++++------
drivers/scsi/mpt2sas/mpt2sas_base.c | 11 +++--
drivers/scsi/mpt3sas/mpt3sas_base.c | 9 +++-
drivers/scsi/pm8001/pm8001_init.c | 46 +++++++++++----------
drivers/scsi/pmcraid.c | 14 +------
drivers/scsi/qla2xxx/qla_isr.c | 27 +++++-------
drivers/scsi/qla4xxx/ql4_nx.c | 5 +-
drivers/scsi/vmw_pvscsi.c | 4 +-
16 files changed, 134 insertions(+), 165 deletions(-)

--
1.7.7.6

2014-02-04 11:15:38

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 01/22] be2iscsi: Use pci_enable_msix_range()

2014-02-04 11:16:08

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 02/22] bfa: Do not call pci_enable_msix() once it failed

Function pci_enable_msix() should not be called again in
case it threw a negative errno.

Signed-off-by: Alexander Gordeev <[email protected]>
Cc: Anil Gurumurthy <[email protected]>
Cc: Vijaya Mohan Guvva <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/scsi/bfa/bfad.c | 48 ++++++++++++++++++++++------------------------
1 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
index 85ee9c0..9b3e407 100644
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -1235,33 +1235,31 @@ bfad_setup_intr(struct bfad_s *bfad)
(bfa_asic_id_cb(pdev->device) && !msix_disable_cb)) {

error = pci_enable_msix(bfad->pcidev, msix_entries, bfad->nvec);
- if (error) {
- /* In CT1 & CT2, try to allocate just one vector */
- if (bfa_asic_id_ctc(pdev->device)) {
- printk(KERN_WARNING "bfa %s: trying one msix "
- "vector failed to allocate %d[%d]\n",
- bfad->pci_name, bfad->nvec, error);
- bfad->nvec = 1;
- error = pci_enable_msix(bfad->pcidev,
+ /* In CT1 & CT2, try to allocate just one vector */
+ if (error > 0 && bfa_asic_id_ctc(pdev->device)) {
+ printk(KERN_WARNING "bfa %s: trying one msix "
+ "vector failed to allocate %d[%d]\n",
+ bfad->pci_name, bfad->nvec, error);
+ bfad->nvec = 1;
+ error = pci_enable_msix(bfad->pcidev,
msix_entries, bfad->nvec);
- }
+ }

- /*
- * Only error number of vector is available.
- * We don't have a mechanism to map multiple
- * interrupts into one vector, so even if we
- * can try to request less vectors, we don't
- * know how to associate interrupt events to
- * vectors. Linux doesn't duplicate vectors
- * in the MSIX table for this case.
- */
- if (error) {
- printk(KERN_WARNING "bfad%d: "
- "pci_enable_msix failed (%d), "
- "use line based.\n",
- bfad->inst_no, error);
- goto line_based;
- }
+ /*
+ * Only error number of vector is available.
+ * We don't have a mechanism to map multiple
+ * interrupts into one vector, so even if we
+ * can try to request less vectors, we don't
+ * know how to associate interrupt events to
+ * vectors. Linux doesn't duplicate vectors
+ * in the MSIX table for this case.
+ */
+ if (error) {
+ printk(KERN_WARNING "bfad%d: "
+ "pci_enable_msix failed (%d), "
+ "use line based.\n",
+ bfad->inst_no, error);
+ goto line_based;
}

/* Disable INTX in MSI-X mode */
--
1.7.7.6

2014-02-04 11:16:20

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 14/22] mpt2sas: Use pci_enable_msix_range()

2014-02-04 11:16:30

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 15/22] mpt3sas: Use pci_enable_msix_range()

2014-02-04 11:16:44

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 13/22] megaraid: Use pci_enable_msix_range()

As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers
using these two interfaces need to be updated to use the
new pci_enable_msi_range() and pci_enable_msix_range()
interfaces.

Signed-off-by: Alexander Gordeev <[email protected]>
Cc: Neela Syam Kolli <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/scsi/megaraid/megaraid_sas_base.c | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 3b7ad10..90944f1 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -3731,18 +3731,12 @@ static int megasas_init_fw(struct megasas_instance *instance)
(unsigned int)num_online_cpus());
for (i = 0; i < instance->msix_vectors; i++)
instance->msixentry[i].entry = i;
- i = pci_enable_msix(instance->pdev, instance->msixentry,
- instance->msix_vectors);
- if (i >= 0) {
- if (i) {
- if (!pci_enable_msix(instance->pdev,
- instance->msixentry, i))
- instance->msix_vectors = i;
- else
- instance->msix_vectors = 0;
- }
- } else
+ i = pci_enable_msix_range(instance->pdev, instance->msixentry,
+ 1, instance->msix_vectors);
+ if (i < 0)
instance->msix_vectors = 0;
+ else
+ instance->msix_vectors = i;

dev_info(&instance->pdev->dev, "[scsi%d]: FW supports"
"<%d> MSIX vector,Online CPUs: <%d>,"
@@ -4667,9 +4661,11 @@ megasas_resume(struct pci_dev *pdev)
goto fail_ready_state;

/* Now re-enable MSI-X */
- if (instance->msix_vectors)
- pci_enable_msix(instance->pdev, instance->msixentry,
- instance->msix_vectors);
+ if (instance->msix_vectors &&
+ pci_enable_msix_range(instance->pdev, instance->msixentry,
+ instance->msix_vectors,
+ instance->msix_vectors) < 0)
+ goto fail_reenable_msix;

switch (instance->pdev->device) {
case PCI_DEVICE_ID_LSI_FUSION:
@@ -4756,6 +4752,7 @@ fail_init_mfi:

fail_set_dma_mask:
fail_ready_state:
+fail_reenable_msix:

pci_disable_device(pdev);

--
1.7.7.6

2014-02-04 11:16:54

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 21/22] qla4xxx: Use pci_enable_msix_range()

2014-02-04 11:17:12

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 09/22] hpsa: Use pci_enable_msix_range()

2014-02-04 11:17:15

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 08/22] hpsa: Fallback to MSI rather than to INTx if MSI-X failed

Signed-off-by: Alexander Gordeev <[email protected]>
Cc: "Stephen M. Cameron" <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
drivers/scsi/hpsa.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 868318a..68eec7a 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -4180,13 +4180,14 @@ static void hpsa_interrupt_mode(struct ctlr_info *h)
if (err > 0) {
dev_warn(&h->pdev->dev, "only %d MSI-X vectors "
"available\n", err);
- goto default_int_mode;
+ goto single_msi_mode;
} else {
dev_warn(&h->pdev->dev, "MSI-X init failed %d\n",
err);
- goto default_int_mode;
+ goto single_msi_mode;
}
}
+single_msi_mode:
if (pci_find_capability(h->pdev, PCI_CAP_ID_MSI)) {
dev_info(&h->pdev->dev, "MSI\n");
if (!pci_enable_msi(h->pdev))
--
1.7.7.6

2014-02-04 11:18:01

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 22/22] vmw_pvscsi: Use pci_enable_msix_range()

2014-02-04 11:18:20

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 20/22] qla2xxx: Use pci_enable_msix_range()

As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers
using these two interfaces need to be updated to use the
new pci_enable_msi_range() and pci_enable_msix_range()
interfaces.

Log message code 0x00c6 preserved, although it is reported
after successful call to pci_enable_msix_range(), not before
possibly unsuccessful call to pci_enable_msix(). Consumers
of the error code should not notice the difference.

Signed-off-by: Alexander Gordeev <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
drivers/scsi/qla2xxx/qla_isr.c | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 9bc86b9..b2dcfa4 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -2896,27 +2896,22 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp)
for (i = 0; i < ha->msix_count; i++)
entries[i].entry = i;

- ret = pci_enable_msix(ha->pdev, entries, ha->msix_count);
- if (ret) {
- if (ret < MIN_MSIX_COUNT)
- goto msix_failed;
-
+ ret = pci_enable_msix_range(ha->pdev,
+ entries, MIN_MSIX_COUNT, ha->msix_count);
+ if (ret < 0) {
+ ql_log(ql_log_fatal, vha, 0x00c7,
+ "MSI-X: Failed to enable support, "
+ "giving up -- %d/%d.\n",
+ ha->msix_count, ret);
+ goto msix_out;
+ } else if (ret < ha->msix_count) {
ql_log(ql_log_warn, vha, 0x00c6,
"MSI-X: Failed to enable support "
"-- %d/%d\n Retry with %d vectors.\n",
ha->msix_count, ret, ret);
- ha->msix_count = ret;
- ret = pci_enable_msix(ha->pdev, entries, ha->msix_count);
- if (ret) {
-msix_failed:
- ql_log(ql_log_fatal, vha, 0x00c7,
- "MSI-X: Failed to enable support, "
- "giving up -- %d/%d.\n",
- ha->msix_count, ret);
- goto msix_out;
- }
- ha->max_rsp_queues = ha->msix_count - 1;
}
+ ha->msix_count = ret;
+ ha->max_rsp_queues = ha->msix_count - 1;
ha->msix_entries = kzalloc(sizeof(struct qla_msix_entry) *
ha->msix_count, GFP_KERNEL);
if (!ha->msix_entries) {
--
1.7.7.6

2014-02-04 11:18:55

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 19/22] pmcraid: Use pci_enable_msix_range()

2014-02-04 11:19:16

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 16/22] pm8001: Fix invalid success return when request_irq() failed

When enabling MSI-X if a call to request_irq() failed
pm8001_setup_msix() still returns success. This udate
fixes the described misbehaviour.

Signed-off-by: Alexander Gordeev <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
drivers/scsi/pm8001/pm8001_init.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index 73a120d..efffbb9 100644
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -739,9 +739,10 @@ static u32 pm8001_setup_msix(struct pm8001_hba_info *pm8001_ha)
pm8001_ha->irq_vector[i].irq_id = i;
pm8001_ha->irq_vector[i].drv_inst = pm8001_ha;

- if (request_irq(pm8001_ha->msix_entries[i].vector,
+ rc = request_irq(pm8001_ha->msix_entries[i].vector,
pm8001_interrupt_handler_msix, flag,
- intr_drvname[i], &(pm8001_ha->irq_vector[i]))) {
+ intr_drvname[i], &(pm8001_ha->irq_vector[i]));
+ if (rc) {
for (j = 0; j < i; j++)
free_irq(
pm8001_ha->msix_entries[j].vector,
--
1.7.7.6

2014-02-04 11:19:10

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 18/22] pmcraid: Get rid of a redundant assignment

Signed-off-by: Alexander Gordeev <[email protected]>
Cc: Anil Ravindranath <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/scsi/pmcraid.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index be8ce54..c06af7f 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -4746,7 +4746,6 @@ pmcraid_isr_legacy:
pinstance->hrrq_vector[0].drv_inst = pinstance;
pinstance->hrrq_vector[0].vector = pdev->irq;
pinstance->num_hrrq = 1;
- rc = 0;

rc = request_irq(pdev->irq, pmcraid_isr, IRQF_SHARED,
PMCRAID_DRIVER_NAME, &pinstance->hrrq_vector[0]);
--
1.7.7.6

2014-02-04 11:19:03

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 17/22] pm8001: Use pci_enable_msix_range()

As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers
using these two interfaces need to be updated to use the
new pci_enable_msi_range() and pci_enable_msix_range()
interfaces.

Signed-off-by: Alexander Gordeev <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
drivers/scsi/pm8001/pm8001_init.c | 47 +++++++++++++++++++------------------
1 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index efffbb9..2d4b06e 100644
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -724,34 +724,35 @@ static u32 pm8001_setup_msix(struct pm8001_hba_info *pm8001_ha)
sizeof(pm8001_ha->msix_entries[0]);
for (i = 0; i < max_entry ; i++)
pm8001_ha->msix_entries[i].entry = i;
- rc = pci_enable_msix(pm8001_ha->pdev, pm8001_ha->msix_entries,
- number_of_intr);
+ rc = pci_enable_msix_range(pm8001_ha->pdev, pm8001_ha->msix_entries,
+ number_of_intr, number_of_intr);
pm8001_ha->number_of_intr = number_of_intr;
- if (!rc) {
- PM8001_INIT_DBG(pm8001_ha, pm8001_printk(
- "pci_enable_msix request ret:%d no of intr %d\n",
- rc, pm8001_ha->number_of_intr));
-
-
- for (i = 0; i < number_of_intr; i++) {
- snprintf(intr_drvname[i], sizeof(intr_drvname[0]),
- DRV_NAME"%d", i);
- pm8001_ha->irq_vector[i].irq_id = i;
- pm8001_ha->irq_vector[i].drv_inst = pm8001_ha;
-
- rc = request_irq(pm8001_ha->msix_entries[i].vector,
- pm8001_interrupt_handler_msix, flag,
- intr_drvname[i], &(pm8001_ha->irq_vector[i]));
- if (rc) {
- for (j = 0; j < i; j++)
- free_irq(
- pm8001_ha->msix_entries[j].vector,
+ if (rc < 0)
+ return rc;
+
+ PM8001_INIT_DBG(pm8001_ha, pm8001_printk(
+ "pci_enable_msix request ret:%d no of intr %d\n",
+ rc, pm8001_ha->number_of_intr));
+
+ for (i = 0; i < number_of_intr; i++) {
+ snprintf(intr_drvname[i], sizeof(intr_drvname[0]),
+ DRV_NAME"%d", i);
+ pm8001_ha->irq_vector[i].irq_id = i;
+ pm8001_ha->irq_vector[i].drv_inst = pm8001_ha;
+
+ rc = request_irq(pm8001_ha->msix_entries[i].vector,
+ pm8001_interrupt_handler_msix, flag,
+ intr_drvname[i], &(pm8001_ha->irq_vector[i]));
+ if (rc) {
+ for (j = 0; j < i; j++) {
+ free_irq(pm8001_ha->msix_entries[j].vector,
&(pm8001_ha->irq_vector[i]));
- pci_disable_msix(pm8001_ha->pdev);
- break;
}
+ pci_disable_msix(pm8001_ha->pdev);
+ break;
}
}
+
return rc;
}
#endif
--
1.7.7.6

2014-02-04 11:20:01

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 12/22] lpfc: Use pci_enable_msix_range()

As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers
using these two interfaces need to be updated to use the
new pci_enable_msi_range() and pci_enable_msix_range()
interfaces.

Signed-off-by: Alexander Gordeev <[email protected]>
Cc: James Smart <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/scsi/lpfc/lpfc_init.c | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index a9df97a..5bb40ca 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -8187,8 +8187,8 @@ lpfc_sli_disable_msix(struct lpfc_hba *phba)
* @phba: pointer to lpfc hba data structure.
*
* This routine is invoked to enable the MSI interrupt mode to device with
- * SLI-3 interface spec. The kernel function pci_enable_msi() is called to
- * enable the MSI vector. The device driver is responsible for calling the
+ * SLI-3 interface spec. The kernel function pci_enable_msi_range() is called
+ * to enable the MSI vector. The device driver is responsible for calling the
* request_irq() to register MSI vector with a interrupt the handler, which
* is done in this function.
*
@@ -8201,8 +8201,8 @@ lpfc_sli_enable_msi(struct lpfc_hba *phba)
{
int rc;

- rc = pci_enable_msi(phba->pcidev);
- if (!rc)
+ rc = pci_enable_msi_range(phba->pcidev, 1, 1);
+ if (rc > 0)
lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
"0462 PCI enable MSI mode success.\n");
else {
@@ -8636,17 +8636,14 @@ lpfc_sli4_enable_msix(struct lpfc_hba *phba)
phba->sli4_hba.msix_entries[index].entry = index;

/* Configure MSI-X capability structure */
- vectors = phba->cfg_fcp_io_channel;
-enable_msix_vectors:
- rc = pci_enable_msix(phba->pcidev, phba->sli4_hba.msix_entries,
- vectors);
- if (rc > 1) {
- vectors = rc;
- goto enable_msix_vectors;
- } else if (rc) {
+ rc = pci_enable_msix_range(phba->pcidev, phba->sli4_hba.msix_entries,
+ 2, phba->cfg_fcp_io_channel);
+ if (rc < 0) {
lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
"0484 PCI enable MSI-X failed (%d)\n", rc);
goto vec_fail_out;
+ } else {
+ vectors = rc;
}

/* Log MSI-X vector assignment */
--
1.7.7.6

2014-02-04 11:20:11

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 11/22] lpfc: Remove superfluous call to pci_disable_msix()

Signed-off-by: Alexander Gordeev <[email protected]>
Cc: James Smart <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/scsi/lpfc/lpfc_init.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 68c94cc..a9df97a 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -8078,7 +8078,7 @@ lpfc_sli_enable_msix(struct lpfc_hba *phba)
if (rc) {
lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
"0420 PCI enable MSI-X failed (%d)\n", rc);
- goto msi_fail_out;
+ goto vec_fail_out;
}
for (i = 0; i < LPFC_MSIX_VECTORS; i++)
lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
@@ -8156,6 +8156,8 @@ irq_fail_out:
msi_fail_out:
/* Unconfigure MSI-X capability structure */
pci_disable_msix(phba->pcidev);
+
+vec_fail_out:
return rc;
}

@@ -8644,7 +8646,7 @@ enable_msix_vectors:
} else if (rc) {
lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
"0484 PCI enable MSI-X failed (%d)\n", rc);
- goto msi_fail_out;
+ goto vec_fail_out;
}

/* Log MSI-X vector assignment */
@@ -8696,9 +8698,10 @@ cfg_fail_out:
&phba->sli4_hba.fcp_eq_hdl[index]);
}

-msi_fail_out:
/* Unconfigure MSI-X capability structure */
pci_disable_msix(phba->pcidev);
+
+vec_fail_out:
return rc;
}

--
1.7.7.6

2014-02-04 11:20:19

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 10/22] isci: Use pci_enable_msix_range()

2014-02-04 11:21:08

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 06/22] csiostor: Use pci_enable_msix_range()

As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers
using these two interfaces need to be updated to use the
new pci_enable_msi_range() and pci_enable_msix_range()
interfaces.

Signed-off-by: Alexander Gordeev <[email protected]>
Cc: Naresh Kumar Inna <[email protected]>
Cc: Arvind Bhushan <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/scsi/csiostor/csio_hw.h | 2 +-
drivers/scsi/csiostor/csio_isr.c | 24 ++++++++++--------------
2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/drivers/scsi/csiostor/csio_hw.h b/drivers/scsi/csiostor/csio_hw.h
index 49b1daa..5db2d85 100644
--- a/drivers/scsi/csiostor/csio_hw.h
+++ b/drivers/scsi/csiostor/csio_hw.h
@@ -94,7 +94,7 @@ enum {
};

struct csio_msix_entries {
- unsigned short vector; /* Vector assigned by pci_enable_msix */
+ unsigned short vector; /* Assigned MSI-X vector */
void *dev_id; /* Priv object associated w/ this msix*/
char desc[24]; /* Description of this vector */
};
diff --git a/drivers/scsi/csiostor/csio_isr.c b/drivers/scsi/csiostor/csio_isr.c
index 91ba91d..06f283f 100644
--- a/drivers/scsi/csiostor/csio_isr.c
+++ b/drivers/scsi/csiostor/csio_isr.c
@@ -499,7 +499,7 @@ csio_reduce_sqsets(struct csio_hw *hw, int cnt)
static int
csio_enable_msix(struct csio_hw *hw)
{
- int rv, i, j, k, n, min, cnt;
+ int i, j, k, n, min, cnt;
struct csio_msix_entries *entryp;
struct msix_entry *entries;
int extra = CSIO_EXTRA_VECS;
@@ -521,19 +521,15 @@ csio_enable_msix(struct csio_hw *hw)

csio_dbg(hw, "FW supp #niq:%d, trying %d msix's\n", hw->cfg_niq, cnt);

- while ((rv = pci_enable_msix(hw->pdev, entries, cnt)) >= min)
- cnt = rv;
- if (!rv) {
- if (cnt < (hw->num_sqsets + extra)) {
- csio_dbg(hw, "Reducing sqsets to %d\n", cnt - extra);
- csio_reduce_sqsets(hw, cnt - extra);
- }
- } else {
- if (rv > 0)
- csio_info(hw, "Not using MSI-X, remainder:%d\n", rv);
-
+ cnt = pci_enable_msix_range(hw->pdev, entries, min, cnt);
+ if (cnt < 0) {
kfree(entries);
- return -ENOMEM;
+ return cnt;
+ }
+
+ if (cnt < (hw->num_sqsets + extra)) {
+ csio_dbg(hw, "Reducing sqsets to %d\n", cnt - extra);
+ csio_reduce_sqsets(hw, cnt - extra);
}

/* Save off vectors */
@@ -585,7 +581,7 @@ csio_intr_enable(struct csio_hw *hw)
}
}

- if ((csio_msi == 1) && !pci_enable_msi(hw->pdev))
+ if ((csio_msi == 1) && pci_enable_msi_range(hw->pdev, 1, 1) > 0)
hw->intr_mode = CSIO_IM_MSI;
else
hw->intr_mode = CSIO_IM_INTX;
--
1.7.7.6

2014-02-04 11:21:20

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 05/22] csiostor: Remove superfluous call to pci_disable_msix()

Signed-off-by: Alexander Gordeev <[email protected]>
Cc: Naresh Kumar Inna <[email protected]>
Cc: Arvind Bhushan <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/scsi/csiostor/csio_isr.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/csiostor/csio_isr.c b/drivers/scsi/csiostor/csio_isr.c
index 7ee9777..91ba91d 100644
--- a/drivers/scsi/csiostor/csio_isr.c
+++ b/drivers/scsi/csiostor/csio_isr.c
@@ -529,10 +529,8 @@ csio_enable_msix(struct csio_hw *hw)
csio_reduce_sqsets(hw, cnt - extra);
}
} else {
- if (rv > 0) {
- pci_disable_msix(hw->pdev);
+ if (rv > 0)
csio_info(hw, "Not using MSI-X, remainder:%d\n", rv);
- }

kfree(entries);
return -ENOMEM;
--
1.7.7.6

2014-02-04 11:21:28

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 04/22] bfa: Use pci_enable_msix_range()

As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers
using these two interfaces need to be updated to use the
new pci_enable_msi_range() and pci_enable_msix_range()
interfaces.

Signed-off-by: Alexander Gordeev <[email protected]>
Cc: Anil Gurumurthy <[email protected]>
Cc: Vijaya Mohan Guvva <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/scsi/bfa/bfad.c | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
index cd318f1..ee7442e 100644
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -1234,27 +1234,19 @@ bfad_setup_intr(struct bfad_s *bfad)
if ((bfa_asic_id_ctc(pdev->device) && !msix_disable_ct) ||
(bfa_asic_id_cb(pdev->device) && !msix_disable_cb)) {

- error = pci_enable_msix(bfad->pcidev, msix_entries, bfad->nvec);
+ error = pci_enable_msix_range(bfad->pcidev, msix_entries,
+ bfad->nvec, bfad->nvec);
/* In CT1 & CT2, try to allocate just one vector */
- if (error > 0 && bfa_asic_id_ctc(pdev->device)) {
+ if (error == -ENOSPC && bfa_asic_id_ctc(pdev->device)) {
printk(KERN_WARNING "bfa %s: trying one msix "
"vector failed to allocate %d[%d]\n",
bfad->pci_name, bfad->nvec, error);
bfad->nvec = 1;
- error = pci_enable_msix(bfad->pcidev,
- msix_entries, bfad->nvec);
+ error = pci_enable_msix_range(bfad->pcidev,
+ msix_entries, 1, 1);
}

- /*
- * Only error number of vector is available.
- * We don't have a mechanism to map multiple
- * interrupts into one vector, so even if we
- * can try to request less vectors, we don't
- * know how to associate interrupt events to
- * vectors. Linux doesn't duplicate vectors
- * in the MSIX table for this case.
- */
- if (error) {
+ if (error < 0) {
printk(KERN_WARNING "bfad%d: "
"pci_enable_msix failed (%d), "
"use line based.\n",
--
1.7.7.6

2014-02-04 11:21:35

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 03/22] bfa: Cleanup bfad_setup_intr()

Signed-off-by: Alexander Gordeev <[email protected]>
Cc: Anil Gurumurthy <[email protected]>
Cc: Vijaya Mohan Guvva <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/scsi/bfa/bfad.c | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
index 9b3e407..cd318f1 100644
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -1219,7 +1219,7 @@ bfad_install_msix_handler(struct bfad_s *bfad)
int
bfad_setup_intr(struct bfad_s *bfad)
{
- int error = 0;
+ int error;
u32 mask = 0, i, num_bit = 0, max_bit = 0;
struct msix_entry msix_entries[MAX_MSIX_ENTRY];
struct pci_dev *pdev = bfad->pcidev;
@@ -1279,20 +1279,18 @@ bfad_setup_intr(struct bfad_s *bfad)

bfad->bfad_flags |= BFAD_MSIX_ON;

- return error;
+ return 0;
}

line_based:
- error = 0;
- if (request_irq
- (bfad->pcidev->irq, (irq_handler_t) bfad_intx, BFAD_IRQ_FLAGS,
- BFAD_DRIVER_NAME, bfad) != 0) {
- /* Enable interrupt handler failed */
- return 1;
- }
+ error = request_irq(bfad->pcidev->irq, (irq_handler_t)bfad_intx,
+ BFAD_IRQ_FLAGS, BFAD_DRIVER_NAME, bfad);
+ if (error)
+ return error;
+
bfad->bfad_flags |= BFAD_INTX_ON;

- return error;
+ return 0;
}

void
--
1.7.7.6

2014-02-04 11:21:00

by Alexander Gordeev

[permalink] [raw]

Subject: [PATCH 07/22] fnic: Use pci_enable_msix_range()

2014-02-04 12:01:22

by Jack Wang

[permalink] [raw]

Subject: Re: [PATCH 16/22] pm8001: Fix invalid success return when request_irq() failed

On 02/04/2014 12:17 PM, Alexander Gordeev wrote:
> When enabling MSI-X if a call to request_irq() failed
> pm8001_setup_msix() still returns success. This udate
> fixes the described misbehaviour.
>
> Signed-off-by: Alexander Gordeev <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---
> drivers/scsi/pm8001/pm8001_init.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
> index 73a120d..efffbb9 100644
> --- a/drivers/scsi/pm8001/pm8001_init.c
> +++ b/drivers/scsi/pm8001/pm8001_init.c
> @@ -739,9 +739,10 @@ static u32 pm8001_setup_msix(struct pm8001_hba_info *pm8001_ha)
> pm8001_ha->irq_vector[i].irq_id = i;
> pm8001_ha->irq_vector[i].drv_inst = pm8001_ha;
>
> - if (request_irq(pm8001_ha->msix_entries[i].vector,
> + rc = request_irq(pm8001_ha->msix_entries[i].vector,
> pm8001_interrupt_handler_msix, flag,
> - intr_drvname[i], &(pm8001_ha->irq_vector[i]))) {
> + intr_drvname[i], &(pm8001_ha->irq_vector[i]));
> + if (rc) {
> for (j = 0; j < i; j++)
> free_irq(
> pm8001_ha->msix_entries[j].vector,
>
Thanks, looks fine.
Acked-by: Jack Wang <[email protected]>

2014-02-04 12:04:42

by Jack Wang

[permalink] [raw]

Subject: Re: [PATCH 17/22] pm8001: Use pci_enable_msix_range()

On 02/04/2014 12:17 PM, Alexander Gordeev wrote:
> As result of deprecation of MSI-X/MSI enablement functions
> pci_enable_msix() and pci_enable_msi_block() all drivers
> using these two interfaces need to be updated to use the
> new pci_enable_msi_range() and pci_enable_msix_range()
> interfaces.
>
> Signed-off-by: Alexander Gordeev <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---
> drivers/scsi/pm8001/pm8001_init.c | 47 +++++++++++++++++++------------------
> 1 files changed, 24 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
> index efffbb9..2d4b06e 100644
> --- a/drivers/scsi/pm8001/pm8001_init.c
> +++ b/drivers/scsi/pm8001/pm8001_init.c
> @@ -724,34 +724,35 @@ static u32 pm8001_setup_msix(struct pm8001_hba_info *pm8001_ha)
> sizeof(pm8001_ha->msix_entries[0]);
> for (i = 0; i < max_entry ; i++)
> pm8001_ha->msix_entries[i].entry = i;
> - rc = pci_enable_msix(pm8001_ha->pdev, pm8001_ha->msix_entries,
> - number_of_intr);
> + rc = pci_enable_msix_range(pm8001_ha->pdev, pm8001_ha->msix_entries,
> + number_of_intr, number_of_intr);
> pm8001_ha->number_of_intr = number_of_intr;
> - if (!rc) {
> - PM8001_INIT_DBG(pm8001_ha, pm8001_printk(
> - "pci_enable_msix request ret:%d no of intr %d\n",
> - rc, pm8001_ha->number_of_intr));
> -
> -
> - for (i = 0; i < number_of_intr; i++) {
> - snprintf(intr_drvname[i], sizeof(intr_drvname[0]),
> - DRV_NAME"%d", i);
> - pm8001_ha->irq_vector[i].irq_id = i;
> - pm8001_ha->irq_vector[i].drv_inst = pm8001_ha;
> -
> - rc = request_irq(pm8001_ha->msix_entries[i].vector,
> - pm8001_interrupt_handler_msix, flag,
> - intr_drvname[i], &(pm8001_ha->irq_vector[i]));
> - if (rc) {
> - for (j = 0; j < i; j++)
> - free_irq(
> - pm8001_ha->msix_entries[j].vector,
> + if (rc < 0)
> + return rc;
> +
> + PM8001_INIT_DBG(pm8001_ha, pm8001_printk(
> + "pci_enable_msix request ret:%d no of intr %d\n",
> + rc, pm8001_ha->number_of_intr));
> +
> + for (i = 0; i < number_of_intr; i++) {
> + snprintf(intr_drvname[i], sizeof(intr_drvname[0]),
> + DRV_NAME"%d", i);
> + pm8001_ha->irq_vector[i].irq_id = i;
> + pm8001_ha->irq_vector[i].drv_inst = pm8001_ha;
> +
> + rc = request_irq(pm8001_ha->msix_entries[i].vector,
> + pm8001_interrupt_handler_msix, flag,
> + intr_drvname[i], &(pm8001_ha->irq_vector[i]));
> + if (rc) {
> + for (j = 0; j < i; j++) {
> + free_irq(pm8001_ha->msix_entries[j].vector,
> &(pm8001_ha->irq_vector[i]));
> - pci_disable_msix(pm8001_ha->pdev);
> - break;
> }
> + pci_disable_msix(pm8001_ha->pdev);
> + break;
> }
> }
> +
> return rc;
> }
> #endif
>
Thanks, looks fine.
Acked-by: Jack Wang <[email protected]>

2014-02-04 21:47:10

by Arvind Kumar

[permalink] [raw]

Subject: Re: [PATCH 22/22] vmw_pvscsi: Use pci_enable_msix_range()

Looks fine to me.

Acked-by: Arvind Kumar <[email protected]>

Thanks!
Arvind

----- Original Message -----
From: "Alexander Gordeev" <[email protected]>
To: [email protected]
Cc: "Alexander Gordeev" <[email protected]>, "Arvind Kumar" <[email protected]>, [email protected], [email protected], [email protected]
Sent: Tuesday, February 4, 2014 3:17:08 AM
Subject: [PATCH 22/22] vmw_pvscsi: Use pci_enable_msix_range()

As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers
using these two interfaces need to be updated to use the
new pci_enable_msi_range() and pci_enable_msix_range()
interfaces.

Signed-off-by: Alexander Gordeev <[email protected]>
Cc: Arvind Kumar <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
drivers/scsi/vmw_pvscsi.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c
index b9755ec..c521f8e 100644
--- a/drivers/scsi/vmw_pvscsi.c
+++ b/drivers/scsi/vmw_pvscsi.c
@@ -1078,8 +1078,8 @@ static int pvscsi_setup_msix(const struct pvscsi_adapter *adapter,
struct msix_entry entry = { 0, PVSCSI_VECTOR_COMPLETION };
int ret;

- ret = pci_enable_msix(adapter->dev, &entry, 1);
- if (ret)
+ ret = pci_enable_msix_range(adapter->dev, &entry, 1, 1);
+ if (ret < 0)
return ret;

*irq = entry.vector;
--
1.7.7.6

2014-02-05 04:58:22

by Jayamohan Kallickal

[permalink] [raw]

Subject: RE: [PATCH 01/22] be2iscsi: Use pci_enable_msix_range()

-----Original Message-----
From: Alexander Gordeev [mailto:[email protected]]
Sent: Tuesday, February 04, 2014 3:17 AM
To: [email protected]
Cc: Alexander Gordeev; Jayamohan Kallickal; [email protected]; [email protected]
Subject: [PATCH 01/22] be2iscsi: Use pci_enable_msix_range()

As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers using these two interfaces need to be updated to use the new pci_enable_msi_range() and pci_enable_msix_range() interfaces.

Signed-off-by: Alexander Gordeev <[email protected]>
Cc: Jayamohan Kallickal <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/scsi/be2iscsi/be_main.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index 1f37505..5878f3e 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -5284,9 +5284,9 @@ static void beiscsi_msix_enable(struct beiscsi_hba *phba)
for (i = 0; i <= phba->num_cpus; i++)
phba->msix_entries[i].entry = i;

- status = pci_enable_msix(phba->pcidev, phba->msix_entries,
- (phba->num_cpus + 1));
- if (!status)
+ status = pci_enable_msix_range(phba->pcidev, phba->msix_entries,
+ phba->num_cpus + 1, phba->num_cpus + 1);
+ if (status > 0)
phba->msix_enabled = true;

return;

Looks OK to me

Acked-by: Jayamohan Kallickal <[email protected]>

--

2014-02-06 14:26:16

by Dorau, Lukasz

[permalink] [raw]

Subject: RE: [PATCH 10/22] isci: Use pci_enable_msix_range()

On Tuesday, February 04, 2014 12:17 PM Alexander Gordeev <[email protected]> wrote:
> As result of deprecation of MSI-X/MSI enablement functions
> pci_enable_msix() and pci_enable_msi_block() all drivers
> using these two interfaces need to be updated to use the
> new pci_enable_msi_range() and pci_enable_msix_range()
> interfaces.
>
> Signed-off-by: Alexander Gordeev <[email protected]>
> Cc: Lukasz Dorau <[email protected]>
> Cc: Maciej Patelczyk <[email protected]>
> Cc: Dave Jiang <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---
> drivers/scsi/isci/init.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
> index d25d0d8..b99f307 100644
> --- a/drivers/scsi/isci/init.c
> +++ b/drivers/scsi/isci/init.c
> @@ -356,8 +356,9 @@ static int isci_setup_interrupts(struct pci_dev *pdev)
> for (i = 0; i < num_msix; i++)
> pci_info->msix_entries[i].entry = i;
>
> - err = pci_enable_msix(pdev, pci_info->msix_entries, num_msix);
> - if (err)
> + err = pci_enable_msix_range(pdev,
> + pci_info->msix_entries, num_msix, num_msix);
> + if (err < 0)
> goto intx;
>
> for (i = 0; i < num_msix; i++) {
> --
> 1.7.7.6

Looks fine.

Acked-by: Lukasz Dorau <[email protected]>

Thanks,
Lukasz

2014-02-07 11:17:45

by Saxena, Sumit

[permalink] [raw]

Subject: RE: [PATCH 13/22] megaraid: Use pci_enable_msix_range()

>-----Original Message-----
>From: Alexander Gordeev [mailto:[email protected]]
>Sent: Tuesday, February 04, 2014 4:47 PM
>To: [email protected]
>Cc: Alexander Gordeev; DL-MegaRAID Linux; [email protected];
>[email protected]
>Subject: [PATCH 13/22] megaraid: Use pci_enable_msix_range()
>
>As result of deprecation of MSI-X/MSI enablement functions
>pci_enable_msix() and pci_enable_msi_block() all drivers using these two
>interfaces need to be updated to use the new pci_enable_msi_range() and
>pci_enable_msix_range() interfaces.
>
>Signed-off-by: Alexander Gordeev <[email protected]>
>Cc: Neela Syam Kolli <[email protected]>
>Cc: [email protected]
>Cc: [email protected]
>---
> drivers/scsi/megaraid/megaraid_sas_base.c | 25 +++++++++++--------------
> 1 files changed, 11 insertions(+), 14 deletions(-)
>
>diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c
>b/drivers/scsi/megaraid/megaraid_sas_base.c
>index 3b7ad10..90944f1 100644
>--- a/drivers/scsi/megaraid/megaraid_sas_base.c
>+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
>@@ -3731,18 +3731,12 @@ static int megasas_init_fw(struct
>megasas_instance *instance)
> (unsigned int)num_online_cpus());
> for (i = 0; i < instance->msix_vectors; i++)
> instance->msixentry[i].entry = i;
>- i = pci_enable_msix(instance->pdev, instance->msixentry,
>- instance->msix_vectors);
>- if (i >= 0) {
>- if (i) {
>- if (!pci_enable_msix(instance->pdev,
>- instance->msixentry, i))
>- instance->msix_vectors = i;
>- else
>- instance->msix_vectors = 0;
>- }
>- } else
>+ i = pci_enable_msix_range(instance->pdev, instance-
>>msixentry,
>+ 1, instance->msix_vectors);
>+ if (i < 0)
> instance->msix_vectors = 0;
>+ else
>+ instance->msix_vectors = i;
>
> dev_info(&instance->pdev->dev, "[scsi%d]: FW supports"
> "<%d> MSIX vector,Online CPUs: <%d>,"
>@@ -4667,9 +4661,11 @@ megasas_resume(struct pci_dev *pdev)
> goto fail_ready_state;
>
> /* Now re-enable MSI-X */
>- if (instance->msix_vectors)
>- pci_enable_msix(instance->pdev, instance->msixentry,
>- instance->msix_vectors);
>+ if (instance->msix_vectors &&
>+ pci_enable_msix_range(instance->pdev, instance->msixentry,
>+ instance->msix_vectors,
>+ instance->msix_vectors) < 0)
>+ goto fail_reenable_msix;
>
> switch (instance->pdev->device) {
> case PCI_DEVICE_ID_LSI_FUSION:
>@@ -4756,6 +4752,7 @@ fail_init_mfi:
>
> fail_set_dma_mask:
> fail_ready_state:
>+fail_reenable_msix:
>
> pci_disable_device(pdev);

Acked-by: Sumit Saxena <[email protected]>

Sumit
>
>--
>1.7.7.6
>

2014-02-11 05:10:35

by Suma Ramars (sramars)

[permalink] [raw]

Subject: Re: [PATCH 07/22] fnic: Use pci_enable_msix_range()

Hi Alexander

The changes look good to me. Thanks for taking care of this

-Suma

On 04/02/14 4:46 PM, "Alexander Gordeev" <[email protected]> wrote:

>As result of deprecation of MSI-X/MSI enablement functions
>pci_enable_msix() and pci_enable_msi_block() all drivers
>using these two interfaces need to be updated to use the
>new pci_enable_msi_range() and pci_enable_msix_range()
>interfaces.
>
>Signed-off-by: Alexander Gordeev <[email protected]>
>Cc: Hiral Patel <[email protected]>
>Cc: Suma Ramars <[email protected]>
>Cc: Brian Uchino <[email protected]>
>Cc: [email protected]
>Cc: [email protected]
>---
> drivers/scsi/fnic/fnic_isr.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/scsi/fnic/fnic_isr.c b/drivers/scsi/fnic/fnic_isr.c
>index 7d9b54a..0031c3e 100644
>--- a/drivers/scsi/fnic/fnic_isr.c
>+++ b/drivers/scsi/fnic/fnic_isr.c
>@@ -257,8 +257,8 @@ int fnic_set_intr_mode(struct fnic *fnic)
> fnic->raw_wq_count >= m &&
> fnic->wq_copy_count >= o &&
> fnic->cq_count >= n + m + o) {
>- if (!pci_enable_msix(fnic->pdev, fnic->msix_entry,
>- n + m + o + 1)) {
>+ if (pci_enable_msix_range(fnic->pdev, fnic->msix_entry,
>+ n + m + o + 1, n + m + o + 1) > 0) {
> fnic->rq_count = n;
> fnic->raw_wq_count = m;
> fnic->wq_copy_count = o;
>--
>1.7.7.6
>

2014-02-13 17:37:16

by Alexander Gordeev

[permalink] [raw]

Subject: Re: [PATCH 02/22] bfa: Do not call pci_enable_msix() once it failed

On Tue, Feb 04, 2014 at 12:16:48PM +0100, Alexander Gordeev wrote:
> Function pci_enable_msix() should not be called again in
> case it threw a negative errno.

Anil, Vijaya,

Any feedback on bfa patches?

Thanks!

--
Regards,
Alexander Gordeev
[email protected]

2014-02-13 17:44:44

by Alexander Gordeev

[permalink] [raw]

Subject: Re: [PATCH 11/22] lpfc: Remove superfluous call to pci_disable_msix()

On Tue, Feb 04, 2014 at 12:16:57PM +0100, Alexander Gordeev wrote:

Hi James,

Any feedback?

Thanks!

--
Regards,
Alexander Gordeev
[email protected]

2014-02-13 17:45:59

by Alexander Gordeev

[permalink] [raw]

Subject: Re: [PATCH 14/22] mpt2sas: Use pci_enable_msix_range()

On Tue, Feb 04, 2014 at 12:17:00PM +0100, Alexander Gordeev wrote:
> As result of deprecation of MSI-X/MSI enablement functions
> pci_enable_msix() and pci_enable_msi_block() all drivers
> using these two interfaces need to be updated to use the
> new pci_enable_msi_range() and pci_enable_msix_range()
> interfaces.

Nagalakshmi, Sreekanth,

Any feedback?

Thanks!

--
Regards,
Alexander Gordeev
[email protected]

2014-02-13 17:48:03

by Alexander Gordeev

[permalink] [raw]

Subject: Re: [PATCH 18/22] pmcraid: Get rid of a redundant assignment

On Tue, Feb 04, 2014 at 12:17:04PM +0100, Alexander Gordeev wrote:

Anil,

Any feedback?

Thanks!

--
Regards,
Alexander Gordeev
[email protected]

2014-02-13 17:52:22

by Alexander Gordeev

[permalink] [raw]

Subject: Re: [PATCH 21/22] qla4xxx: Use pci_enable_msix_range()

On Tue, Feb 04, 2014 at 12:17:07PM +0100, Alexander Gordeev wrote:
> As result of deprecation of MSI-X/MSI enablement functions
> pci_enable_msix() and pci_enable_msi_block() all drivers
> using these two interfaces need to be updated to use the
> new pci_enable_msi_range() and pci_enable_msix_range()
> interfaces.

Hi Vikas,

Any feedback on this?

Thanks!

--
Regards,
Alexander Gordeev
[email protected]

2014-02-13 17:53:16

by Alexander Gordeev

[permalink] [raw]

Subject: Re: [PATCH 19/22] pmcraid: Use pci_enable_msix_range()

On Tue, Feb 04, 2014 at 12:17:05PM +0100, Alexander Gordeev wrote:
> As result of deprecation of MSI-X/MSI enablement functions
> pci_enable_msix() and pci_enable_msi_block() all drivers
> using these two interfaces need to be updated to use the
> new pci_enable_msi_range() and pci_enable_msix_range()
> interfaces.

Hi Anil,

Any feedback?

Thanks!

--
Regards,
Alexander Gordeev
[email protected]

2014-02-18 08:37:13

by Vikas Chaudhary

[permalink] [raw]

Subject: Re: [PATCH 21/22] qla4xxx: Use pci_enable_msix_range()

On 04/02/14 3:17 AM, "Alexander Gordeev" <[email protected]> wrote:

>As result of deprecation of MSI-X/MSI enablement functions
>pci_enable_msix() and pci_enable_msi_block() all drivers
>using these two interfaces need to be updated to use the
>new pci_enable_msi_range() and pci_enable_msix_range()
>interfaces.
>
>Signed-off-by: Alexander Gordeev <[email protected]>
>Cc: Vikas Chaudhary <[email protected]>
>Cc: [email protected]
>Cc: [email protected]
>Cc: [email protected]
>---
> drivers/scsi/qla4xxx/ql4_nx.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c
>index d001202..7f5412d 100644
>--- a/drivers/scsi/qla4xxx/ql4_nx.c
>+++ b/drivers/scsi/qla4xxx/ql4_nx.c
>@@ -3805,8 +3805,9 @@ qla4_8xxx_enable_msix(struct scsi_qla_host *ha)
> for (i = 0; i < QLA_MSIX_ENTRIES; i++)
> entries[i].entry = qla4_8xxx_msix_entries[i].entry;
>
>- ret = pci_enable_msix(ha->pdev, entries, ARRAY_SIZE(entries));
>- if (ret) {
>+ ret = pci_enable_msix_range(ha->pdev, entries,
>+ ARRAY_SIZE(entries), ARRAY_SIZE(entries));
>+ if (ret < 0) {
> ql4_printk(KERN_WARNING, ha,
> "MSI-X: Failed to enable support -- %d/%d\n",
> QLA_MSIX_ENTRIES, ret);

Looks good to me.
Acked-by: Vikas Chaudhary <[email protected]>

2014-02-19 08:13:50

by Alexander Gordeev

[permalink] [raw]

Subject: Re: [PATCH 00/22] scsi: Use pci_enable_msix_range()

On Tue, Feb 04, 2014 at 12:16:46PM +0100, Alexander Gordeev wrote:
> As result of deprecation of MSI-X/MSI enablement functions
> pci_enable_msix() and pci_enable_msi_block() all drivers
> using these two interfaces need to be updated to use the
> new pci_enable_msi_range() and pci_enable_msix_range()
> interfaces.

Hi James,

What is the process to get these patches accepted to scsi.git tree?
Should I make some extra effort besides just posting the series this way?

Thanks!

--
Regards,
Alexander Gordeev
[email protected]

2014-02-20 15:16:41

by James Smart

[permalink] [raw]

Subject: Re: [PATCH 11/22] lpfc: Remove superfluous call to pci_disable_msix()

Hi Alexander,

The change is fine - but not really necessary. The pci_disable_msix()
call explicitly checks for enablement so it's safe.

It really is a superfluous change - but if James wants to take it:
Acked-by: James Smart <[email protected]>

-- james s

On 2/4/2014 6:16 AM, Alexander Gordeev wrote:
> Signed-off-by: Alexander Gordeev <[email protected]>
> Cc: James Smart <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> ---
> drivers/scsi/lpfc/lpfc_init.c | 9 ++++++---
> 1 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
> index 68c94cc..a9df97a 100644
> --- a/drivers/scsi/lpfc/lpfc_init.c
> +++ b/drivers/scsi/lpfc/lpfc_init.c
> @@ -8078,7 +8078,7 @@ lpfc_sli_enable_msix(struct lpfc_hba *phba)
> if (rc) {
> lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
> "0420 PCI enable MSI-X failed (%d)\n", rc);
> - goto msi_fail_out;
> + goto vec_fail_out;
> }
> for (i = 0; i < LPFC_MSIX_VECTORS; i++)
> lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
> @@ -8156,6 +8156,8 @@ irq_fail_out:
> msi_fail_out:
> /* Unconfigure MSI-X capability structure */
> pci_disable_msix(phba->pcidev);
> +
> +vec_fail_out:
> return rc;
> }
>
> @@ -8644,7 +8646,7 @@ enable_msix_vectors:
> } else if (rc) {
> lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
> "0484 PCI enable MSI-X failed (%d)\n", rc);
> - goto msi_fail_out;
> + goto vec_fail_out;
> }
>
> /* Log MSI-X vector assignment */
> @@ -8696,9 +8698,10 @@ cfg_fail_out:
> &phba->sli4_hba.fcp_eq_hdl[index]);
> }
>
> -msi_fail_out:
> /* Unconfigure MSI-X capability structure */
> pci_disable_msix(phba->pcidev);
> +
> +vec_fail_out:
> return rc;
> }
>

2014-02-20 16:47:10

by James Smart

[permalink] [raw]

Subject: Re: [PATCH 12/22] lpfc: Use pci_enable_msix_range()

Alexander,

I've reworked this patch to layer on top of our rev 8.3.45 patches
that were just posted to linux-scsi. There were some conflicts due to
new additions. Additionally, there were two other uses of pci_enable_msiXXX
that needed to be addressed. The changes in this patch also address the
change requested by:
"[PATCH 11/22] lpfc: Remove superfluous call to pci_disable_msix()"

To avoid creating merge conflicts - either by your patches going in then
scsi git tree trying to merge or by scsi git tree going in and your patches
trying to merge - I recommend that you eliminate your lpfc patches from the
kernel and apply the patch below once scsi git with the updated lpfc driver
has actually merged.

-- james s

Revised patch:

As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers
using these two interfaces need to be updated to use the
new pci_enable_msi_range() and pci_enable_msix_range()
interfaces.

CC: Alexander Gordeev <[email protected]>
Cc: [email protected]
Cc: [email protected]

Signed-off-by: James Smart <[email protected]>

---

lpfc_init.c | 43 ++++++++++++++++++++++---------------------
1 file changed, 22 insertions(+), 21 deletions(-)

diff -upNr a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
--- a/drivers/scsi/lpfc/lpfc_init.c 2014-02-19 16:23:07.260097013 -0500
+++ b/drivers/scsi/lpfc/lpfc_init.c 2014-02-20 11:39:20.348203354 -0500
@@ -8100,8 +8100,8 @@ lpfc_sli4_pci_mem_unset(struct lpfc_hba
* @phba: pointer to lpfc hba data structure.
*
* This routine is invoked to enable the MSI-X interrupt vectors to device
- * with SLI-3 interface specs. The kernel function pci_enable_msix() is
- * called to enable the MSI-X vectors. Note that pci_enable_msix(), once
+ * with SLI-3 interface specs. The kernel function pci_enable_msix_range() is
+ * called to enable the MSI-X vectors. Note that pci_enable_msix_range(), once
* invoked, enables either all or nothing, depending on the current
* availability of PCI vector resources. The device driver is responsible
* for calling the individual request_irq() to register each MSI-X vector
@@ -8126,12 +8126,12 @@ lpfc_sli_enable_msix(struct lpfc_hba *ph
phba->msix_entries[i].entry = i;

/* Configure MSI-X capability structure */
- rc = pci_enable_msix(phba->pcidev, phba->msix_entries,
- ARRAY_SIZE(phba->msix_entries));
- if (rc) {
+ rc = pci_enable_msix_range(phba->pcidev, phba->msix_entries,
+ LPFC_MSIX_VECTORS, LPFC_MSIX_VECTORS);
+ if (rc < 0) {
lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
"0420 PCI enable MSI-X failed (%d)\n", rc);
- goto msi_fail_out;
+ goto vec_fail_out;
}
for (i = 0; i < LPFC_MSIX_VECTORS; i++)
lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
@@ -8209,6 +8209,8 @@ irq_fail_out:
msi_fail_out:
/* Unconfigure MSI-X capability structure */
pci_disable_msix(phba->pcidev);
+
+vec_fail_out:
return rc;
}

@@ -8238,8 +8240,8 @@ lpfc_sli_disable_msix(struct lpfc_hba *p
* @phba: pointer to lpfc hba data structure.
*
* This routine is invoked to enable the MSI interrupt mode to device with
- * SLI-3 interface spec. The kernel function pci_enable_msi() is called to
- * enable the MSI vector. The device driver is responsible for calling the
+ * SLI-3 interface spec. The kernel function pci_enable_msi_range() is called
+ * to enable the MSI vector. The device driver is responsible for calling the
* request_irq() to register MSI vector with a interrupt the handler, which
* is done in this function.
*
@@ -8252,8 +8254,8 @@ lpfc_sli_enable_msi(struct lpfc_hba *phb
{
int rc;

- rc = pci_enable_msi(phba->pcidev);
- if (!rc)
+ rc = pci_enable_msi_range(phba->pcidev, 1, 1);
+ if (rc > 0)
lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
"0462 PCI enable MSI mode success.\n");
else {
@@ -8692,17 +8694,15 @@ lpfc_sli4_enable_msix(struct lpfc_hba *p
phba->sli4_hba.msix_entries[index].entry = index;
vectors++;
}
-enable_msix_vectors:
- rc = pci_enable_msix(phba->pcidev, phba->sli4_hba.msix_entries,
- vectors);
- if (rc > 1) {
- vectors = rc;
- goto enable_msix_vectors;
- } else if (rc) {
+
+ rc = pci_enable_msix_range(phba->pcidev, phba->sli4_hba.msix_entries,
+ 2, vectors);
+ if (rc < 0) {
lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
"0484 PCI enable MSI-X failed (%d)\n", rc);
goto msi_fail_out;
}
+ vectors = rc;

/* Log MSI-X vector assignment */
for (index = 0; index < vectors; index++)
@@ -8764,9 +8764,10 @@ cfg_fail_out:
&phba->sli4_hba.fcp_eq_hdl[index]);
}

-msi_fail_out:
/* Unconfigure MSI-X capability structure */
pci_disable_msix(phba->pcidev);
+
+msi_fail_out:
return rc;
}

@@ -8804,7 +8805,7 @@ lpfc_sli4_disable_msix(struct lpfc_hba *
* @phba: pointer to lpfc hba data structure.
*
* This routine is invoked to enable the MSI interrupt mode to device with
- * SLI-4 interface spec. The kernel function pci_enable_msi() is called
+ * SLI-4 interface spec. The kernel function pci_enable_msi_range() is called
* to enable the MSI vector. The device driver is responsible for calling
* the request_irq() to register MSI vector with a interrupt the handler,
* which is done in this function.
@@ -8818,8 +8819,8 @@ lpfc_sli4_enable_msi(struct lpfc_hba *ph
{
int rc, index;

- rc = pci_enable_msi(phba->pcidev);
- if (!rc)
+ rc = pci_enable_msi_range(phba->pcidev, 1, 1);
+ if (rc > 0)
lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
"0487 PCI enable MSI mode success.\n");
else {

2014-02-23 19:43:57

by Alexander Gordeev

[permalink] [raw]

Subject: Re: [PATCH 12/22] lpfc: Use pci_enable_msix_range()

On Thu, Feb 20, 2014 at 11:47:02AM -0500, James Smart wrote:
> Alexander,
>
> I've reworked this patch to layer on top of our rev 8.3.45 patches
> that were just posted to linux-scsi. There were some conflicts due to
> new additions. Additionally, there were two other uses of pci_enable_msiXXX
> that needed to be addressed. The changes in this patch also address the
> change requested by:
> "[PATCH 11/22] lpfc: Remove superfluous call to pci_disable_msix()"
>
> To avoid creating merge conflicts - either by your patches going in then
> scsi git tree trying to merge or by scsi git tree going in and your patches
> trying to merge - I recommend that you eliminate your lpfc patches from the
> kernel and apply the patch below once scsi git with the updated lpfc driver
> has actually merged.

Hi James,

Thank you for the review and for the updated patch - it is embarrassing
I have not addressed all pci_enable_msix()'s.

I will keep the two patches separate to ease bisecting -
I am going to repost the patches on top of scsi tree.

Cheers!

--
Regards,
Alexander Gordeev
[email protected]

2014-02-25 09:52:10

by Saurav Kashyap

[permalink] [raw]

Subject: Re: [PATCH 20/22] qla2xxx: Use pci_enable_msix_range()

Looks good to me.

Acked-by: Saurav Kashyap <[email protected]>

>As result of deprecation of MSI-X/MSI enablement functions
>pci_enable_msix() and pci_enable_msi_block() all drivers
>using these two interfaces need to be updated to use the
>new pci_enable_msi_range() and pci_enable_msix_range()
>interfaces.
>
>Log message code 0x00c6 preserved, although it is reported
>after successful call to pci_enable_msix_range(), not before
>possibly unsuccessful call to pci_enable_msix(). Consumers
>of the error code should not notice the difference.
>
>Signed-off-by: Alexander Gordeev <[email protected]>
>Cc: [email protected]
>Cc: [email protected]
>Cc: [email protected]
>---
> drivers/scsi/qla2xxx/qla_isr.c | 27 +++++++++++----------------
> 1 files changed, 11 insertions(+), 16 deletions(-)
>
>diff --git a/drivers/scsi/qla2xxx/qla_isr.c
>b/drivers/scsi/qla2xxx/qla_isr.c
>index 9bc86b9..b2dcfa4 100644
>--- a/drivers/scsi/qla2xxx/qla_isr.c
>+++ b/drivers/scsi/qla2xxx/qla_isr.c
>@@ -2896,27 +2896,22 @@ qla24xx_enable_msix(struct qla_hw_data *ha,
>struct rsp_que *rsp)
> for (i = 0; i < ha->msix_count; i++)
> entries[i].entry = i;
>
>- ret = pci_enable_msix(ha->pdev, entries, ha->msix_count);
>- if (ret) {
>- if (ret < MIN_MSIX_COUNT)
>- goto msix_failed;
>-
>+ ret = pci_enable_msix_range(ha->pdev,
>+ entries, MIN_MSIX_COUNT, ha->msix_count);
>+ if (ret < 0) {
>+ ql_log(ql_log_fatal, vha, 0x00c7,
>+ "MSI-X: Failed to enable support, "
>+ "giving up -- %d/%d.\n",
>+ ha->msix_count, ret);
>+ goto msix_out;
>+ } else if (ret < ha->msix_count) {
> ql_log(ql_log_warn, vha, 0x00c6,
> "MSI-X: Failed to enable support "
> "-- %d/%d\n Retry with %d vectors.\n",
> ha->msix_count, ret, ret);
>- ha->msix_count = ret;
>- ret = pci_enable_msix(ha->pdev, entries, ha->msix_count);
>- if (ret) {
>-msix_failed:
>- ql_log(ql_log_fatal, vha, 0x00c7,
>- "MSI-X: Failed to enable support, "
>- "giving up -- %d/%d.\n",
>- ha->msix_count, ret);
>- goto msix_out;
>- }
>- ha->max_rsp_queues = ha->msix_count - 1;
> }
>+ ha->msix_count = ret;
>+ ha->max_rsp_queues = ha->msix_count - 1;
> ha->msix_entries = kzalloc(sizeof(struct qla_msix_entry) *
> ha->msix_count, GFP_KERNEL);
> if (!ha->msix_entries) {
>--
>1.7.7.6
>