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/ipr.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 762a93e..86ed0a2 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c @@ -9247,45 +9247,45 @@ static int ipr_enable_msix(struct ipr_ioa_cfg *ioa_cfg) struct msix_entry entries[IPR_MAX_MSIX_VECTORS]; int i, err, vectors; - for (i = 0; i < ARRAY_SIZE(entries); ++i) - entries[i].entry = i; + err = pci_msix_table_size(ioa_cfg->pdev); + if (err < 0) + return err; - vectors = ipr_number_of_msix; + vectors = min_t(int, err, ipr_number_of_msix); - while ((err = pci_enable_msix(ioa_cfg->pdev, entries, vectors)) > 0) - vectors = err; + BUG_ON(vectors > ARRAY_SIZE(entries)); + for (i = 0; i < vectors; ++i) + entries[i].entry = i; - if (err < 0) + err = pci_enable_msix(ioa_cfg->pdev, entries, vectors); + if (err) return err; - if (!err) { - for (i = 0; i < vectors; i++) - ioa_cfg->vectors_info[i].vec = entries[i].vector; - ioa_cfg->nvectors = vectors; - } + for (i = 0; i < vectors; i++) + ioa_cfg->vectors_info[i].vec = entries[i].vector; + ioa_cfg->nvectors = vectors; - return err; + return 0; } static int ipr_enable_msi(struct ipr_ioa_cfg *ioa_cfg) { int i, err, vectors; - vectors = ipr_number_of_msix; - - while ((err = pci_enable_msi_block(ioa_cfg->pdev, vectors)) > 0) - vectors = err; - + err = pci_get_msi_cap(ioa_cfg->pdev); if (err < 0) return err; - if (!err) { - for (i = 0; i < vectors; i++) - ioa_cfg->vectors_info[i].vec = ioa_cfg->pdev->irq + i; - ioa_cfg->nvectors = vectors; - } + vectors = min_t(int, err, ipr_number_of_msix); + err = pci_enable_msi_block(ioa_cfg->pdev, vectors); + if (err) + return err; + + for (i = 0; i < vectors; i++) + ioa_cfg->vectors_info[i].vec = ioa_cfg->pdev->irq + i; + ioa_cfg->nvectors = vectors; - return err; + return 0; } static void name_msi_vectors(struct ipr_ioa_cfg *ioa_cfg) -- 1.7.7.6 ------------------------------------------------------------------------------ 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
