From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3F727A0C51; Wed, 21 Jul 2021 16:38:38 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 26E0440DF7; Wed, 21 Jul 2021 16:38:38 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2071.outbound.protection.outlook.com [40.107.93.71]) by mails.dpdk.org (Postfix) with ESMTP id 7FCCE40689 for ; Wed, 21 Jul 2021 16:38:36 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HX46qJ7wsuxEzZTULILqOaX/S2hSk6kICpUusXd/HMrRGd395+unJqZWPATEp/KX+hZ6UNO7A/u68xwUE/APVIGF3ZpZjI4zF4/o0yBjdhmIYd7f1FNpFBmgkdc5YUUrfCYTpuAxQ+F2TkfllcKW+7+ETzVe0b/uu9g/RquvQtMuq27kVWeDBQ8UKoGaKkk4itUhWI9/Rc0aVHMz66E9vxA47MSuU+/FdEl3XgPUdWwb6VewJDdkSUyxwrPMZboQwm1H6so3JVItp68+wjaGC9wtC4CrhGi/lT2YcwHMV634P0cppg9/mMuUpdtD0mj47bZHxGT1CvK5c+4R2EzH3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q1B4T1lepGSitzdZQ+Ue+B3MGsI48sA0E27LcAa1YQc=; b=iTcGgK4cp0qFHTVd4p8xdIIALyb4lyql44IKMtJKBagKQ5vzcdl6+T38nX8PaOqVnMKPfWcyGfzqlM2Wx8iRg6RT8oMzpW6V0Yaov956m/x92QaGyQpMZ+CdSv5how2IYTmGuHR/lDax45DIg5K9V3WcpVg1bovCvKwDo0aiU8K+Eq2WiDIqMRYJBVije8kxaR4fzWZG7/BNLiaoyGZoTeKOp/FNseDK1Jo1xK4KFvxJB2jbXej5RjKr1asHdZ+/obD9ggOYdWViPZqX9Dic9ezKebTnxvFmT6lxwWq+kzJRtCRaXYmez2gXtvh5jC7ASmpF5/03JsTHpfLH/Mb1yA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q1B4T1lepGSitzdZQ+Ue+B3MGsI48sA0E27LcAa1YQc=; b=GGY4wRXynNGF34WoUxAY43aPFsxhw4/rXvgAoF9zclcbmq1seuN5HOv2lWQPbhHbKEyZDhjRYW8dcLwR/S0VDL2ZCvg3gXe+JII+HfERPvgCZgJ2//JC1YTX8cE6EVkVo2ICu3No33K2SH3bQQmy2zwRcyi/+W/uYM2BBI4EgM2dphhHtDK1QMclp3iScc/2NnqmQ9VVbZTgqVtQAJEIao876yoUxOBFlmyDNPHC0gRWBTkb/z2nYN0ZstBFzwMyVUDJPgTLjQ7sZepQBDdChtO40ScbjuRuEsFJ/NOTm8yViJ5VUzFRuk2aMtvD98SOi3GzWdP4qeMD3+aeIuxJag== Received: from BN0PR03CA0012.namprd03.prod.outlook.com (2603:10b6:408:e6::17) by MW2PR12MB2347.namprd12.prod.outlook.com (2603:10b6:907:7::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.22; Wed, 21 Jul 2021 14:38:34 +0000 Received: from BN8NAM11FT021.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e6:cafe::7b) by BN0PR03CA0012.outlook.office365.com (2603:10b6:408:e6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.24 via Frontend Transport; Wed, 21 Jul 2021 14:38:34 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT021.mail.protection.outlook.com (10.13.177.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4352.24 via Frontend Transport; Wed, 21 Jul 2021 14:38:34 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 21 Jul 2021 14:38:31 +0000 From: Xueming Li To: Viacheslav Ovsiienko CC: , , Matan Azrad , Shahaf Shuler Date: Wed, 21 Jul 2021 22:37:28 +0800 Message-ID: <20210721143743.24626-2-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210721143743.24626-1-xuemingl@nvidia.com> References: <20210616040935.311733-1-xuemingl@nvidia.com> <20210721143743.24626-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e3f7b281-b190-4453-7afc-08d94c5537ef X-MS-TrafficTypeDiagnostic: MW2PR12MB2347: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2733; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qo01wLbipPKyRgzf8syl4zpBRU3WRoYGjZ0xKNzTx+LtyADeC1wO/q3h0j/2m5pMLYFEyD08eqX2x5IvizSB7/64NxXJKON/pBP6buJ0TCXgmUeUirXz2zRA+6x9jrjKIchyqH9l3TCNtFgrco2GzZ9nyBmIuNNROEUDDYVuU4mUErMS0CF+oxNsNZsE2/BIiOjFKnoziyB9PahlNIgqZ9jfy7oo0kOBc/28MVkpJVqNw8xXY4Nhn/CN/WI++20Tql1g3O8EIOy58MPD/JSHm/i3MZrL0Wg4XFKPSZ/JW34Tfi2Ue/vDg6UZ6wgvUfbB4fpWP8Ybmpq7CEZJLhxoYsJEFCRJppTNIVPymb8sMd40r7RLQzd+S2bRh4QGJpzfbgn+DotA+akQLRVsxByFswQcU4QPQ2pZOvqYZbHh9FmlO/D7KbhhEt8DH0loIloYgsWRjDerQBnGDfUhXaCq7ZPry1flqoWS4QqUJXiyW5dUb1sit7dYAI4foVZoPkRz4PZLIcyI+arKspnGYlB+3pXDNi2AtEq/IWoLgfi0WXAKECO71D3YR34+hMa/ap/vlukREqgqg8riJnCyNkNtAJfRp4jA1qJQ4Ya2UFMKHYLi3cMkedgtrseDcsoDP72F3xQECuVFWSOXLF2+yRCXJ2RorpPoaO6CqJqb4nF8rZbg4GkiwIbDJKmvCudAEUzmWcMqSRbJeYJgfXv7DsRSgA== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(39860400002)(396003)(376002)(346002)(136003)(36840700001)(46966006)(8676002)(478600001)(8936002)(2616005)(6862004)(47076005)(107886003)(36860700001)(6286002)(70586007)(4326008)(2906002)(86362001)(336012)(82310400003)(356005)(6636002)(70206006)(426003)(6666004)(7636003)(16526019)(54906003)(83380400001)(186003)(7696005)(26005)(37006003)(55016002)(36906005)(316002)(82740400003)(36756003)(1076003)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2021 14:38:34.2419 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e3f7b281-b190-4453-7afc-08d94c5537ef X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT021.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR12MB2347 Subject: [dpdk-dev] [PATCH v4 01/16] common/mlx5: rename eth device class name X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" To align with EAL class driver, rename internal class name from "net" to "eth" Signed-off-by: Xueming Li Acked-by: Viacheslav Ovsiienko --- drivers/common/mlx5/mlx5_common.h | 2 +- drivers/common/mlx5/mlx5_common_pci.c | 22 ++++++++++++---------- drivers/net/mlx5/mlx5.c | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/drivers/common/mlx5/mlx5_common.h b/drivers/common/mlx5/mlx5_common.h index 962179a5a5..05008983ea 100644 --- a/drivers/common/mlx5/mlx5_common.h +++ b/drivers/common/mlx5/mlx5_common.h @@ -212,7 +212,7 @@ int mlx5_get_ifname_sysfs(const char *ibdev_path, char *ifname); enum mlx5_class { MLX5_CLASS_INVALID, - MLX5_CLASS_NET = RTE_BIT64(0), + MLX5_CLASS_ETH = RTE_BIT64(0), MLX5_CLASS_VDPA = RTE_BIT64(1), MLX5_CLASS_REGEX = RTE_BIT64(2), MLX5_CLASS_COMPRESS = RTE_BIT64(3), diff --git a/drivers/common/mlx5/mlx5_common_pci.c b/drivers/common/mlx5/mlx5_common_pci.c index 5547e62d6b..591054468d 100644 --- a/drivers/common/mlx5/mlx5_common_pci.c +++ b/drivers/common/mlx5/mlx5_common_pci.c @@ -28,34 +28,36 @@ static const struct { unsigned int driver_class; } mlx5_classes[] = { { .name = "vdpa", .driver_class = MLX5_CLASS_VDPA }, - { .name = "net", .driver_class = MLX5_CLASS_NET }, + { .name = "eth", .driver_class = MLX5_CLASS_ETH }, + /* Keep name "net" for backward compatibility. */ + { .name = "net", .driver_class = MLX5_CLASS_ETH }, { .name = "regex", .driver_class = MLX5_CLASS_REGEX }, { .name = "compress", .driver_class = MLX5_CLASS_COMPRESS }, { .name = "crypto", .driver_class = MLX5_CLASS_CRYPTO }, }; static const unsigned int mlx5_class_combinations[] = { - MLX5_CLASS_NET, + MLX5_CLASS_ETH, MLX5_CLASS_VDPA, MLX5_CLASS_REGEX, MLX5_CLASS_COMPRESS, MLX5_CLASS_CRYPTO, - MLX5_CLASS_NET | MLX5_CLASS_REGEX, + MLX5_CLASS_ETH | MLX5_CLASS_REGEX, MLX5_CLASS_VDPA | MLX5_CLASS_REGEX, - MLX5_CLASS_NET | MLX5_CLASS_COMPRESS, + MLX5_CLASS_ETH | MLX5_CLASS_COMPRESS, MLX5_CLASS_VDPA | MLX5_CLASS_COMPRESS, MLX5_CLASS_REGEX | MLX5_CLASS_COMPRESS, - MLX5_CLASS_NET | MLX5_CLASS_CRYPTO, + MLX5_CLASS_ETH | MLX5_CLASS_CRYPTO, + MLX5_CLASS_ETH | MLX5_CLASS_REGEX | MLX5_CLASS_COMPRESS, MLX5_CLASS_VDPA | MLX5_CLASS_CRYPTO, MLX5_CLASS_REGEX | MLX5_CLASS_CRYPTO, MLX5_CLASS_COMPRESS | MLX5_CLASS_CRYPTO, - MLX5_CLASS_NET | MLX5_CLASS_REGEX | MLX5_CLASS_COMPRESS, MLX5_CLASS_VDPA | MLX5_CLASS_REGEX | MLX5_CLASS_COMPRESS, - MLX5_CLASS_NET | MLX5_CLASS_REGEX | MLX5_CLASS_CRYPTO, + MLX5_CLASS_ETH | MLX5_CLASS_REGEX | MLX5_CLASS_CRYPTO, MLX5_CLASS_VDPA | MLX5_CLASS_REGEX | MLX5_CLASS_CRYPTO, - MLX5_CLASS_NET | MLX5_CLASS_COMPRESS | MLX5_CLASS_CRYPTO, + MLX5_CLASS_ETH | MLX5_CLASS_COMPRESS | MLX5_CLASS_CRYPTO, MLX5_CLASS_VDPA | MLX5_CLASS_COMPRESS | MLX5_CLASS_CRYPTO, - MLX5_CLASS_NET | MLX5_CLASS_REGEX | MLX5_CLASS_COMPRESS | + MLX5_CLASS_ETH | MLX5_CLASS_REGEX | MLX5_CLASS_COMPRESS | MLX5_CLASS_CRYPTO, MLX5_CLASS_VDPA | MLX5_CLASS_REGEX | MLX5_CLASS_COMPRESS | MLX5_CLASS_CRYPTO, @@ -317,7 +319,7 @@ mlx5_common_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, } } else { /* Default to net class. */ - user_classes = MLX5_CLASS_NET; + user_classes = MLX5_CLASS_ETH; } dev = pci_to_mlx5_device(pci_dev); if (!dev) { diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 021a34dd4d..d9c90d5ef9 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -2446,7 +2446,7 @@ static const struct rte_pci_id mlx5_pci_id_map[] = { }; static struct mlx5_pci_driver mlx5_driver = { - .driver_class = MLX5_CLASS_NET, + .driver_class = MLX5_CLASS_ETH, .pci_driver = { .driver = { .name = MLX5_PCI_DRIVER_NAME, -- 2.25.1