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 3E73145C9B for ; Tue, 12 Nov 2024 23:09:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 38D1D4064C; Tue, 12 Nov 2024 23:09:24 +0100 (CET) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mails.dpdk.org (Postfix) with ESMTP id 4E7934064C for ; Tue, 12 Nov 2024 23:09:23 +0100 (CET) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-37d41894a32so52835f8f.1 for ; Tue, 12 Nov 2024 14:09:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731449363; x=1732054163; 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=qXoUevVLDKPh//QwmvSkQef2BIKdKv5KFKAJC3bvo1w=; b=WMg3nRZ5wterjYGnI7vkYbSN7duQ08IFZhCyIhICrvabLtVMprqgVMMsNy0UlkgrAL zKScwaI6CG4IXv+Ort3oUrNQ9fzHsrio2dKM+8IcbnXKjqZXQRLkNocTB5YtyIw1ewy2 3t/6Va32HQ1cy6AmcDS7CEZAwguz1b7fGeq7G1/kTEey+WINIM8+PTqKSZEnuTSfAl1Y RAISs+ovK9JMxnVh48M6ChlQZ6enG8v54skTLEbq/ljFfsEH7r1b3fa59x4E4zIvN27O LIJ8ALXOgKx6KGgHVjd0uys2Yoz4aweJCnqRviCjaEDihH5wGA0zAqzz9iyTiJTGJ7bl qTgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731449363; x=1732054163; 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=qXoUevVLDKPh//QwmvSkQef2BIKdKv5KFKAJC3bvo1w=; b=eBSHei2zl4wuA5etbSiYLyyylgRkhYBrrnjyLfO7F2CvBhMntBWKfs5r+BGAZbmUQz TU8a7V99p1U0pNL0UPDaj5Oow2/f/lcwLMahobX2L1KBOgRnNptZCNJbDZfBa+BFe7Jo VDc1pMSZQ9x0Xr4c8WAyu87Rdwz6eSCgsXaFLXVoN1D+38kNyQW4TCXI4nSPjuO1avTD omKrbpQ/mWF6yzkAuiuBG/l3xdaxfc9AT2rrWnvxCMZlRDJmDNX3z25iS0chRgwCGIco HzuFmOk7aD6SDUYS4HwHU6Es2N3+58M45Y1j+8A5n70Lvxj8JRCnPLU8JfGZAPAvVSwt /jfA== X-Forwarded-Encrypted: i=1; AJvYcCXJY9AGgCctUZFVqd1zShTWLrBkcSUpTDWFtZ8vAelefHGtsq8YCLYRn0dF91e65eW77ta6pMk=@dpdk.org X-Gm-Message-State: AOJu0YxZPAUnCQ0nVh8GauBI61pqeHoc524fZsXfdp09W6MzJ6/3GKEp +iYxGq0CAhylT/5JfCtdPQVbrW9zC/0mqJ+vc79yDJz9iq9LoaMP X-Google-Smtp-Source: AGHT+IHQOiWYLKzbZ7PD3tiIoreVntlWVpn5ZCv/aIXHf+y1dx0Zm3vpFO+4Z160lsHSp05YitCvpA== X-Received: by 2002:a5d:64cc:0:b0:37d:43d1:2064 with SMTP id ffacd0b85a97d-381f1c8ca61mr14503622f8f.30.1731449362851; Tue, 12 Nov 2024 14:09:22 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:e89d:e9a1:da72:2f9d]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-381eda051c6sm16265165f8f.99.2024.11.12.14.09.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2024 14:09:22 -0800 (PST) From: luca.boccassi@gmail.com To: Dengdui Huang Cc: Jie Hai , dpdk stable Subject: patch 'net/hns3: remove ROH devices' has been queued to stable release 22.11.7 Date: Tue, 12 Nov 2024 22:07:33 +0000 Message-ID: <20241112220754.666489-23-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241112220754.666489-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-79-luca.boccassi@gmail.com> <20241112220754.666489-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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/14/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/e8e117b4b2a668a3e820b795d381ace9a2b9da5f Thanks. Luca Boccassi --- >From e8e117b4b2a668a3e820b795d381ace9a2b9da5f 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 [ 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 fb515ed0ee..7bdf7740c1 100644 --- a/drivers/net/hns3/hns3_cmd.c +++ b/drivers/net/hns3/hns3_cmd.c @@ -539,9 +539,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 0050d46ae7..9b0b3776f4 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 1afe4c4ff7..5445170c8b 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.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-12 22:06:59.421331504 +0000 +++ 0023-net-hns3-remove-ROH-devices.patch 2024-11-12 22:06:58.671307265 +0000 @@ -1 +1 @@ -From feb4548ffd80bf249239d99bf9053ecf78f815d1 Mon Sep 17 00:00:00 2001 +From e8e117b4b2a668a3e820b795d381ace9a2b9da5f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit feb4548ffd80bf249239d99bf9053ecf78f815d1 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 3c5fdbef8f..146444e2fa 100644 +index fb515ed0ee..7bdf7740c1 100644 @@ -24 +25 @@ -@@ -545,9 +545,7 @@ hns3_set_dcb_capability(struct hns3_hw *hw) +@@ -539,9 +539,7 @@ hns3_set_dcb_capability(struct hns3_hw *hw) @@ -36 +37 @@ -index 365b852969..d748eca0b5 100644 +index 0050d46ae7..9b0b3776f4 100644 @@ -39 +40 @@ -@@ -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 +50 @@ -index 799b61038a..7824503bb8 100644 +index 1afe4c4ff7..5445170c8b 100644