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 5FEECA0518 for ; Fri, 24 Jul 2020 14:11:29 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 594F81C232; Fri, 24 Jul 2020 14:11:29 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 9767B1C012 for ; Fri, 24 Jul 2020 14:11:27 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id k20so410680wmi.5 for ; Fri, 24 Jul 2020 05:11:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oJKawv3rDYqDpnOdoethtdDKCuLC8NMTRcveMkM4xew=; b=GdohOM5XPt1Mc0lB4RPkbp/MEi9nUaee4/wC6DlkaRlojGClJFBFuAExlr/GhipUzH isGBD31IcKECMD95rx4T4AM0j7cIonbo/xuS3R3K+vCOevQicLFe2ATZE/+LqcfZiCsw s5JwjL45XIsW6SM8gNeVFdwnvy7BETamnek8YyPXog0Z0SdNzHmtF+XYa+RgR7hyJQeD FLZCRVf32IqWKlvLs5RLV+DcRmjqtL+WAktroEG56Nay7gpP28CfFXIEljvbu0f7OiGH iu25OFQUrtc2w9hk3kjykDCCK7VbAzcp3fYFGUPeg/GA4pjoZ0JrttodkDNTzh55PigA u3RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oJKawv3rDYqDpnOdoethtdDKCuLC8NMTRcveMkM4xew=; b=KfmXPQSGQb3E6kPAAMzp0+bQoGDefKyjNutFytaz0A6rvhiZnbv05djNXC22hj8WvO ZW55g3m5NN/TBGRwF/yk+tVbFSDmcn4AZ7rFKMRTnTIrTf2jMikVHwelkboAsxwqvoNi Wz+8j0njCUqbZJhbuU/PEqhstVCvJcdppjuIRhtmV8KcN12cpnoqi0r5mnvZi1gEn/yq x/pWHt8BrnNMzWNWmDTPdlQ6cWj+rUMCjfbHtnqapRxvnHKIpff9Ih0E389Fx+mSS6qA 0oxoJ9cHnL4TU1yiQ4QplKyvonC5XG2MKdLm3kIQPEAUTYpN4iSjO74Jws7K9b6aytRC TBDA== X-Gm-Message-State: AOAM53184t+Oqj47wvW9+N2tgsijwMAMM0nl96PE3R6IL9/ZtfIBVsnE 0mkOJDu742K7KVceB1J4gI4= X-Google-Smtp-Source: ABdhPJynK0NApZhO3sM+5mR/VsNEZl7AzMfKtuyfl40p5D4FvUqirrlUVgmTzmWim9Uqp7zWTKv4Qw== X-Received: by 2002:a1c:9a02:: with SMTP id c2mr9342230wme.16.1595592687359; Fri, 24 Jul 2020 05:11:27 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id p6sm1665046wmg.0.2020.07.24.05.11.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:11:25 -0700 (PDT) From: luca.boccassi@gmail.com To: Zhihong Peng Cc: Wei Zhao , dpdk stable Date: Fri, 24 Jul 2020 13:00:07 +0100 Message-Id: <20200724120030.1863487-169-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/e1000: report VLAN extend capability' has been queued to stable release 19.11.4 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 stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/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. Thanks. Luca Boccassi --- >From 116e6fde4f5fdb541d6a1d30b311587fb086e22f 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 684fa4ad8..92576b0af 100644 --- a/drivers/net/e1000/igb_rxtx.c +++ b/drivers/net/e1000/igb_rxtx.c @@ -1637,8 +1637,10 @@ uint64_t 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 | DEV_RX_OFFLOAD_IPV4_CKSUM | @@ -1649,6 +1651,11 @@ igb_get_rx_port_offloads_capa(struct rte_eth_dev *dev) DEV_RX_OFFLOAD_SCATTER | DEV_RX_OFFLOAD_RSS_HASH; + 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.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:55.076772718 +0100 +++ 0169-net-e1000-report-VLAN-extend-capability.patch 2020-07-24 12:53:48.567011676 +0100 @@ -1,8 +1,10 @@ -From 21f4a1fb30ffd566769f9a4be8775433c00c44d0 Mon Sep 17 00:00:00 2001 +From 116e6fde4f5fdb541d6a1d30b311587fb086e22f 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 @@ -10,7 +12,6 @@ igb_get_rx_port_offloads_capa function. Fixes: ef990fb56e55 ("net/e1000: convert to new Rx offloads API") -Cc: stable@dpdk.org Signed-off-by: Zhihong Peng Reviewed-by: Wei Zhao @@ -19,7 +20,7 @@ 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c -index 5717cdb70..6411924e0 100644 +index 684fa4ad8..92576b0af 100644 --- a/drivers/net/e1000/igb_rxtx.c +++ b/drivers/net/e1000/igb_rxtx.c @@ -1637,8 +1637,10 @@ uint64_t