From patchwork Sun May 17 13:02:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Vadai X-Patchwork-Id: 473156 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EF9B6140A98 for ; Sun, 17 May 2015 23:03:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752911AbbEQNDR (ORCPT ); Sun, 17 May 2015 09:03:17 -0400 Received: from ns1327.ztomy.com ([193.47.165.129]:40595 "EHLO mellanox.co.il" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752841AbbEQNDP (ORCPT ); Sun, 17 May 2015 09:03:15 -0400 Received: from Internal Mail-Server by MTLPINE1 (envelope-from amirv@mellanox.com) with ESMTPS (AES256-SHA encrypted); 17 May 2015 16:02:43 +0300 Received: from swl095.mtl.labs.mlnx (swl095.mtl.labs.mlnx [10.7.17.95]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id t4HD2qOM000918; Sun, 17 May 2015 16:02:52 +0300 From: Amir Vadai To: "David S. Miller" Cc: netdev@vger.kernel.org, Or Gerlitz , Amir Vadai , Tal Alon , Achiad Shochat , Saeed Mahameed Subject: [PATCH net-next V4 03/12] net/mlx5_core: Add EQ renaming mechanism Date: Sun, 17 May 2015 16:02:14 +0300 Message-Id: <1431867743-13149-4-git-send-email-amirv@mellanox.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1431867743-13149-1-git-send-email-amirv@mellanox.com> References: <1431867743-13149-1-git-send-email-amirv@mellanox.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Saeed Mahameed Introduce mlx5_rename_eq() to rename an EQ. This will be used by a following commit for the Ethernet functionality of the driver. Signed-off-by: Saeed Mahameed Signed-off-by: Amir Vadai --- drivers/net/ethernet/mellanox/mlx5/core/main.c | 25 ++++++++++++++++++++-- .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 ++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index 55085b0..7fdbdb4 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -591,11 +591,11 @@ static void mlx5_irq_clear_affinity_hints(struct mlx5_core_dev *mdev) int mlx5_vector2eqn(struct mlx5_core_dev *dev, int vector, int *eqn, int *irqn) { struct mlx5_eq_table *table = &dev->priv.eq_table; - struct mlx5_eq *eq, *n; + struct mlx5_eq *eq; int err = -ENOENT; spin_lock(&table->lock); - list_for_each_entry_safe(eq, n, &table->comp_eqs_list, list) { + list_for_each_entry(eq, &table->comp_eqs_list, list) { if (eq->index == vector) { *eqn = eq->eqn; *irqn = eq->irqn; @@ -609,6 +609,27 @@ int mlx5_vector2eqn(struct mlx5_core_dev *dev, int vector, int *eqn, int *irqn) } EXPORT_SYMBOL(mlx5_vector2eqn); +int mlx5_rename_eq(struct mlx5_core_dev *dev, int eq_ix, char *name) +{ + struct mlx5_priv *priv = &dev->priv; + struct mlx5_eq_table *table = &priv->eq_table; + struct mlx5_eq *eq; + int err = -ENOENT; + + spin_lock(&table->lock); + list_for_each_entry(eq, &table->comp_eqs_list, list) { + if (eq->index == eq_ix) { + snprintf(priv->irq_info[eq_ix].name, MLX5_MAX_IRQ_NAME, + "%s-%d", name, eq_ix); + err = 0; + break; + } + } + spin_unlock(&table->lock); + + return err; +} + static void free_comp_eqs(struct mlx5_core_dev *dev) { struct mlx5_eq_table *table = &dev->priv.eq_table; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h index a051b90..230855a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h @@ -72,4 +72,6 @@ int mlx5_cmd_query_adapter(struct mlx5_core_dev *dev); int mlx5_cmd_init_hca(struct mlx5_core_dev *dev); int mlx5_cmd_teardown_hca(struct mlx5_core_dev *dev); +int mlx5_rename_eq(struct mlx5_core_dev *dev, int eq_ix, char *name); + #endif /* __MLX5_CORE_H__ */