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

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

mlx5: 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: Eli Cohen <eli@mellanox.com>
Cc: linux-rdma@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 66e2f9c1

drivers/net/ethernet/mellanox/mlx5/core/main.c

+5 −11
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ static int mlx5_enable_msix(struct mlx5_core_dev *dev) 
	struct mlx5_eq_table *table = &dev->priv.eq_table;

	int num_eqs = 1 << dev->caps.log_max_eq;

	int nvec;

	int err;

	int i;



	nvec = dev->caps.num_ports * num_online_cpus() + MLX5_EQ_VEC_COMP_BASE;
@@ -131,17 +130,12 @@ static int mlx5_enable_msix(struct mlx5_core_dev *dev) 
	for (i = 0; i < nvec; i++)

		table->msix_arr[i].entry = i;



retry:

	table->num_comp_vectors = nvec - MLX5_EQ_VEC_COMP_BASE;

	err = pci_enable_msix(dev->pdev, table->msix_arr, nvec);

	if (err <= 0) {

		return err;

	} else if (err > 2) {

		nvec = err;

		goto retry;

	}

	nvec = pci_enable_msix_range(dev->pdev, table->msix_arr,

				     MLX5_EQ_VEC_COMP_BASE, nvec);

	if (nvec < 0)

		return nvec;



	mlx5_core_dbg(dev, "received %d MSI vectors out of %d requested\n", err, nvec);

	table->num_comp_vectors = nvec - MLX5_EQ_VEC_COMP_BASE;



	return 0;

}