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 2B5B145E41 for ; Sat, 7 Dec 2024 09:04:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 20E9D40E5E; Sat, 7 Dec 2024 09:04:20 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2047.outbound.protection.outlook.com [40.107.243.47]) by mails.dpdk.org (Postfix) with ESMTP id EEA4540281 for ; Sat, 7 Dec 2024 09:04:18 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Mz2q+yNknG0DerRXubeUOlgSJFDA2OXi6YeaX7hPFrPgOAHNw0Dl9Z1HH7f21YFK9vs/QvUf7oFwpRc7xiQ/3NRbd3DeplZAVm6uQF0MsquHcmJBA+WZ/twE8k/bkqvFGvephBC7GmJ7+1f4nJaIhUSNsR04F+c2PbQgODZ7NPrgZyd60RDjtRgQzYtGGpeJMbwwpnewvoO1BVQdet1tmMq4mP6+IDbcvmId7iBkxcezSC1Q/RmJFZUYmrP/DwDDg/COn0IVNtaZ+q9sl5doTH78LHyJHjzLgQE3lYZLK13CWPMbclDU9ToArndON2l2Oy+2PEjaUKMjxyrHzUSMsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=Hyp7gi6sa0JJyZnQc9uxuLpmP34PE3mQxBYHpmcf2lY=; b=iS/LroFldlewhU1tf9qeGwoloWjB+cQp36vOiAu6v14z1TpeGCrY2Ao1QXs9CMA7VM11ha1QvYrwt2CSIGY1yXYcaSCC8UNYU+tLl+v1mxhRCAg0DhVHLoEJq+XdyzvVdthmXDg1F74eYU5ON3cQcd/tPcWSpOKxmTEgSE00P4mcpNvQgi7DTZj0cR6PQ3bjfswydwDgTkrToCdTxGcjBdIXwy7a7K9LJ8O2XIiqExKc+/LKf+dC01n/AaQRHTGJcufwVlSyQ8fNtIsGyjkL4WltzomTIXg1h1BzqYgPrkFA6BlwVuW+u8J6hbASr+wYLh103lYXN0bL7rAjBzGC3Q== 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=Hyp7gi6sa0JJyZnQc9uxuLpmP34PE3mQxBYHpmcf2lY=; b=fNAuQHVWOFhZ2DIktyUEsAfkz1PRIdKn31CTYoi1RqExLQFIlr6eQ8Z/pizMyMBf12PC/YjHufBY/woo88AE7GGTzeJPXO/Q1awR/I+rS7bNYmez/xXpZrbhRv60W5ZRYQqkpwpreCNeFts4TZe+KNFCeN0359MhcgkN2gx7Q0s+1MFSD2PW12l0RlnKs50I2xhnl1LrsiHFAK8ffNEQtdGjIYQdmThDZGuM3IzFbXVtaPn91hr/cbgZuhYjvu2Ggd6AJAX3vmpXYX3zTifAGm7E9yqZYZfM/h9lO9lhhLBQ5lefXPKcF2ftb0i0GVd8Q3mBMjxBp6cVmCsESBSwHw== Received: from PH7P220CA0097.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:32d::15) by MN0PR12MB6175.namprd12.prod.outlook.com (2603:10b6:208:3c4::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.23; Sat, 7 Dec 2024 08:04:13 +0000 Received: from CY4PEPF0000E9D8.namprd05.prod.outlook.com (2603:10b6:510:32d:cafe::8e) by PH7P220CA0097.outlook.office365.com (2603:10b6:510:32d::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8230.12 via Frontend Transport; Sat, 7 Dec 2024 08:04:13 +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 CY4PEPF0000E9D8.mail.protection.outlook.com (10.167.241.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Sat, 7 Dec 2024 08:04:12 +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.1544.4; Sat, 7 Dec 2024 00:04:01 -0800 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.1544.4; Sat, 7 Dec 2024 00:04:00 -0800 From: Xueming Li To: Dengdui Huang CC: Xueming Li , Jie Hai , "dpdk stable" Subject: patch 'net/hns3: remove ROH devices' has been queued to stable release 23.11.3 Date: Sat, 7 Dec 2024 15:59:48 +0800 Message-ID: <20241207080055.488538-31-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241207080055.488538-1-xuemingl@nvidia.com> References: <20241111062847.216344-122-xuemingl@nvidia.com> <20241207080055.488538-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: CY4PEPF0000E9D8:EE_|MN0PR12MB6175:EE_ X-MS-Office365-Filtering-Correlation-Id: 4a6d93a0-b2f0-40d0-6688-08dd1695bcd0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|36860700013|82310400026|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?YMhVpeh4VyfffBl7vuL0gtn6+UWNKTReOgacdfZymsqHmTlyucybUb4r+WoY?= =?us-ascii?Q?l8XBcmw7dqYxB9zXx+oS0hpdNcCFnkudYJS1eksU++2VIvsVlmvx3FY6Cd+H?= =?us-ascii?Q?TdldXhs8jAGaco91SS6eac9dGgfjEg7vTbuWn1VaI9djAG4Il2UTjIx9ycFQ?= =?us-ascii?Q?ND0wdFyFfAWx4Na7qz60gMkufeZ/peUcy+fFCDxStdS/149OVtdjUERU5bnc?= =?us-ascii?Q?/YOM6PHS/wn424kGr4qpapykZmIPiwp1YM5kQlSto4eAjev15ntW/Y+qAQzx?= =?us-ascii?Q?BqNr/WwiQgzdNmjrBOmyAS8k7g7RAMVUcVkUCd0RT4VGRU2YGLgWV5tSm77i?= =?us-ascii?Q?8d7/+jf3IUn21uGywvGtHiTDO0EnQ1xg1biVITIFS5sLUJWjyBlOnXvRPaRZ?= =?us-ascii?Q?1rDKYyNknWaZZY5+ik/OpKCACoVKoYDrIgf/BkW98ngzIfyXAgzZIfxVdFqX?= =?us-ascii?Q?XaDNvhLjVuSdn2Je+UMdmBV+xnFLkTWf6Z2Zlj0SYuuAKhMneER0EqKQovaP?= =?us-ascii?Q?TwTDk3uDnO4mUaFVur/5+GhgPVCk7xX4IoEmnHyTVjhhaNvlA14A/YydloMk?= =?us-ascii?Q?kB2BH762nH5NvcOKfOxjYJVJP1ZiaxtUdzpj51tU0P/kzYwSVBgAl/2ToCAn?= =?us-ascii?Q?rbGTNZUdbIulIPaSK3HJ5wCPX7nCJtRnukw18cXL5IEjJiyoeoLSd3KGCqdO?= =?us-ascii?Q?4my3c3aY+xmnr8XfcZDWxv15RgrhtkfIPuy3JfYSIIeXR28bP1g/++VhMe+s?= =?us-ascii?Q?7KbCmDnGW0q4ACO09yo8u/GRS1LBqdA3tI4cu9T/ojj/ihSpXEdcpTkQq1yo?= =?us-ascii?Q?u51KUV0vsmLrfh/vrGhLSe3crlSTz2RSaI/cEuX1rhTy1CZGdVROENUkrhU4?= =?us-ascii?Q?YngvFBFDtmQrnGckJVtW4LxWzSxZdBxHObAsMDzqspIm2lBcAyOzhr9hEzbe?= =?us-ascii?Q?HA2O4IOx3qb2lVd1PnRhqqIjfew8ntJLGrta7RmclJyW/yY7FWgTLLAS5O4B?= =?us-ascii?Q?ln0WPKVmG3qzmIQO1AjL6wwgdjorWwBmlGbW4/Asqlt4480mLbez2WnnpUCN?= =?us-ascii?Q?2kPfz4Ptie78SHMgI1VgyP1Wjpf/rK//7muxLc146/+vxp1Mvk0o2VfXYlEE?= =?us-ascii?Q?qP+FSmNElJnj/b1dx1RN8+hMr4YgoJMmqKld/TZfCpMkk0P/hASmOVbIsxVm?= =?us-ascii?Q?NLGI+jdMVsVCrK5Uzs2VGSySVKdzRuP8Tv5/8n0ktCXqh/d1VRhgqaUqszbR?= =?us-ascii?Q?wKwNGDk0uvGwGOBqdd8UaN8mlUqyBMVRzxcCldNlj9yOX+lfk1vTv5Y1M3Oq?= =?us-ascii?Q?N05BngRW9NJQVPSP4YzTO+ejH40v5sopTOJnBkTJ3pQOh4++6N2b1bkV9SOx?= =?us-ascii?Q?+hoOUpeJfOx3PGNu1mKLFn6czmtRMvzjDKuTDsl59Sr9qpqATr5YVJ7Igngr?= =?us-ascii?Q?gEve/nqJwHcu3bZveMHOIt21g2s75LAD?= 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:(13230040)(1800799024)(376014)(36860700013)(82310400026)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2024 08:04:12.9097 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4a6d93a0-b2f0-40d0-6688-08dd1695bcd0 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: CY4PEPF0000E9D8.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6175 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/10/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=8e03d87d333c1374e020c63838e527a437ea9a13 Thanks. Xueming Li --- >From 8e03d87d333c1374e020c63838e527a437ea9a13 Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Sat, 26 Oct 2024 14:38:35 +0800 Subject: [PATCH] net/hns3: remove ROH devices Cc: Xueming Li [ upstream commit feb4548ffd80bf249239d99bf9053ecf78f815d1 ] The devices added in commit 3f1436d7006c ("net/hns3: support new device") is no longer available, so revert it. Fixes: 3f1436d7006c ("net/hns3: support new device") Signed-off-by: Dengdui Huang Acked-by: Jie Hai --- drivers/net/hns3/hns3_cmd.c | 4 +--- drivers/net/hns3/hns3_ethdev.c | 2 -- drivers/net/hns3/hns3_ethdev.h | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/net/hns3/hns3_cmd.c b/drivers/net/hns3/hns3_cmd.c index 001ff49b36..2c1664485b 100644 --- a/drivers/net/hns3/hns3_cmd.c +++ b/drivers/net/hns3/hns3_cmd.c @@ -545,9 +545,7 @@ 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_100G_ROH || - device_id == HNS3_DEV_ID_200G_ROH) + device_id == HNS3_DEV_ID_200G_RDMA) 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 56adde3c66..dde27715c0 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -6650,8 +6650,6 @@ 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 c190d5109b..00d226d71c 100644 --- a/drivers/net/hns3/hns3_ethdev.h +++ b/drivers/net/hns3/hns3_ethdev.h @@ -28,9 +28,7 @@ #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-12-06 23:26:45.115847715 +0800 +++ 0030-net-hns3-remove-ROH-devices.patch 2024-12-06 23:26:43.913044828 +0800 @@ -1 +1 @@ -From feb4548ffd80bf249239d99bf9053ecf78f815d1 Mon Sep 17 00:00:00 2001 +From 8e03d87d333c1374e020c63838e527a437ea9a13 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit feb4548ffd80bf249239d99bf9053ecf78f815d1 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 3c5fdbef8f..146444e2fa 100644 +index 001ff49b36..2c1664485b 100644 @@ -36 +38 @@ -index 365b852969..d748eca0b5 100644 +index 56adde3c66..dde27715c0 100644 @@ -39 +41 @@ -@@ -6651,8 +6651,6 @@ static const struct rte_pci_id pci_id_hns3_map[] = { +@@ -6650,8 +6650,6 @@ static const struct rte_pci_id pci_id_hns3_map[] = { @@ -49 +51 @@ -index 799b61038a..7824503bb8 100644 +index c190d5109b..00d226d71c 100644