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 A2F0A43E57 for ; Sat, 13 Apr 2024 14:58:43 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9DB7C40294; Sat, 13 Apr 2024 14:58:43 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2043.outbound.protection.outlook.com [40.107.236.43]) by mails.dpdk.org (Postfix) with ESMTP id AF3CE400D6 for ; Sat, 13 Apr 2024 14:58:41 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CBX6Tv8b/E+EKbM/LgVj49a+wjg9/wSSmkAp5ZiKmaOYNgZIpVIe1Nv0pbc4pR1wXM0mhH7pJkMLFBGj+wrsm1z84WWMIFC9CndEkDZkjfMDgjJ0B4lLgZ1ydfxb057QNF1SbilrACm70GDFovOP6vaF8P1TMYrP9/y+Tq+gahUnwPDn3Z2PYLFbxsLnptlP/g1DX7U8ly4yhiD6onsf+Y6pECJRUEKP70AHgC25jZv+BnWWfCbapXbCs7EEM/K5Tkdq5aB32Iv7LOQqyXtowYAechJ6SwColCNlwgw0R8WQ6v7woZtRg5ko2iSgI5Rvpm8v4Ozxi+TjzsYyRxhOjA== 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=T76jdxIy1x79Hj/ne/yiZ+iAUFgN3Ley0Ns1pn4PmKU=; b=H+WRMtOiS7+MYF0GAbX5osY3EAxDb9Gh4NM9bO4gkodbKazJhADD/rC6ChZrBPQU8tnG8odsec2SanUIolAn6FPhQuCVZUGNdizhHYdn8ZWYsbD5u+YqAyOTu/c40SbxVvvGLWqgPl9LX6gfF2HjBL8ZK1sH/wUPpxPdLQ/ht0/cdhsHUMvOReYZejoeGWEPPbioHBmZkVrnlPCLyttukT2/hKwQnQ+2Glpuj6sG7dTDojJkewEL90/3u5xUhGmYTSK44T7iV346GdKCVWQ9lCSTs3Y6ZABzJZWljY/b234CzgAuwGgXYkbp6WVk8wSc1kKY4AO0gr60ezo/gcQ+EA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=huawei.com 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 (0) 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=T76jdxIy1x79Hj/ne/yiZ+iAUFgN3Ley0Ns1pn4PmKU=; b=sMp6CBv1fWEtjv8IZWv+SekC0dOVk4kcUFEMM8mLw980ZMAC6x92vJkZB/BpyB5OKbrLOvxm/IDrZGrGuw44RpPNywCBQKpGxv/BkK8HK1vKHfsarfYt3bpMTeZPqlYUbb0Mfk2K1sqnRQNAiEVN4Q4vBNvxhl+i/FsCLg6tNO8Zk2sRXhDA8Zo/XJnHA5+hd5nN7+OnV9Nw2Wg35ewlr2FjKZIB4+VVEktB0jA8UvZyuDzyys3sPsu7hpnzUVBuMoLmV2CF/DxaB1curjN6Jh4wJu34xPqZfYmW/vT46ulPNO0yeyz7RNmJT4Cuktfa2V1+EILZxEsHw+vxuoSHtg== Received: from SJ0PR13CA0107.namprd13.prod.outlook.com (2603:10b6:a03:2c5::22) by MW5PR12MB5683.namprd12.prod.outlook.com (2603:10b6:303:1a0::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Sat, 13 Apr 2024 12:58:39 +0000 Received: from MWH0EPF000A6731.namprd04.prod.outlook.com (2603:10b6:a03:2c5:cafe::9b) by SJ0PR13CA0107.outlook.office365.com (2603:10b6:a03:2c5::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7495.16 via Frontend Transport; Sat, 13 Apr 2024 12:58:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by MWH0EPF000A6731.mail.protection.outlook.com (10.167.249.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 12:58:37 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sat, 13 Apr 2024 05:58:27 -0700 Received: from nvidia.com (10.126.231.35) 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.1258.12; Sat, 13 Apr 2024 05:58:26 -0700 From: Xueming Li To: Jie Hai CC: dpdk stable Subject: patch 'net/hns3: support new device' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:49:31 +0800 Message-ID: <20240413125005.725659-91-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] 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: MWH0EPF000A6731:EE_|MW5PR12MB5683:EE_ X-MS-Office365-Filtering-Correlation-Id: 6633a1ca-7983-4053-1957-08dc5bb96f50 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J530SbSBqPKurjjIit5FE2clyxhJ5B5XmO03ku+6XbXuthjYYrE9KwlIdtYHd+jCqXcWQAmNGN5Tetod3CrKSHXd3aeLWcskCzoQ0LKOcpDPzC1Std6wyEh9H/n5V4X9DRjH500rQxYwMVpBHbxNwT6RopXppoaI6JsG+LlzayJINRhqAFBXd7hw9OvSJfJqUmpGIp9YUEILnxFT+iVsRAvJpD23lofnOwWrTGLxOdQB/E10q+UlGjCEJkX7H8Ru43gPRTXnYzQcjWgXk3CiUegXN0rAaoVmr84RDe4gwkFF7an/nI1xQxeS4fA0mhXjehySTV/Tolnnekqo+ugnm0SaDZDV2Gx2oPWZhcOLL/5RsN+shXfzxesZppB4qMqikGUgDnGK40y6DuDWOCBkNuhjAQ/NhASCFNQrzD7bXyIzDvepQe0tC/ybkYlbiA9AUkRXmYxrkZfvAR1o5pptVsPJ2Kxwc8ZyU/KAQaipJgRC/JhXHvb07pnwUY3QAnTxJhD4/JnJ9r2cYtuEOrgM8eCNclthtJZqzDWETjhDStWJ9JHuqYKjEvgsXGrP5/tSaaLsnVt1Z9UJ1MGlmX5ZaAVfd2TB/uphR5ua1WzljsHCnfgCXZBG2p/HovLrbD4gqmCbu8NJYs/XHJ72R7IJYRZLp4vvA98377I0tEioMfOfCHKz6XWcdhjTgbFHr18zuD9tJQHXl1SNJv3d1scULcf/dhX45bq/RbITcZkChQ/0Alp2oetfmGDruKMKHZYP X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(1800799015)(36860700004)(376005)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:58:37.3428 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6633a1ca-7983-4053-1957-08dc5bb96f50 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000A6731.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR12MB5683 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 23.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/15/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=fe697bbce32c5ec34bac71e31407108d3190da12 Thanks. Xueming Li --- >From fe697bbce32c5ec34bac71e31407108d3190da12 Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 15 Mar 2024 10:54:48 +0800 Subject: [PATCH] net/hns3: support new device Cc: Xueming Li [ upstream commit 3f1436d7006c2659232305ef2b8b186796319041 ] This patch introduces the new devices, which are on-chip network interface controllers with RDMA/DCB/ROH supporting. One is 100GE and the other is 200GE. Both can be found on HIP09/HIP10 SoCs. Signed-off-by: Jie Hai --- doc/guides/nics/hns3.rst | 2 +- drivers/net/hns3/hns3_cmd.c | 4 +++- drivers/net/hns3/hns3_ethdev.c | 2 ++ drivers/net/hns3/hns3_ethdev.h | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/guides/nics/hns3.rst b/doc/guides/nics/hns3.rst index 3b0613fc1b..3e84d1ff1c 100644 --- a/doc/guides/nics/hns3.rst +++ b/doc/guides/nics/hns3.rst @@ -6,7 +6,7 @@ HNS3 Poll Mode Driver The hns3 PMD (**librte_net_hns3**) provides poll mode driver support for the inbuilt HiSilicon Network Subsystem(HNS) network engine -found in the HiSilicon Kunpeng 920 SoC and Kunpeng 930 SoC . +found in the HiSilicon Kunpeng 920 SoC (HIP08) and Kunpeng 930 SoC (HIP09/HIP10). Features -------- diff --git a/drivers/net/hns3/hns3_cmd.c b/drivers/net/hns3/hns3_cmd.c index 2c1664485b..001ff49b36 100644 --- a/drivers/net/hns3/hns3_cmd.c +++ b/drivers/net/hns3/hns3_cmd.c @@ -545,7 +545,9 @@ hns3_set_dcb_capability(struct hns3_hw *hw) if (device_id == HNS3_DEV_ID_25GE_RDMA || device_id == HNS3_DEV_ID_50GE_RDMA || device_id == HNS3_DEV_ID_100G_RDMA_MACSEC || - device_id == HNS3_DEV_ID_200G_RDMA) + device_id == HNS3_DEV_ID_200G_RDMA || + device_id == HNS3_DEV_ID_100G_ROH || + device_id == HNS3_DEV_ID_200G_ROH) hns3_set_bit(hw->capability, HNS3_DEV_SUPPORT_DCB_B, 1); } diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index eafcf2c6f6..90dbc4a84b 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -6648,6 +6648,8 @@ static const struct rte_pci_id pci_id_hns3_map[] = { { RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_50GE_RDMA) }, { RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_100G_RDMA_MACSEC) }, { RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_200G_RDMA) }, + { RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_100G_ROH) }, + { RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_200G_ROH) }, { .vendor_id = 0, }, /* sentinel */ }; diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h index 12d8299def..e70c5fff2a 100644 --- a/drivers/net/hns3/hns3_ethdev.h +++ b/drivers/net/hns3/hns3_ethdev.h @@ -28,7 +28,9 @@ #define HNS3_DEV_ID_25GE_RDMA 0xA222 #define HNS3_DEV_ID_50GE_RDMA 0xA224 #define HNS3_DEV_ID_100G_RDMA_MACSEC 0xA226 +#define HNS3_DEV_ID_100G_ROH 0xA227 #define HNS3_DEV_ID_200G_RDMA 0xA228 +#define HNS3_DEV_ID_200G_ROH 0xA22C #define HNS3_DEV_ID_100G_VF 0xA22E #define HNS3_DEV_ID_100G_RDMA_PFC_VF 0xA22F -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:07.785417390 +0800 +++ 0091-net-hns3-support-new-device.patch 2024-04-13 20:43:05.047753866 +0800 @@ -1 +1 @@ -From 3f1436d7006c2659232305ef2b8b186796319041 Mon Sep 17 00:00:00 2001 +From fe697bbce32c5ec34bac71e31407108d3190da12 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3f1436d7006c2659232305ef2b8b186796319041 ] @@ -10,2 +12,0 @@ -Cc: stable@dpdk.org - @@ -14,6 +15,5 @@ - doc/guides/nics/hns3.rst | 2 +- - doc/guides/rel_notes/release_24_03.rst | 4 ++++ - drivers/net/hns3/hns3_cmd.c | 4 +++- - drivers/net/hns3/hns3_ethdev.c | 2 ++ - drivers/net/hns3/hns3_ethdev.h | 2 ++ - 5 files changed, 12 insertions(+), 2 deletions(-) + doc/guides/nics/hns3.rst | 2 +- + drivers/net/hns3/hns3_cmd.c | 4 +++- + drivers/net/hns3/hns3_ethdev.c | 2 ++ + drivers/net/hns3/hns3_ethdev.h | 2 ++ + 4 files changed, 8 insertions(+), 2 deletions(-) @@ -34,15 +33,0 @@ -diff --git a/doc/guides/rel_notes/release_24_03.rst b/doc/guides/rel_notes/release_24_03.rst -index 8e809456aa..14826ea08f 100644 ---- a/doc/guides/rel_notes/release_24_03.rst -+++ b/doc/guides/rel_notes/release_24_03.rst -@@ -123,6 +123,10 @@ New Features - - * Added support for 5760X device family. - -+* **Updated HiSilicon hns3 ethdev driver.** -+ -+ * Added new device supporting RDMA/DCB/ROH with PCI IDs: ``0xa227, 0xa22c``. -+ - * **Updated Marvell cnxk net driver.** - - * Added support for port representors. @@ -65 +50 @@ -index b10d1216d2..9730b9a7e9 100644 +index eafcf2c6f6..90dbc4a84b 100644 @@ -68 +53 @@ -@@ -6649,6 +6649,8 @@ static const struct rte_pci_id pci_id_hns3_map[] = { +@@ -6648,6 +6648,8 @@ static const struct rte_pci_id pci_id_hns3_map[] = {