[PATCH net-next v4 4/8] bnxt_en: Refactor IRQs required logic
flat view
WARM2d
REVIEWED: 2 (0M)
From: Michael Chan <michael.chan@broadcom.com>
Date: 2026-10-16 06:45:17
Subsystem:
broadcom bnxt_en 50 gigabit ethernet driver, networking drivers, the rest · Maintainers:
Michael Chan, Pavan Chebbi, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Revision v4 of 2 in this series; 2 review trailers.
Revisions (2)
- v3 [diff vs current]
- v4 current
Refactor the logic to determine the required IRQ vectors into a new helper. Later patches in the series will make additional use of the helper. There is no change in behavior. Reviewed-by: Andy Gospodarek <redacted> Reviewed-by: Joe Damato <redacted> Signed-off-by: Michael Chan <michael.chan@broadcom.com> --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 25 ++++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 0556a9b60791..4cc6ffeb56f6 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c@@ -11712,9 +11712,22 @@ static void bnxt_clear_int_mode(struct bnxt *bp) bp->irq_tbl_size = 0; } -int bnxt_reserve_rings(struct bnxt *bp, bool irq_re_init) +static int bnxt_irqs_required(struct bnxt *bp) { struct bnxt_en_dev *edev = bp->edev[BNXT_AUXDEV_RDMA]; + + if (BNXT_NEW_RM(bp) && !bnxt_ulp_registered(edev)) { + int ulp_msix = bnxt_get_avail_msix(bp, bp->ulp_num_msix_want); + + if (ulp_msix > bp->ulp_num_msix_want) + ulp_msix = bp->ulp_num_msix_want; + return ulp_msix + bp->cp_nr_rings; + } + return bnxt_get_num_msix(bp); +} + +int bnxt_reserve_rings(struct bnxt *bp, bool irq_re_init) +{ bool irq_cleared = false; bool irq_change = false; int tcs = bp->num_tc;
@@ -11724,15 +11737,7 @@ int bnxt_reserve_rings(struct bnxt *bp, bool irq_re_init) if (!bnxt_need_reserve_rings(bp)) return 0; - if (BNXT_NEW_RM(bp) && !bnxt_ulp_registered(edev)) { - int ulp_msix = bnxt_get_avail_msix(bp, bp->ulp_num_msix_want); - - if (ulp_msix > bp->ulp_num_msix_want) - ulp_msix = bp->ulp_num_msix_want; - irqs_required = ulp_msix + bp->cp_nr_rings; - } else { - irqs_required = bnxt_get_num_msix(bp); - } + irqs_required = bnxt_irqs_required(bp); if (irq_re_init && BNXT_NEW_RM(bp) && irqs_required != bp->total_irqs) { irq_change = true;
--
2.51.0