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 B345D43CE7 for ; Mon, 18 Mar 2024 16:40:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A98BE40685; Mon, 18 Mar 2024 16:40:09 +0100 (CET) Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) by mails.dpdk.org (Postfix) with ESMTP id 484194027F for ; Mon, 18 Mar 2024 16:40:08 +0100 (CET) Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-513cfc93f4eso5072909e87.3 for ; Mon, 18 Mar 2024 08:40:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710776408; x=1711381208; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=n/IlehuVwduwpa0jy6z6K/nA5LQuTlFvno/c49Ar0IQ=; b=dcuPrG0hSaiseqU0ASM3ieTVeK/y0DNJZoBNay1QUPDisGdwBv5c9Fkzjmuvl9L/Qx s6B/84TPY1tyf8d3oLFiCKzw1JUDttMXF4ErQho8gQIU1QxGE+Tpcx5MpZ/HO7CiPp7C ez5tmEu1aPUDRKY08yUo0Rt0OZiIPUa//S7Q75Q2fPb600FPkHyce8/4NkCmyUESsuhX /85vkYsPP4EjTww760AR/KUF8NmKRGdmygvZAJmEHQ48PSdapgTx70rfjbAeOXQGCAyt zZ0Lcc1JKJmzsps2MxN1FUOnHa2XsiRx6qNTV5oWq1lQhNLig/Bh0pmUaIfVxNQ+kbUu pmfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710776408; x=1711381208; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=n/IlehuVwduwpa0jy6z6K/nA5LQuTlFvno/c49Ar0IQ=; b=M6RX35LZYv2WvqugahRTDQDvrB1rxgI9ljuhn7j8dZxnWY7omx9UfET44O5FBlBjaO Nqz2DXWzJ+oFTNGOqKsjDnSjWZCLEtJBsBxkb2kma1S8Sb56IfPd/7YBc/+nPgRWvk48 ie9sBA3p6k+D7CXGfE4SCYCv60Uwd2KiimkfpTugVFoKXGzNx6hHQ6C7CTPwUuZ/DW8T zFIkeoHlm82lt9EWgN2C55F6Tu9s0ofFwT5idXX21ZZO5AD/ojmjEccFziZ2+/jSHmyH FVKrFgIk3YWE5FFi3+3qT1S+FNO3R0O9Va2AC9O1cAtVJMkuNtYon9DFEDBlvPojVc0L LoQg== X-Gm-Message-State: AOJu0Yx4XaBtWnGN/4L1GxEVJ/GZKb4lTyJLK9MnDASV9WBzn8ELXV90 gULA+oNCv5rWI/Mkp5kYW+ClxXEqLhM3JtG/DD0+P3Hwmgc91PBdqfCNFof3rMA= X-Google-Smtp-Source: AGHT+IFaq9IO4FvzLuf3g8YHEjR8pwtLjKuGXDIpzOoRpaGXMs/QdWdP8z4CN+Ui+gflYl3k4d6a+Q== X-Received: by 2002:a19:644b:0:b0:513:d174:d44e with SMTP id b11-20020a19644b000000b00513d174d44emr8293976lfj.27.1710776407668; Mon, 18 Mar 2024 08:40:07 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id p16-20020a05600c469000b00413eb5aa694sm15263989wmo.38.2024.03.18.08.40.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 08:40:07 -0700 (PDT) From: luca.boccassi@gmail.com To: Jie Hai Cc: dpdk stable Subject: patch 'net/hns3: support new device' has been queued to stable release 22.11.5 Date: Mon, 18 Mar 2024 15:39:04 +0000 Message-Id: <20240318153919.3407921-14-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318153919.3407921-1-luca.boccassi@gmail.com> References: <20240314000957.2810803-61-luca.boccassi@gmail.com> <20240318153919.3407921-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/20/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://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/c45c771584c29cdc43a22902647240657d30ac45 Thanks. Luca Boccassi --- >From c45c771584c29cdc43a22902647240657d30ac45 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 [ 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 380024600b..836a91f86e 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 7bdf7740c1..fb515ed0ee 100644 --- a/drivers/net/hns3/hns3_cmd.c +++ b/drivers/net/hns3/hns3_cmd.c @@ -539,7 +539,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 eb4223305a..6672b80c21 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 9e67e93d3f..9f95a523ec 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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-18 12:58:39.839014508 +0000 +++ 0014-net-hns3-support-new-device.patch 2024-03-18 12:58:39.127345106 +0000 @@ -1 +1 @@ -From 3f1436d7006c2659232305ef2b8b186796319041 Mon Sep 17 00:00:00 2001 +From c45c771584c29cdc43a22902647240657d30ac45 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3f1436d7006c2659232305ef2b8b186796319041 ] + @@ -10,2 +11,0 @@ -Cc: stable@dpdk.org - @@ -14,6 +14,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(-) @@ -22 +21 @@ -index 3b0613fc1b..3e84d1ff1c 100644 +index 380024600b..836a91f86e 100644 @@ -34,15 +32,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. @@ -50 +34 @@ -index 2c1664485b..001ff49b36 100644 +index 7bdf7740c1..fb515ed0ee 100644 @@ -53 +37 @@ -@@ -545,7 +545,9 @@ hns3_set_dcb_capability(struct hns3_hw *hw) +@@ -539,7 +539,9 @@ hns3_set_dcb_capability(struct hns3_hw *hw) @@ -65 +49 @@ -index b10d1216d2..9730b9a7e9 100644 +index eb4223305a..6672b80c21 100644 @@ -68 +52 @@ -@@ -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[] = { @@ -78 +62 @@ -index 12d8299def..e70c5fff2a 100644 +index 9e67e93d3f..9f95a523ec 100644