From patchwork Mon Oct 26 08:37:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bing Zhao X-Patchwork-Id: 82170 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id AC10EA04B5; Mon, 26 Oct 2020 09:38:01 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1927629C6; Mon, 26 Oct 2020 09:37:59 +0100 (CET) Received: from git-send-mailer.rdmz.labs.mlnx (unknown [37.142.13.130]) by dpdk.org (Postfix) with ESMTP id 5B5091E2B; Mon, 26 Oct 2020 09:37:56 +0100 (CET) From: Bing Zhao To: viacheslavo@mellanox.com, matan@mellanox.com Cc: dev@dpdk.org, orika@nvidia.com, rasland@nvidia.com, stable@dpdk.org, parav@mellanox.com Date: Mon, 26 Oct 2020 16:37:42 +0800 Message-Id: <1603701462-250791-1-git-send-email-bingz@nvidia.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dpdk-dev] [PATCH] common/mlx5: fix PCI driver name X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" In the refactor of mlx5 common layer, the PCI driver name to the RTE device was changed from "net_mlx5" to "mlx5_pci". The string of name "mlx5_pci" is used directly in the structure rte_pci_driver. In the past, a macro "MLX5_DRIVER_NAME" is used instead of any direct string, and now it is missing. The functions that use "MLX5_DRIVER_NAME" will get some mismatch, e.g mlx5_eth_find_next. It needs to use this macro again in all code to make everything get aligned. Fixes: 8a41f4deccc3 ("common/mlx5: introduce layer for multiple class drivers") Cc: parav@mellanox.com Cc: stable@dpdk.org Signed-off-by: Bing Zhao Reviewed-by: Parav Pandit Acked-by: Matan Azrad --- drivers/common/mlx5/mlx5_common.h | 2 ++ drivers/common/mlx5/mlx5_common_pci.c | 2 +- drivers/net/mlx5/mlx5_defs.h | 3 --- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/common/mlx5/mlx5_common.h b/drivers/common/mlx5/mlx5_common.h index ed44a45..3d3d109 100644 --- a/drivers/common/mlx5/mlx5_common.h +++ b/drivers/common/mlx5/mlx5_common.h @@ -18,6 +18,8 @@ #include "mlx5_prm.h" #include "mlx5_devx_cmds.h" +/* Reported driver name. */ +#define MLX5_DRIVER_NAME "mlx5_pci" /* Bit-field manipulation. */ #define BITFIELD_DECLARE(bf, type, size) \ diff --git a/drivers/common/mlx5/mlx5_common_pci.c b/drivers/common/mlx5/mlx5_common_pci.c index 02417c6..5208972 100644 --- a/drivers/common/mlx5/mlx5_common_pci.c +++ b/drivers/common/mlx5/mlx5_common_pci.c @@ -408,7 +408,7 @@ class_name_to_value(const char *class_name) static struct rte_pci_driver mlx5_pci_driver = { .driver = { - .name = "mlx5_pci", + .name = MLX5_DRIVER_NAME, }, .probe = mlx5_common_pci_probe, .remove = mlx5_common_pci_remove, diff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h index 42916ed..2657081 100644 --- a/drivers/net/mlx5/mlx5_defs.h +++ b/drivers/net/mlx5/mlx5_defs.h @@ -11,9 +11,6 @@ #include "mlx5_autoconf.h" -/* Reported driver name. */ -#define MLX5_DRIVER_NAME "net_mlx5" - /* Maximum number of simultaneous VLAN filters. */ #define MLX5_MAX_VLAN_IDS 128