[dpdk-stable] patch 'net/ice: fix Rx offload flags in SSE path' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

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/11/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/e72c273e839add5b0b85e9495c2db0bf5690a9af

Thanks.

Luca Boccassi

---
>From e72c273e839add5b0b85e9495c2db0bf5690a9af Mon Sep 17 00:00:00 2001
From: Alvin Zhang <alvinx.zhang at intel.com>
Date: Fri, 23 Oct 2020 10:13:22 +0800
Subject: [PATCH] net/ice: fix Rx offload flags in SSE path

[ upstream commit bdc027118814781740065d962ce3dcb39ecebea0 ]

Update reading offload flags of last two of four packets.

Fixes: ece1f8a8f1c8 ("net/ice: switch to flexible descriptor in SSE path")

Signed-off-by: Alvin Zhang <alvinx.zhang at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_rxtx_vec_sse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ice/ice_rxtx_vec_sse.c b/drivers/net/ice/ice_rxtx_vec_sse.c
index cfa65aae91..af7286783d 100644
--- a/drivers/net/ice/ice_rxtx_vec_sse.c
+++ b/drivers/net/ice/ice_rxtx_vec_sse.c
@@ -140,7 +140,7 @@ ice_rx_desc_to_olflags_v(struct ice_rx_queue *rxq, __m128i descs[4],
 	flags = _mm_unpackhi_epi32(descs[0], descs[1]);
 	tmp_desc = _mm_unpackhi_epi32(descs[2], descs[3]);
 	tmp_desc = _mm_unpacklo_epi64(flags, tmp_desc);
-	tmp_desc = _mm_and_si128(flags, desc_mask);
+	tmp_desc = _mm_and_si128(tmp_desc, desc_mask);
 
 	/* checksum flags */
 	tmp_desc = _mm_srli_epi32(tmp_desc, 4);
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-09 18:40:13.315334017 +0000
+++ 0055-net-ice-fix-Rx-offload-flags-in-SSE-path.patch	2020-11-09 18:40:11.187312154 +0000
@@ -1 +1 @@
-From bdc027118814781740065d962ce3dcb39ecebea0 Mon Sep 17 00:00:00 2001
+From e72c273e839add5b0b85e9495c2db0bf5690a9af Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bdc027118814781740065d962ce3dcb39ecebea0 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index e950c1b922..626364719b 100644
+index cfa65aae91..af7286783d 100644
@@ -21 +22 @@
-@@ -159,7 +159,7 @@ ice_rx_desc_to_olflags_v(struct ice_rx_queue *rxq, __m128i descs[4],
+@@ -140,7 +140,7 @@ ice_rx_desc_to_olflags_v(struct ice_rx_queue *rxq, __m128i descs[4],