patch 'net/ice: adjust timestamp mbuf register' 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/285bc0e2d1045e96d8b468dd2a948e3d6d0f6dea

Thanks.

Kevin

---
>From 285bc0e2d1045e96d8b468dd2a948e3d6d0f6dea Mon Sep 17 00:00:00 2001
From: Wenjing Qiao <wenjing.qiao at intel.com>
Date: Fri, 19 May 2023 03:12:16 -0400
Subject: [PATCH] net/ice: adjust timestamp mbuf register

[ upstream commit b16e1326048ea0c138cf794186985bb95eb7ff20 ]

Due to only support timestamp at port level, adjust
timestamp mbuf register to dev config.

Fixes: 953e74e6b73a ("net/ice: enable Rx timestamp on flex descriptor")

Signed-off-by: Wenjing Qiao <wenjing.qiao at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_ethdev.c | 10 ++++++++++
 drivers/net/ice/ice_rxtx.c   |  5 ++++-
 drivers/net/ice/ice_rxtx.h   |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index b0efacfd0f..e81a66b106 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -3562,4 +3562,14 @@ ice_dev_start(struct rte_eth_dev *dev)
 	}
 
+	if (dev->data->dev_conf.rxmode.offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP) {
+		/* Register mbuf field and flag for Rx timestamp */
+		ret = rte_mbuf_dyn_rx_timestamp_register(&ice_timestamp_dynfield_offset,
+							 &ice_timestamp_dynflag);
+		if (ret) {
+			PMD_DRV_LOG(ERR, "Cannot register mbuf field/flag for timestamp");
+			goto tx_err;
+		}
+	}
+
 	/* program Rx queues' context in hardware*/
 	for (nb_rxq = 0; nb_rxq < data->nb_rx_queues; nb_rxq++) {
diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index f0ca5557ce..c16443d0ce 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -299,5 +299,5 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq)
 	}
 
-	if (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP) {
+	if (!rxq->ts_enable && (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP)) {
 		/* Register mbuf field and flag for Rx timestamp */
 		err = rte_mbuf_dyn_rx_timestamp_register(
@@ -309,4 +309,5 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq)
 			return -EINVAL;
 		}
+		rxq->ts_enable = true;
 	}
 
@@ -594,4 +595,6 @@ ice_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)
 	}
 
+	if (dev->data->dev_conf.rxmode.offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP)
+		rxq->ts_enable = true;
 	err = ice_program_hw_rx_queue(rxq);
 	if (err) {
diff --git a/drivers/net/ice/ice_rxtx.h b/drivers/net/ice/ice_rxtx.h
index 1cc93c9d3c..2f0f050b58 100644
--- a/drivers/net/ice/ice_rxtx.h
+++ b/drivers/net/ice/ice_rxtx.h
@@ -104,4 +104,5 @@ struct ice_rx_queue {
 	uint32_t hw_time_low; /* low 32 bits of timestamp */
 	uint64_t hw_time_update; /* SW time of HW record updating */
+	bool ts_enable; /* if rxq timestamp is enabled */
 };
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-20 16:18:03.707256875 +0100
+++ 0073-net-ice-adjust-timestamp-mbuf-register.patch	2023-07-20 16:17:54.904751500 +0100
@@ -1 +1 @@
-From b16e1326048ea0c138cf794186985bb95eb7ff20 Mon Sep 17 00:00:00 2001
+From 285bc0e2d1045e96d8b468dd2a948e3d6d0f6dea Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b16e1326048ea0c138cf794186985bb95eb7ff20 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 5a581bd2ba..2b0a977ba9 100644
+index b0efacfd0f..e81a66b106 100644
@@ -24 +25 @@
-@@ -3692,4 +3692,14 @@ ice_dev_start(struct rte_eth_dev *dev)
+@@ -3562,4 +3562,14 @@ ice_dev_start(struct rte_eth_dev *dev)
@@ -40 +41 @@
-index 560c1a4af7..c998b0080a 100644
+index f0ca5557ce..c16443d0ce 100644
@@ -43 +44 @@
-@@ -275,5 +275,5 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq)
+@@ -299,5 +299,5 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq)
@@ -50 +51 @@
-@@ -285,4 +285,5 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq)
+@@ -309,4 +309,5 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq)
@@ -56 +57 @@
-@@ -672,4 +673,6 @@ ice_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)
+@@ -594,4 +595,6 @@ ice_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)
@@ -64 +65 @@
-index 89569029e1..268289716e 100644
+index 1cc93c9d3c..2f0f050b58 100644
@@ -67,3 +68,3 @@
-@@ -121,4 +121,5 @@ struct ice_rx_queue {
- 	struct rte_eth_rxseg_split rxseg[ICE_RX_MAX_NSEG];
- 	uint32_t rxseg_nb;
+@@ -104,4 +104,5 @@ struct ice_rx_queue {
+ 	uint32_t hw_time_low; /* low 32 bits of timestamp */
+ 	uint64_t hw_time_update; /* SW time of HW record updating */