Acked-by: Saurav Kashyap <[email protected]>
>As result of recent re-design of the MSI/MSI-X interrupts enabling >pattern this driver has to be updated to use the new technique to >obtain a optimal number of MSI/MSI-X interrupts required. > >Signed-off-by: Alexander Gordeev <[email protected]> >--- > drivers/scsi/qla2xxx/qla_isr.c | 18 +++++++++++------- > 1 files changed, 11 insertions(+), 7 deletions(-) > >diff --git a/drivers/scsi/qla2xxx/qla_isr.c >b/drivers/scsi/qla2xxx/qla_isr.c >index df1b30b..6c11ab9 100644 >--- a/drivers/scsi/qla2xxx/qla_isr.c >+++ b/drivers/scsi/qla2xxx/qla_isr.c >@@ -2836,16 +2836,20 @@ 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) { >+ ret = pci_msix_table_size(ha->pdev); >+ if (ret < 0) { >+ goto msix_failed; >+ } else { > if (ret < MIN_MSIX_COUNT) > goto msix_failed; > >- 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; >+ 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: >-- >1.7.7.6 > >-- >To unsubscribe from this list: send the line "unsubscribe linux-scsi" in >the body of a message to [email protected] >More majordomo info at http://vger.kernel.org/majordomo-info.html ------------------------------------------------------------------------------ October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk _______________________________________________ E1000-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/e1000-devel To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
