Commit 4343838c authored by Michael Chan's avatar Michael Chan Committed by Jakub Kicinski
Browse files

bnxt_en: Replace deprecated PCI MSIX APIs 



Use the new pci_alloc_irq_vectors() and pci_free_irq_vectors() to
replace the deprecated pci_enable_msix_range() and pci_disable_msix().

Reviewed-by: default avatarSomnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: default avatarPavan Chebbi <pavan.chebbi@broadcom.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Link: https://patch.msgid.link/20240828183235.128948-8-michael.chan@broadcom.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent af756aad

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+5 −16
Original line number Diff line number Diff line
@@ -10723,7 +10723,6 @@ 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;

	struct msix_entry *msix_ent;



	total_vecs = bnxt_get_num_msix(bp);

	max = bnxt_get_max_func_irqs(bp);
@@ -10733,19 +10732,11 @@ static int bnxt_init_int_mode(struct bnxt *bp) 
	if (!total_vecs)

		return 0;



	msix_ent = kcalloc(total_vecs, sizeof(struct msix_entry), GFP_KERNEL);

	if (!msix_ent)

		return -ENOMEM;



	for (i = 0; i < total_vecs; i++) {

		msix_ent[i].entry = i;

		msix_ent[i].vector = 0;

	}



	if (!(bp->flags & BNXT_FLAG_SHARED_RINGS))

		min = 2;



	total_vecs = pci_enable_msix_range(bp->pdev, msix_ent, min, total_vecs);

	total_vecs = pci_alloc_irq_vectors(bp->pdev, min, total_vecs,

					   PCI_IRQ_MSIX);

	ulp_msix = bnxt_get_ulp_msix_num(bp);

	if (total_vecs < 0 || total_vecs < ulp_msix) {

		rc = -ENODEV;
@@ -10755,7 +10746,7 @@ static int bnxt_init_int_mode(struct bnxt *bp) 
	bp->irq_tbl = kcalloc(total_vecs, sizeof(struct bnxt_irq), GFP_KERNEL);

	if (bp->irq_tbl) {

		for (i = 0; i < total_vecs; i++)

			bp->irq_tbl[i].vector = msix_ent[i].vector;

			bp->irq_tbl[i].vector = pci_irq_vector(bp->pdev, i);



		bp->total_irqs = total_vecs;

		/* Trim rings based upon num of vectors allocated */
@@ -10773,21 +10764,19 @@ static int bnxt_init_int_mode(struct bnxt *bp) 
		rc = -ENOMEM;

		goto msix_setup_exit;

	}

	kfree(msix_ent);

	return 0;



msix_setup_exit:

	netdev_err(bp->dev, "bnxt_init_int_mode err: %x\n", rc);

	kfree(bp->irq_tbl);

	bp->irq_tbl = NULL;

	pci_disable_msix(bp->pdev);

	kfree(msix_ent);

	pci_free_irq_vectors(bp->pdev);

	return rc;

}



static void bnxt_clear_int_mode(struct bnxt *bp)

{

	pci_disable_msix(bp->pdev);

	pci_free_irq_vectors(bp->pdev);



	kfree(bp->irq_tbl);

	bp->irq_tbl = NULL;