|
@@ -116,7 +116,6 @@ static int mlx5_enable_msix(struct mlx5_core_dev *dev)
|
|
|
struct mlx5_eq_table *table = &dev->priv.eq_table;
|
|
struct mlx5_eq_table *table = &dev->priv.eq_table;
|
|
|
int num_eqs = 1 << dev->caps.log_max_eq;
|
|
int num_eqs = 1 << dev->caps.log_max_eq;
|
|
|
int nvec;
|
|
int nvec;
|
|
|
- int err;
|
|
|
|
|
int i;
|
|
int i;
|
|
|
|
|
|
|
|
nvec = dev->caps.num_ports * num_online_cpus() + MLX5_EQ_VEC_COMP_BASE;
|
|
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++)
|
|
for (i = 0; i < nvec; i++)
|
|
|
table->msix_arr[i].entry = 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;
|
|
return 0;
|
|
|
}
|
|
}
|