Enabling IEEE1588 timesync on a running ice port requires the Rx
timestamp offload to be configured. Previously, having that offload
always made the driver use the scalar Rx path, which is the only path
that sets the PTP mbuf flags. Since Rx timestamp support was added to
the AVX2 and AVX-512 Rx paths, a vector path can now be selected with
the offload enabled. Timesync then gets enabled after port start, and
PTP packets are received without the IEEE1588 PTP and timestamp flags
set.

Remove the timestamp offload from the vector Rx path masks so that
requesting it selects a scalar Rx path again. Flag can be re-added once
PTP support has also been added in the vector paths.

Fixes: 332eb4ec8ff0 ("net/ice: support Rx timestamp offload on vector path")

Signed-off-by: Bruce Richardson <[email protected]>
---
 doc/guides/nics/features/ice.ini       | 2 +-
 doc/guides/rel_notes/release_26_11.rst | 2 --
 drivers/net/intel/ice/ice_rxtx.c       | 8 ++++----
 drivers/net/intel/ice/ice_rxtx.h       | 4 ----
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/doc/guides/nics/features/ice.ini b/doc/guides/nics/features/ice.ini
index ebc516303b..68c7f48ff0 100644
--- a/doc/guides/nics/features/ice.ini
+++ b/doc/guides/nics/features/ice.ini
@@ -37,7 +37,7 @@ VLAN offload         = Y
 QinQ offload         = P
 L3 checksum offload  = Y
 L4 checksum offload  = Y
-Timestamp offload    = Y
+Timestamp offload    = P
 Inner L3 checksum    = Y
 Inner L4 checksum    = Y
 Packet type parsing  = Y
diff --git a/doc/guides/rel_notes/release_26_11.rst 
b/doc/guides/rel_notes/release_26_11.rst
index d3ab3662dd..270ff9af4f 100644
--- a/doc/guides/rel_notes/release_26_11.rst
+++ b/doc/guides/rel_notes/release_26_11.rst
@@ -187,8 +187,6 @@ New Features
   * Added support for Tx rate limiting per queue.
   * Made the existing diagnostic dump functions available
     through the public ``rte_pmd_ice.h`` header.
-  * Added support for the Rx hardware timestamp offload
-    (``RTE_ETH_RX_OFFLOAD_TIMESTAMP``) in the AVX2 and AVX512 vector Rx paths.
 
 * **Updated Intel ixgbe driver.**
 
diff --git a/drivers/net/intel/ice/ice_rxtx.c b/drivers/net/intel/ice/ice_rxtx.c
index 6f19e070ee..4016e5f8d4 100644
--- a/drivers/net/intel/ice/ice_rxtx.c
+++ b/drivers/net/intel/ice/ice_rxtx.c
@@ -3317,7 +3317,7 @@ static const struct ci_rx_path_info ice_rx_path_infos[] = 
{
                .pkt_burst = ice_recv_pkts_vec_avx2_offload,
                .info = "Offload Vector AVX2",
                .features = {
-                       .rx_offloads = ICE_RX_VECTOR_OFFLOAD_TS_OFFLOADS,
+                       .rx_offloads = ICE_RX_VECTOR_OFFLOAD_OFFLOADS,
                        .simd_width = RTE_VECT_SIMD_256,
                        .bulk_alloc = true
                }
@@ -3326,7 +3326,7 @@ static const struct ci_rx_path_info ice_rx_path_infos[] = 
{
                .pkt_burst = ice_recv_scattered_pkts_vec_avx2_offload,
                .info = "Offload Vector AVX2 Scattered",
                .features = {
-                       .rx_offloads = ICE_RX_VECTOR_OFFLOAD_TS_OFFLOADS,
+                       .rx_offloads = ICE_RX_VECTOR_OFFLOAD_OFFLOADS,
                        .simd_width = RTE_VECT_SIMD_256,
                        .scattered = true,
                        .bulk_alloc = true
@@ -3356,7 +3356,7 @@ static const struct ci_rx_path_info ice_rx_path_infos[] = 
{
                .pkt_burst = ice_recv_pkts_vec_avx512_offload,
                .info = "Offload Vector AVX512",
                .features = {
-                       .rx_offloads = ICE_RX_VECTOR_OFFLOAD_TS_OFFLOADS,
+                       .rx_offloads = ICE_RX_VECTOR_OFFLOAD_OFFLOADS,
                        .simd_width = RTE_VECT_SIMD_512,
                        .bulk_alloc = true
                }
@@ -3365,7 +3365,7 @@ static const struct ci_rx_path_info ice_rx_path_infos[] = 
{
                .pkt_burst = ice_recv_scattered_pkts_vec_avx512_offload,
                .info = "Offload Vector AVX512 Scattered",
                .features = {
-                       .rx_offloads = ICE_RX_VECTOR_OFFLOAD_TS_OFFLOADS,
+                       .rx_offloads = ICE_RX_VECTOR_OFFLOAD_OFFLOADS,
                        .simd_width = RTE_VECT_SIMD_512,
                        .scattered = true,
                        .bulk_alloc = true
diff --git a/drivers/net/intel/ice/ice_rxtx.h b/drivers/net/intel/ice/ice_rxtx.h
index 3332053d3d..abbcee9fe0 100644
--- a/drivers/net/intel/ice/ice_rxtx.h
+++ b/drivers/net/intel/ice/ice_rxtx.h
@@ -109,10 +109,6 @@
                RTE_ETH_RX_OFFLOAD_VLAN_STRIP | \
                RTE_ETH_RX_OFFLOAD_VLAN_FILTER |\
                RTE_ETH_RX_OFFLOAD_RSS_HASH)
-/* vector offload paths that also support Rx timestamp (AVX2/AVX512 only) */
-#define ICE_RX_VECTOR_OFFLOAD_TS_OFFLOADS (    \
-               ICE_RX_VECTOR_OFFLOAD_OFFLOADS |\
-               RTE_ETH_RX_OFFLOAD_TIMESTAMP)
 
 /* basic scalar path */
 #define ICE_TX_SCALAR_OFFLOADS (               \
-- 
2.55.0

Reply via email to