| Message ID | 20240816212832.185379-9-michael.chan@broadcom.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | bnxt_en: Update for net-next | expand |
On 8/16/24 23:28, Michael Chan wrote: > If dynamic MSIX allocation is supported, additional MSIX can be > allocated at run-time without reinitializing the existing MSIX entries. > The first step to support this dynamic scheme is to allocate a large > enough bp->irq_tbl if dynamic allocation is supported. > > Reviewed-by: Hongguang Gao <hongguang.gao@broadcom.com> > Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com> > Reviewed-by: Simon Horman <horms@kernel.org> > Signed-off-by: Michael Chan <michael.chan@broadcom.com> > --- > v2: Fix typo in changelog > --- > drivers/net/ethernet/broadcom/bnxt/bnxt.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c > index 5d0d40d78c37..b969ace6b4d1 100644 > --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c > +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c > @@ -10724,7 +10724,7 @@ static int bnxt_get_num_msix(struct bnxt *bp) > > static int bnxt_init_int_mode(struct bnxt *bp) > { > - int i, total_vecs, max, rc = 0, min = 1, ulp_msix, tx_cp; > + int i, total_vecs, max, rc = 0, min = 1, ulp_msix, tx_cp, tbl_size; > > total_vecs = bnxt_get_num_msix(bp); > max = bnxt_get_max_func_irqs(bp); > @@ -10745,7 +10745,10 @@ static int bnxt_init_int_mode(struct bnxt *bp) > goto msix_setup_exit; > } > > - bp->irq_tbl = kcalloc(total_vecs, sizeof(struct bnxt_irq), GFP_KERNEL); > + tbl_size = total_vecs; > + if (pci_msix_can_alloc_dyn(bp->pdev)) > + tbl_size = max; > + bp->irq_tbl = kcalloc(tbl_size, sizeof(struct bnxt_irq), GFP_KERNEL); sizeof(*bp->irq_tbl) but otherwise this is fine, so: Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> > if (bp->irq_tbl) { > for (i = 0; i < total_vecs; i++) > bp->irq_tbl[i].vector = pci_irq_vector(bp->pdev, i);
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 5d0d40d78c37..b969ace6b4d1 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -10724,7 +10724,7 @@ static int bnxt_get_num_msix(struct bnxt *bp) static int bnxt_init_int_mode(struct bnxt *bp) { - int i, total_vecs, max, rc = 0, min = 1, ulp_msix, tx_cp; + int i, total_vecs, max, rc = 0, min = 1, ulp_msix, tx_cp, tbl_size; total_vecs = bnxt_get_num_msix(bp); max = bnxt_get_max_func_irqs(bp); @@ -10745,7 +10745,10 @@ static int bnxt_init_int_mode(struct bnxt *bp) goto msix_setup_exit; } - bp->irq_tbl = kcalloc(total_vecs, sizeof(struct bnxt_irq), GFP_KERNEL); + tbl_size = total_vecs; + if (pci_msix_can_alloc_dyn(bp->pdev)) + tbl_size = max; + bp->irq_tbl = kcalloc(tbl_size, sizeof(struct bnxt_irq), GFP_KERNEL); if (bp->irq_tbl) { for (i = 0; i < total_vecs; i++) bp->irq_tbl[i].vector = pci_irq_vector(bp->pdev, i);