[PATCH RFC 15/77] bnx2: Update MSI/MSI-X interrupts enablement code
From: Alexander Gordeev <hidden>
Date: 2013-10-02 16:42:51
Also in:
linux-ide, linux-mips, linux-pci, linux-rdma, linux-s390, linux-scsi, lkml, netdev
Subsystem:
broadcom bnx2 gigabit ethernet driver, networking drivers, the rest · Maintainers:
Rasesh Mody, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
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 <redacted> --- drivers/net/ethernet/broadcom/bnx2.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index e838a3f..c902627 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c@@ -6202,25 +6202,26 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs) * is setup properly */ BNX2_RD(bp, BNX2_PCI_MSIX_CONTROL); - for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) { - msix_ent[i].entry = i; - msix_ent[i].vector = 0; - } - total_vecs = msix_vecs; #ifdef BCM_CNIC total_vecs++; #endif - rc = -ENOSPC; - while (total_vecs >= BNX2_MIN_MSIX_VEC) { - rc = pci_enable_msix(bp->pdev, msix_ent, total_vecs); - if (rc <= 0) - break; - if (rc > 0) - total_vecs = rc; + rc = pci_msix_table_size(bp->pdev); + if (rc < 0) + return; + + total_vecs = min(total_vecs, rc); + if (total_vecs < BNX2_MIN_MSIX_VEC) + return; + + BUG_ON(total_vecs > ARRAY_SIZE(msix_ent)); + for (i = 0; i < total_vecs; i++) { + msix_ent[i].entry = i; + msix_ent[i].vector = 0; } - if (rc != 0) + rc = pci_enable_msix(bp->pdev, msix_ent, total_vecs); + if (rc) return; msix_vecs = total_vecs;
--
1.7.7.6