patch 'net/ice: fix timestamp enabling' has been queued to stable release 21.11.5

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.5

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/25/23. 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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/634cd44ea096f2c456bc63b3077c6ce0a0f92ca3

Thanks.

Kevin

---
>From 634cd44ea096f2c456bc63b3077c6ce0a0f92ca3 Mon Sep 17 00:00:00 2001
From: Wenjing Qiao <wenjing.qiao at intel.com>
Date: Fri, 19 May 2023 02:47:38 -0400
Subject: [PATCH] net/ice: fix timestamp enabling

[ upstream commit 71021636964dcd074ff2ee1663dc67ec830e6a14 ]

Use the following command:
1. dpdk-testpmd -c 0x3 -n 4 --force-max-simd-bitwidth=64
   -- -i --enable-rx-timestamp
2. port stop 0
3. port config 0 rx_offload timestamp off
4. port start 0
Then start it, log will show timestamp info, which should
not appear. Because ice_timestamp_dynflag is still more
than 0, code will still calculate timestamp. So fix it.

Fixes: f9c561ffbccc ("net/ice: fix performance for Rx timestamp")

Signed-off-by: Wenjing Qiao <wenjing.qiao at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_rxtx.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index c16443d0ce..9ad8793709 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -1638,5 +1638,6 @@ ice_rx_scan_hw_ring(struct ice_rx_queue *rxq)
 			rxd_to_pkt_fields_ops[rxq->rxdid](rxq, mb, &rxdp[j]);
 #ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC
-			if (ice_timestamp_dynflag > 0) {
+			if (ice_timestamp_dynflag > 0 &&
+			    (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP)) {
 				rxq->time_high =
 				rte_le_to_cpu_32(rxdp[j].wb.flex_ts.ts_high);
@@ -1985,5 +1986,6 @@ ice_recv_scattered_pkts(void *rx_queue,
 		pkt_flags = ice_rxd_error_to_pkt_flags(rx_stat_err0);
 #ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC
-		if (ice_timestamp_dynflag > 0) {
+		if (ice_timestamp_dynflag > 0 &&
+		    (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP)) {
 			rxq->time_high =
 			   rte_le_to_cpu_32(rxd.wb.flex_ts.ts_high);
@@ -2436,5 +2438,6 @@ ice_recv_pkts(void *rx_queue,
 		pkt_flags = ice_rxd_error_to_pkt_flags(rx_stat_err0);
 #ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC
-		if (ice_timestamp_dynflag > 0) {
+		if (ice_timestamp_dynflag > 0 &&
+		    (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP)) {
 			rxq->time_high =
 			   rte_le_to_cpu_32(rxd.wb.flex_ts.ts_high);
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-20 16:18:03.874275327 +0100
+++ 0074-net-ice-fix-timestamp-enabling.patch	2023-07-20 16:17:54.910751525 +0100
@@ -1 +1 @@
-From 71021636964dcd074ff2ee1663dc67ec830e6a14 Mon Sep 17 00:00:00 2001
+From 634cd44ea096f2c456bc63b3077c6ce0a0f92ca3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 71021636964dcd074ff2ee1663dc67ec830e6a14 ]
+
@@ -17 +18,0 @@
-Cc: stable at dpdk.org
@@ -26 +27 @@
-index c998b0080a..7b6784b177 100644
+index c16443d0ce..9ad8793709 100644
@@ -29 +30 @@
-@@ -1766,5 +1766,6 @@ ice_rx_scan_hw_ring(struct ice_rx_queue *rxq)
+@@ -1638,5 +1638,6 @@ ice_rx_scan_hw_ring(struct ice_rx_queue *rxq)
@@ -37 +38 @@
-@@ -2132,5 +2133,6 @@ ice_recv_scattered_pkts(void *rx_queue,
+@@ -1985,5 +1986,6 @@ ice_recv_scattered_pkts(void *rx_queue,
@@ -45 +46 @@
-@@ -2622,5 +2624,6 @@ ice_recv_pkts(void *rx_queue,
+@@ -2436,5 +2438,6 @@ ice_recv_pkts(void *rx_queue,