| Message ID | 36da37b8ca3a13e24a3363ed19d6a08061c85970.1391512266.git.agordeev@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
Looks good to me. Acked-by: Saurav Kashyap <saurav.kashyap@qlogic.com> >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 <agordeev@redhat.com> >Cc: qla2xxx-upstream@qlogic.com >Cc: linux-scsi@vger.kernel.org >Cc: linux-pci@vger.kernel.org >--- > 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 >
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) {
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 <agordeev@redhat.com> Cc: qla2xxx-upstream@qlogic.com Cc: linux-scsi@vger.kernel.org Cc: linux-pci@vger.kernel.org --- drivers/scsi/qla2xxx/qla_isr.c | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-)