From patchwork Thu Feb 16 13:59:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 124073 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C70F741CB2; Thu, 16 Feb 2023 15:00:02 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B739B42D75; Thu, 16 Feb 2023 14:59:57 +0100 (CET) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2064.outbound.protection.outlook.com [40.107.100.64]) by mails.dpdk.org (Postfix) with ESMTP id 7524F42D73 for ; Thu, 16 Feb 2023 14:59:56 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C9Wgd4sYIi+g9a/a8Awq/dOhUVJgTlzKvqqByybUt1Son1uwtDb1yJtMSZcyNZkZItG+OrvDwP5TKaI1FYIRf2UP/55yZUu1Mt2Il8R6ALR7KNzlRfNOhlFr28emBcVzcBZIbMU3SLc3jLbEFZ1UF86XdPMoYQTNoCsSa086hopDYqWLFzC1aUEH2mig9pQw4Ce0wSGWzy/ickAmCIhfsSpyIF8iMhgNVBmojdIY3FY/4PdtmQ8W9XMTZWAzDauJETDw8tL50aHE/wZLc0ud/Xi3nmaK68WklRkHvB6mFOzSARE7vxcqa7khQacWNKZmsIwaca4Tk7mMZd9pDECzMw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mbDQQT+SnvSAYzxt6YEFaMxckVbvSA+LmuDyXK1FDzo=; b=iT/SarWUrXGljMnuzll2ARC3Gpsu2FTRG8iPHSkhWn7xs+JPz58z7lDIX5YPQ4kaixbVPvMn38ZyyPySFoxPLdaoQg9LdiOTf/KGcooZODZb0XfCkluT5/c+5l6EZ1stoQaWexJoU6gsTC+73yWJa2wWGASS/QelVqqAk4rwKIuRcnZFK8mBIqvMEq/eeMJ5+cfe8OQc04SO2fzXVqcfl2vWtdpBeV/HwmbyjfSG0tcJmKnIJKsTNTnj6aE22GsEq1xoJcfTjxYTtbbNZywAPAYSnOh6xm8017XIXooRnLe/QNJ8CrrB7ctaQ5mBHLrrM1spy79z8V3ydR3P9y9VUg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=mbDQQT+SnvSAYzxt6YEFaMxckVbvSA+LmuDyXK1FDzo=; b=FhBBNWI3YDcSMBonI9mgBlIM64vNL0h+vQqFpQuXGpnbH1klzh8UuaV7XB9R05KdWWWz/tazX641LcNhFhxIVsCixSLRXA4ag3ZI7m3BPc7zjIkqTGknwVpzJQyEWnpBeSwS4GC+jPtKC1IweKAy9q4VOOh/ce0GFF1KWNK4mCdYH+S5G2vhP6swrpJwxLL1YJVuy0wDgwTfwhDC196kxjUMLc84ynQeWKHJSzSLrlsM7ZrO+AeSQOHJMrXCayOWPBqrakg6k38GqCcNQA8+SsA/lIE0kfgXmnyAG3HSjhlEWDgjHo8wKyY4AvR8JszEwUr72KSA4RXATP2OZjPMsg== Received: from CY5PR19CA0015.namprd19.prod.outlook.com (2603:10b6:930:15::12) by PH8PR12MB6818.namprd12.prod.outlook.com (2603:10b6:510:1c9::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.24; Thu, 16 Feb 2023 13:59:54 +0000 Received: from CY4PEPF0000C984.namprd02.prod.outlook.com (2603:10b6:930:15:cafe::e3) by CY5PR19CA0015.outlook.office365.com (2603:10b6:930:15::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.13 via Frontend Transport; Thu, 16 Feb 2023 13:59:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CY4PEPF0000C984.mail.protection.outlook.com (10.167.241.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.9 via Frontend Transport; Thu, 16 Feb 2023 13:59:53 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Thu, 16 Feb 2023 06:00:29 -0800 Received: from nvidia.com (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Thu, 16 Feb 2023 05:59:34 -0800 From: Raslan Darawsheh To: CC: , Matan Azrad , Viacheslav Ovsiienko , Fan Zhang , Ashish Gupta , Ori Kam Subject: [PATCH 4/4] mlx: update PCI device IDs names for NVIDIA BlueField NICs Date: Thu, 16 Feb 2023 15:59:08 +0200 Message-ID: <20230216135910.2701196-4-rasland@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230216135910.2701196-1-rasland@nvidia.com> References: <20230216135910.2701196-1-rasland@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000C984:EE_|PH8PR12MB6818:EE_ X-MS-Office365-Filtering-Correlation-Id: a8ed0966-6723-4a41-8960-08db1026146d X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o7hD6QXGd5DyBkcmmKz5Vu/KK57/fuIuRPqWNaIc8FOmuXa1gd/jXhPyAQlk22dUZi1bnMOSn2/13CyoD4MHUKuJTKj0fXNrN43YdqFxx9pyuY659mn4XWXyYp1BKjkw2YWGsPUa9Usltl+vWvIR84xcTh0HFT1Qp+lB81RdKWJrf2sXCU4cMmBA9BkIrmVPrgSMqDqEjLbBwQ7cpCjdlhjMAGov9jxZL9Hy6i0SpElCx2W4Ri0HJHFORT9G3ZVRqKsKcPovwkkfWAQe01Geexp+T4D8zZVjrkD9sVQ03GlyZd0NTnfSDNqxs7/bG3kl2fuwP1lrP1faWkU1xj3ICxu8izBwMJommGnfLEg1rreGegZ8Nw+6PD8bKwEk5UrjbAL3XjO4ZsQCDySs6ZERNtMrHl6CQY9Mxm+MupG+FLgyI3lCo0oMSuv2gW5bwjrZ7x8ss7hV84PyG8wYn5GTivaKrudWOrOnT1ctzFeVa5LQMdrN8rty5D616Ct7eBTcULNxgQ5JW8rs1WbooGJmeBH9HX15uARMA+bKJVwNMGZlblVwlODz1mDV9zCtN/n/ic9JLHT1Lxx5M2/rhDpkYXYdXiWQrC0AboI7gjn4mGzjZHWUu9ekd3cY7wnkDVKWhs7HsNgKozA1kfgztX7KxRuSJsCDDRZA/tBKkkJNaTwdNpYbidHVXs1SwLGx6oLfH7ztU709l1X8FjOMzWpfww== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(136003)(376002)(346002)(39860400002)(396003)(451199018)(36840700001)(40470700004)(46966006)(5660300002)(54906003)(7696005)(478600001)(2906002)(55016003)(36860700001)(40480700001)(82310400005)(15650500001)(316002)(107886003)(6666004)(41300700001)(70586007)(6916009)(8676002)(70206006)(4326008)(8936002)(1076003)(36756003)(2616005)(6286002)(336012)(426003)(83380400001)(86362001)(26005)(186003)(40460700003)(7636003)(82740400003)(47076005)(356005)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Feb 2023 13:59:53.9019 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a8ed0966-6723-4a41-8960-08db1026146d X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000C984.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6818 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 This updates the PCI device names for all NVIDIA BlueField family. Signed-off-by: Raslan Darawsheh --- drivers/common/mlx5/mlx5_common.h | 8 ++++---- drivers/common/mlx5/mlx5_common_pci.c | 2 +- drivers/compress/mlx5/mlx5_compress.c | 4 ++-- drivers/crypto/mlx5/mlx5_crypto.c | 4 ++-- drivers/net/mlx5/mlx5.c | 8 ++++---- drivers/net/mlx5/mlx5_flow.c | 10 +++++----- drivers/net/mlx5/mlx5_txq.c | 2 +- drivers/regex/mlx5/mlx5_regex.c | 4 ++-- drivers/vdpa/mlx5/mlx5_vdpa.c | 4 ++-- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/common/mlx5/mlx5_common.h b/drivers/common/mlx5/mlx5_common.h index c7bd703497..f8d07d6c6b 100644 --- a/drivers/common/mlx5/mlx5_common.h +++ b/drivers/common/mlx5/mlx5_common.h @@ -130,16 +130,16 @@ enum { PCI_DEVICE_ID_MELLANOX_CONNECTX5VF = 0x1018, PCI_DEVICE_ID_MELLANOX_CONNECTX5EX = 0x1019, PCI_DEVICE_ID_MELLANOX_CONNECTX5EXVF = 0x101a, - PCI_DEVICE_ID_MELLANOX_CONNECTX5BF = 0xa2d2, - PCI_DEVICE_ID_MELLANOX_CONNECTX5BFVF = 0xa2d3, + PCI_DEVICE_ID_MELLANOX_BLUEFIELD = 0xa2d2, + PCI_DEVICE_ID_MELLANOX_BLUEFIELDVF = 0xa2d3, PCI_DEVICE_ID_MELLANOX_CONNECTX6 = 0x101b, PCI_DEVICE_ID_MELLANOX_CONNECTX6VF = 0x101c, PCI_DEVICE_ID_MELLANOX_CONNECTX6DX = 0x101d, PCI_DEVICE_ID_MELLANOX_CONNECTXVF = 0x101e, - PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF = 0xa2d6, + PCI_DEVICE_ID_MELLANOX_BLUEFIELD2 = 0xa2d6, PCI_DEVICE_ID_MELLANOX_CONNECTX6LX = 0x101f, PCI_DEVICE_ID_MELLANOX_CONNECTX7 = 0x1021, - PCI_DEVICE_ID_MELLANOX_CONNECTX7BF = 0Xa2dc, + PCI_DEVICE_ID_MELLANOX_BLUEFIELD3 = 0Xa2dc, }; /* Maximum number of simultaneous unicast MAC addresses. */ diff --git a/drivers/common/mlx5/mlx5_common_pci.c b/drivers/common/mlx5/mlx5_common_pci.c index 73178ce0f3..5122c596bc 100644 --- a/drivers/common/mlx5/mlx5_common_pci.c +++ b/drivers/common/mlx5/mlx5_common_pci.c @@ -116,7 +116,7 @@ mlx5_dev_is_vf_pci(struct rte_pci_device *pci_dev) case PCI_DEVICE_ID_MELLANOX_CONNECTX4LXVF: case PCI_DEVICE_ID_MELLANOX_CONNECTX5VF: case PCI_DEVICE_ID_MELLANOX_CONNECTX5EXVF: - case PCI_DEVICE_ID_MELLANOX_CONNECTX5BFVF: + case PCI_DEVICE_ID_MELLANOX_BLUEFIELDVF: case PCI_DEVICE_ID_MELLANOX_CONNECTX6VF: case PCI_DEVICE_ID_MELLANOX_CONNECTXVF: return true; diff --git a/drivers/compress/mlx5/mlx5_compress.c b/drivers/compress/mlx5/mlx5_compress.c index 459e4b5e8a..430f769d41 100644 --- a/drivers/compress/mlx5/mlx5_compress.c +++ b/drivers/compress/mlx5/mlx5_compress.c @@ -786,11 +786,11 @@ mlx5_compress_dev_remove(struct mlx5_common_device *cdev) static const struct rte_pci_id mlx5_compress_pci_id_map[] = { { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, - PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF) + PCI_DEVICE_ID_MELLANOX_BLUEFIELD2) }, { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, - PCI_DEVICE_ID_MELLANOX_CONNECTX7BF) + PCI_DEVICE_ID_MELLANOX_BLUEFIELD3) }, { .vendor_id = 0 diff --git a/drivers/crypto/mlx5/mlx5_crypto.c b/drivers/crypto/mlx5/mlx5_crypto.c index 9dec1cfbe0..5267f48c1e 100644 --- a/drivers/crypto/mlx5/mlx5_crypto.c +++ b/drivers/crypto/mlx5/mlx5_crypto.c @@ -992,7 +992,7 @@ static const struct rte_pci_id mlx5_crypto_pci_id_map[] = { }, { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, - PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF) + PCI_DEVICE_ID_MELLANOX_BLUEFIELD2) }, { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, @@ -1000,7 +1000,7 @@ static const struct rte_pci_id mlx5_crypto_pci_id_map[] = { }, { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, - PCI_DEVICE_ID_MELLANOX_CONNECTX7BF) + PCI_DEVICE_ID_MELLANOX_BLUEFIELD3) }, { .vendor_id = 0 diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index cfc4609448..f55c1caca0 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -3202,11 +3202,11 @@ static const struct rte_pci_id mlx5_pci_id_map[] = { }, { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, - PCI_DEVICE_ID_MELLANOX_CONNECTX5BF) + PCI_DEVICE_ID_MELLANOX_BLUEFIELD) }, { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, - PCI_DEVICE_ID_MELLANOX_CONNECTX5BFVF) + PCI_DEVICE_ID_MELLANOX_BLUEFIELDVF) }, { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, @@ -3226,7 +3226,7 @@ static const struct rte_pci_id mlx5_pci_id_map[] = { }, { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, - PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF) + PCI_DEVICE_ID_MELLANOX_BLUEFIELD2) }, { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, @@ -3238,7 +3238,7 @@ static const struct rte_pci_id mlx5_pci_id_map[] = { }, { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, - PCI_DEVICE_ID_MELLANOX_CONNECTX7BF) + PCI_DEVICE_ID_MELLANOX_BLUEFIELD3) }, { .vendor_id = 0 diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 73e6d3b486..a6a426caf7 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -11221,8 +11221,8 @@ mlx5_flow_flex_item_create(struct rte_eth_dev *dev, return NULL; } switch (priv->pci_dev->id.device_id) { - case PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF: - case PCI_DEVICE_ID_MELLANOX_CONNECTX7BF: + case PCI_DEVICE_ID_MELLANOX_BLUEFIELD2: + case PCI_DEVICE_ID_MELLANOX_BLUEFIELD3: break; default: rte_flow_error_set(error, ENOTSUP, @@ -11470,9 +11470,9 @@ int16_t mlx5_flow_get_esw_manager_vport_id(struct rte_eth_dev *dev) if (priv->pci_dev == NULL) return 0; switch (priv->pci_dev->id.device_id) { - case PCI_DEVICE_ID_MELLANOX_CONNECTX5BF: - case PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF: - case PCI_DEVICE_ID_MELLANOX_CONNECTX7BF: + case PCI_DEVICE_ID_MELLANOX_BLUEFIELD: + case PCI_DEVICE_ID_MELLANOX_BLUEFIELD2: + case PCI_DEVICE_ID_MELLANOX_BLUEFIELD3: /* * In old FW which doesn't expose the E-Switch Manager vport ID in the capability, * only the BF embedded CPUs control the E-Switch Manager port. Hence, diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c index 5543f2c570..419e913559 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c @@ -767,7 +767,7 @@ txq_set_params(struct mlx5_txq_ctrl *txq_ctrl) txqs_inline = #if defined(RTE_ARCH_ARM64) (priv->pci_dev && priv->pci_dev->id.device_id == - PCI_DEVICE_ID_MELLANOX_CONNECTX5BF) ? + PCI_DEVICE_ID_MELLANOX_BLUEFIELD) ? MLX5_INLINE_MAX_TXQS_BLUEFIELD : #endif MLX5_INLINE_MAX_TXQS; diff --git a/drivers/regex/mlx5/mlx5_regex.c b/drivers/regex/mlx5/mlx5_regex.c index 4c20daac94..4ed62b538b 100644 --- a/drivers/regex/mlx5/mlx5_regex.c +++ b/drivers/regex/mlx5/mlx5_regex.c @@ -156,11 +156,11 @@ mlx5_regex_dev_remove(struct mlx5_common_device *cdev) static const struct rte_pci_id mlx5_regex_pci_id_map[] = { { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, - PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF) + PCI_DEVICE_ID_MELLANOX_BLUEFIELD2) }, { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, - PCI_DEVICE_ID_MELLANOX_CONNECTX7BF) + PCI_DEVICE_ID_MELLANOX_BLUEFIELD3) }, { .vendor_id = 0 diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c index 026daa3f24..f8dfa95133 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa.c +++ b/drivers/vdpa/mlx5/mlx5_vdpa.c @@ -961,7 +961,7 @@ static const struct rte_pci_id mlx5_vdpa_pci_id_map[] = { }, { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, - PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF) + PCI_DEVICE_ID_MELLANOX_BLUEFIELD2) }, { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, @@ -973,7 +973,7 @@ static const struct rte_pci_id mlx5_vdpa_pci_id_map[] = { }, { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, - PCI_DEVICE_ID_MELLANOX_CONNECTX7BF) + PCI_DEVICE_ID_MELLANOX_BLUEFIELD3) }, { .vendor_id = 0