From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6D4BFA04B1 for ; Fri, 28 Aug 2020 12:13:57 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 61672A3; Fri, 28 Aug 2020 12:13:57 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id B7DA61C115 for ; Fri, 28 Aug 2020 12:13:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598609635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eo1dq6iWfIthSwovlOhXsahlBXwDkdQa/QI9KEE94v4=; b=VzFmkJHetuRX5l9MyV/+8gn/GLDbfspBqQnYEQV6AMb/I1IomP8EhKq0JjtSP38Ua4OYOa +lYb++VnYD76dO0BDkDnJJvxlq+ZoOjFW3uIsO6CwmX4da/6T6APxay0VuBYMhxcTa73XZ Es7YzEP96CWsoNlhaSrpan4xHiN9/bw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-422-sE6HNQlYM2a4KEGMJz6yPA-1; Fri, 28 Aug 2020 06:13:51 -0400 X-MC-Unique: sE6HNQlYM2a4KEGMJz6yPA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 72CC61DDE8; Fri, 28 Aug 2020 10:13:50 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 70EEE19D7C; Fri, 28 Aug 2020 10:13:49 +0000 (UTC) From: Kevin Traynor To: Zhihong Peng Cc: Wei Zhao , dpdk stable Date: Fri, 28 Aug 2020 11:12:38 +0100 Message-Id: <20200828101308.223767-12-ktraynor@redhat.com> In-Reply-To: <20200828101308.223767-1-ktraynor@redhat.com> References: <20200828101308.223767-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/e1000: report VLAN extend capability' has been queued to LTS release 18.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/02/20. 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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/73571bbc3128689eef159341fcba7bddd1fa8a2a Thanks. Kevin. --- >From 73571bbc3128689eef159341fcba7bddd1fa8a2a Mon Sep 17 00:00:00 2001 From: Zhihong Peng Date: Mon, 20 Jul 2020 23:05:14 -0400 Subject: [PATCH] net/e1000: report VLAN extend capability [ upstream commit 21f4a1fb30ffd566769f9a4be8775433c00c44d0 ] The rte_eth_dev_set_vlan_offload function will check vlan rx offload capability, the i350/i210/i211 nics have vlan extend feature but DEV_RX_OFFLOAD_VLAN_EXTEND is not set into the capability, that will cause setting fail. So need to add this capability in igb_get_rx_port_offloads_capa function. Fixes: ef990fb56e55 ("net/e1000: convert to new Rx offloads API") Signed-off-by: Zhihong Peng Reviewed-by: Wei Zhao --- drivers/net/e1000/igb_rxtx.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c index 28fff6ab41..54b38ad4db 100644 --- a/drivers/net/e1000/igb_rxtx.c +++ b/drivers/net/e1000/igb_rxtx.c @@ -1635,6 +1635,8 @@ igb_get_rx_port_offloads_capa(struct rte_eth_dev *dev) { uint64_t rx_offload_capa; + struct e1000_hw *hw; + + hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private); - RTE_SET_USED(dev); rx_offload_capa = DEV_RX_OFFLOAD_VLAN_STRIP | DEV_RX_OFFLOAD_VLAN_FILTER | @@ -1646,4 +1648,9 @@ igb_get_rx_port_offloads_capa(struct rte_eth_dev *dev) DEV_RX_OFFLOAD_SCATTER; + if (hw->mac.type == e1000_i350 || + hw->mac.type == e1000_i210 || + hw->mac.type == e1000_i211) + rx_offload_capa |= DEV_RX_OFFLOAD_VLAN_EXTEND; + return rx_offload_capa; } -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-28 11:03:26.261893254 +0100 +++ 0012-net-e1000-report-VLAN-extend-capability.patch 2020-08-28 11:03:25.938955572 +0100 @@ -1 +1 @@ -From 21f4a1fb30ffd566769f9a4be8775433c00c44d0 Mon Sep 17 00:00:00 2001 +From 73571bbc3128689eef159341fcba7bddd1fa8a2a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 21f4a1fb30ffd566769f9a4be8775433c00c44d0 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 5717cdb706..6411924e03 100644 +index 28fff6ab41..54b38ad4db 100644 @@ -25 +26 @@ -@@ -1638,6 +1638,8 @@ igb_get_rx_port_offloads_capa(struct rte_eth_dev *dev) +@@ -1635,6 +1635,8 @@ igb_get_rx_port_offloads_capa(struct rte_eth_dev *dev) @@ -35,2 +36,2 @@ -@@ -1650,4 +1652,9 @@ igb_get_rx_port_offloads_capa(struct rte_eth_dev *dev) - DEV_RX_OFFLOAD_RSS_HASH; +@@ -1646,4 +1648,9 @@ igb_get_rx_port_offloads_capa(struct rte_eth_dev *dev) + DEV_RX_OFFLOAD_SCATTER;