[dpdk-stable] patch 'net/i40e: fix RSS hash update for X722 VF' has been queued to LTS release 18.11.3

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to LTS release 18.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 09/12/19. 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/4396016a09a122d6e382e7bf052b85102c01d8e8

Thanks.

Kevin Traynor

---
From 4396016a09a122d6e382e7bf052b85102c01d8e8 Mon Sep 17 00:00:00 2001
From: Peng Huang <peng.huang@intel.com>
Date: Mon, 22 Jul 2019 13:50:28 +0000
Subject: [PATCH] net/i40e: fix RSS hash update for X722 VF

[ upstream commit ba277e3720639ed46c0b51fab600b6e35c47eb88 ]

This patch fixes X722 VF problem when received packet don't have
HASH value.
1) Packet classifier types update should support X722 VF, not only
 for X722 PF;
2) MAC type is invalid for X722 VF when set packet classifier type,
so move it after MAC type is set correctly;

Fixes: a286ebeb0714 ("net/i40e: add dynamic mapping of SW flow types to HW pctypes")

Signed-off-by: Peng Huang <peng.huang@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/i40e/i40e_ethdev_vf.c | 2 +-
 drivers/net/i40e/i40e_rxtx.c      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index de29f04cb..49bdeb329 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -1435,5 +1435,4 @@ i40evf_dev_init(struct rte_eth_dev *eth_dev)
 	}
 	i40e_set_default_ptype_table(eth_dev);
-	i40e_set_default_pctype_table(eth_dev);
 	rte_eth_copy_pci_info(eth_dev, pci_dev);
 
@@ -1453,4 +1452,5 @@ i40evf_dev_init(struct rte_eth_dev *eth_dev)
 	}
 
+	i40e_set_default_pctype_table(eth_dev);
 	rte_eal_alarm_set(I40EVF_ALARM_INTERVAL,
 			  i40evf_dev_alarm_handler, eth_dev);
diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index 679357bf8..4285f8420 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -3175,5 +3175,6 @@ i40e_set_default_pctype_table(struct rte_eth_dev *dev)
 				(1ULL << I40E_FILTER_PCTYPE_L2_PAYLOAD);
 
-	if (hw->mac.type == I40E_MAC_X722) {
+	if (hw->mac.type == I40E_MAC_X722 ||
+		hw->mac.type == I40E_MAC_X722_VF) {
 		ad->pctypes_tbl[RTE_ETH_FLOW_NONFRAG_IPV4_UDP] |=
 			(1ULL << I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-09-05 10:36:47.870015653 +0100
+++ 0006-net-i40e-fix-RSS-hash-update-for-X722-VF.patch	2019-09-05 10:36:47.446702054 +0100
@@ -1 +1 @@
-From ba277e3720639ed46c0b51fab600b6e35c47eb88 Mon Sep 17 00:00:00 2001
+From 4396016a09a122d6e382e7bf052b85102c01d8e8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ba277e3720639ed46c0b51fab600b6e35c47eb88 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index 5fd34f8e6..308fb9835 100644
+index de29f04cb..49bdeb329 100644
@@ -27 +28 @@
-@@ -1487,5 +1487,4 @@ i40evf_dev_init(struct rte_eth_dev *eth_dev)
+@@ -1435,5 +1435,4 @@ i40evf_dev_init(struct rte_eth_dev *eth_dev)
@@ -33 +34 @@
-@@ -1505,4 +1504,5 @@ i40evf_dev_init(struct rte_eth_dev *eth_dev)
+@@ -1453,4 +1452,5 @@ i40evf_dev_init(struct rte_eth_dev *eth_dev)
@@ -40 +41 @@
-index 34aa6c814..692c3bab4 100644
+index 679357bf8..4285f8420 100644
@@ -43 +44 @@
-@@ -3169,5 +3169,6 @@ i40e_set_default_pctype_table(struct rte_eth_dev *dev)
+@@ -3175,5 +3175,6 @@ i40e_set_default_pctype_table(struct rte_eth_dev *dev)