Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c32ad224 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by David S. Miller
Browse files

cxgb4: Use pci_enable_msix_range() instead of pci_enable_msix() 



As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers
using these two interfaces need to be updated to use the
new pci_enable_msi_range() and pci_enable_msix_range()
interfaces.

Signed-off-by: default avatarAlexander Gordeev <agordeev@redhat.com>
Cc: Dimitris Michailidis <dm@chelsio.com>
Cc: netdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fc1d0bf1

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+24 −26
Original line number Diff line number Diff line
@@ -5737,7 +5737,7 @@ static void reduce_ethqs(struct adapter *adap, int n) 
static int enable_msix(struct adapter *adap)

{

	int ofld_need = 0;

	int i, err, want, need;

	int i, want, need;

	struct sge *s = &adap->sge;

	unsigned int nchan = adap->params.nports;

	struct msix_entry entries[MAX_INGQ + 1];
@@ -5753,10 +5753,10 @@ static int enable_msix(struct adapter *adap) 
	}

	need = adap->params.nports + EXTRA_VECS + ofld_need;



	while ((err = pci_enable_msix(adap->pdev, entries, want)) >= need)

		want = err;

	want = pci_enable_msix_range(adap->pdev, entries, need, want);

	if (want < 0)

		return want;



	if (!err) {

	/*

	 * Distribute available vectors to the various queue groups.

	 * Every group gets its minimum requirement and NIC gets top
@@ -5775,10 +5775,8 @@ static int enable_msix(struct adapter *adap) 
	}

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

		adap->msix_info[i].vec = entries[i].vector;

	} else if (err > 0)

		dev_info(adap->pdev_dev,

			 "only %d MSI-X vectors left, not using MSI-X\n", err);

	return err;



	return 0;

}



#undef EXTRA_VECS