diff options
| author |   Shay Drory <shayd@nvidia.com> | 2021-11-23 09:14:58 +0200 |
|---|---|---|
| committer |   Saeed Mahameed <saeedm@nvidia.com> | 2022-01-06 16:22:51 -0800 |
| commit | 30c6afa735db60b4fb6ca81da568d11d19aa2c15 (patch) | |
| tree | c9544eba0041e94f551f834dea4cad9a2edf44d0 /drivers/net/ethernet/mellanox | |
| parent | net/mlx5: Introduce control IRQ request API (diff) | |
| download | linux-dev-30c6afa735db60b4fb6ca81da568d11d19aa2c15.tar.xz linux-dev-30c6afa735db60b4fb6ca81da568d11d19aa2c15.zip | |
net/mlx5: Move affinity assignment into irq_request
Move affinity binding of the IRQ to irq_request function in order to
bind the IRQ before inserting it to the xarray.
After this change, the IRQ is ready for use when inserted to the xarray.
Signed-off-by: Shay Drory <shayd@nvidia.com>
Reviewed-by: Moshe Shemesh <moshe@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Diffstat (limited to 'drivers/net/ethernet/mellanox')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c index 510a9b91ff9a..656a55114600 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c @@ -215,7 +215,8 @@ static bool irq_pool_is_sf_pool(struct mlx5_irq_pool *pool) return !strncmp("mlx5_sf", pool->name, strlen("mlx5_sf")); } -static struct mlx5_irq *irq_request(struct mlx5_irq_pool *pool, int i) +static struct mlx5_irq *irq_request(struct mlx5_irq_pool *pool, int i, + struct cpumask *affinity) { struct mlx5_core_dev *dev = pool->dev; char name[MLX5_MAX_IRQ_NAME]; @@ -244,6 +245,10 @@ static struct mlx5_irq *irq_request(struct mlx5_irq_pool *pool, int i) err = -ENOMEM; goto err_cpumask; } + if (affinity) { + cpumask_copy(irq->mask, affinity); + irq_set_affinity_hint(irq->irqn, irq->mask); + } irq->pool = pool; irq->refcount = 1; irq->index = i; @@ -255,6 +260,7 @@ static struct mlx5_irq *irq_request(struct mlx5_irq_pool *pool, int i) } return irq; err_xa: + irq_set_affinity_hint(irq->irqn, NULL); free_cpumask_var(irq->mask); err_cpumask: free_irq(irq->irqn, &irq->nh); @@ -304,7 +310,6 @@ int mlx5_irq_get_index(struct mlx5_irq *irq) static struct mlx5_irq *irq_pool_create_irq(struct mlx5_irq_pool *pool, struct cpumask *affinity) { - struct mlx5_irq *irq; u32 irq_index; int err; @@ -312,12 +317,7 @@ static struct mlx5_irq *irq_pool_create_irq(struct mlx5_irq_pool *pool, GFP_KERNEL); if (err) return ERR_PTR(err); - irq = irq_request(pool, irq_index); - if (IS_ERR(irq)) - return irq; - cpumask_copy(irq->mask, affinity); - irq_set_affinity_hint(irq->irqn, irq->mask); - return irq; + return irq_request(pool, irq_index, affinity); } /* looking for the irq with the smallest refcount and the same affinity */ @@ -392,11 +392,7 @@ irq_pool_request_vector(struct mlx5_irq_pool *pool, int vecidx, irq_get_locked(irq); goto unlock; } - irq = irq_request(pool, vecidx); - if (IS_ERR(irq) || !affinity) - goto unlock; - cpumask_copy(irq->mask, affinity); - irq_set_affinity_hint(irq->irqn, irq->mask); + irq = irq_request(pool, vecidx, affinity); unlock: mutex_unlock(&pool->lock); return irq; |