|
@@ -2669,14 +2669,11 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
|
|
|
|
|
|
|
|
if (msi_x) {
|
|
if (msi_x) {
|
|
|
int nreq = dev->caps.num_ports * num_online_cpus() + 1;
|
|
int nreq = dev->caps.num_ports * num_online_cpus() + 1;
|
|
|
- bool shared_ports = false;
|
|
|
|
|
|
|
|
|
|
nreq = min_t(int, dev->caps.num_eqs - dev->caps.reserved_eqs,
|
|
nreq = min_t(int, dev->caps.num_eqs - dev->caps.reserved_eqs,
|
|
|
nreq);
|
|
nreq);
|
|
|
- if (nreq > MAX_MSIX) {
|
|
|
|
|
|
|
+ if (nreq > MAX_MSIX)
|
|
|
nreq = MAX_MSIX;
|
|
nreq = MAX_MSIX;
|
|
|
- shared_ports = true;
|
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL);
|
|
entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL);
|
|
|
if (!entries)
|
|
if (!entries)
|
|
@@ -2699,9 +2696,6 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
|
|
|
bitmap_zero(priv->eq_table.eq[MLX4_EQ_ASYNC].actv_ports.ports,
|
|
bitmap_zero(priv->eq_table.eq[MLX4_EQ_ASYNC].actv_ports.ports,
|
|
|
dev->caps.num_ports);
|
|
dev->caps.num_ports);
|
|
|
|
|
|
|
|
- if (MLX4_IS_LEGACY_EQ_MODE(dev->caps))
|
|
|
|
|
- shared_ports = true;
|
|
|
|
|
-
|
|
|
|
|
for (i = 0; i < dev->caps.num_comp_vectors + 1; i++) {
|
|
for (i = 0; i < dev->caps.num_comp_vectors + 1; i++) {
|
|
|
if (i == MLX4_EQ_ASYNC)
|
|
if (i == MLX4_EQ_ASYNC)
|
|
|
continue;
|
|
continue;
|
|
@@ -2709,7 +2703,7 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
|
|
|
priv->eq_table.eq[i].irq =
|
|
priv->eq_table.eq[i].irq =
|
|
|
entries[i + 1 - !!(i > MLX4_EQ_ASYNC)].vector;
|
|
entries[i + 1 - !!(i > MLX4_EQ_ASYNC)].vector;
|
|
|
|
|
|
|
|
- if (shared_ports) {
|
|
|
|
|
|
|
+ if (MLX4_IS_LEGACY_EQ_MODE(dev->caps)) {
|
|
|
bitmap_fill(priv->eq_table.eq[i].actv_ports.ports,
|
|
bitmap_fill(priv->eq_table.eq[i].actv_ports.ports,
|
|
|
dev->caps.num_ports);
|
|
dev->caps.num_ports);
|
|
|
/* We don't set affinity hint when there
|
|
/* We don't set affinity hint when there
|