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

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

mlx4: 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: "David S. Miller" <davem@davemloft.net>
Cc: Amir Vadai <amirv@mellanox.com>
Cc: netdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Acked-by: default avatarAmir Vadai <amirv@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5c1e3588

drivers/net/ethernet/mellanox/mlx4/main.c

+5 −16
Original line number Diff line number Diff line
@@ -1976,7 +1976,6 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev) 
	int nreq = min_t(int, dev->caps.num_ports *

			 min_t(int, netif_get_num_default_rss_queues() + 1,

			       MAX_MSIX_P_PORT) + MSIX_LEGACY_SZ, MAX_MSIX);

	int err;

	int i;



	if (msi_x) {
@@ -1990,23 +1989,13 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev) 
		for (i = 0; i < nreq; ++i)

			entries[i].entry = i;



	retry:

		err = pci_enable_msix(dev->pdev, entries, nreq);

		if (err) {

			/* Try again if at least 2 vectors are available */

			if (err > 1) {

				mlx4_info(dev, "Requested %d vectors, "

					  "but only %d MSI-X vectors available, "

					  "trying again\n", nreq, err);

				nreq = err;

				goto retry;

			}

		nreq = pci_enable_msix_range(dev->pdev, entries, 2, nreq);



		if (nreq < 0) {

			kfree(entries);

			goto no_msi;

		}



		if (nreq <

		    MSIX_LEGACY_SZ + dev->caps.num_ports * MIN_MSIX_P_PORT) {

		} else if (nreq < MSIX_LEGACY_SZ +

				  dev->caps.num_ports * MIN_MSIX_P_PORT) {

			/*Working in legacy mode , all EQ's shared*/

			dev->caps.comp_pool           = 0;

			dev->caps.num_comp_vectors = nreq - 1;