patches for DPDK stable branches
 help / color / mirror / Atom feed
* [PATCH] net/ice: fix incorrect Rx timestamp in Windows PTP
@ 2022-01-24  5:18 Simei Su
  2022-01-28  2:11 ` [PATCH v2] net/ice: fix missing clock initialization Simei Su
  0 siblings, 1 reply; 3+ messages in thread
From: Simei Su @ 2022-01-24  5:18 UTC (permalink / raw)
  To: qi.z.zhang, qiming.yang; +Cc: dev, Simei Su, stable

Rx PHY timer init value is not same as primary timer init value when
power up which will lead Rx timestamp always have big gap compared
with PTP timestamp. This patch adds PHC init time in initializing PTP
hardware clock.

Fixes: 646dcbe6c701 ("net/ice: support IEEE 1588 PTP")
Cc: stable@dpdk.org

Signed-off-by: Simei Su <simei.su@intel.com>
---
 drivers/net/ice/ice_ethdev.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 13a7a97..d57355d 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -5501,6 +5501,8 @@ ice_timesync_enable(struct rte_eth_dev *dev)
 	struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 	struct ice_adapter *ad =
 			ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+	uint64_t start_time;
+	struct timespec system_time;
 	int ret;
 
 	if (dev->data->dev_started && !(dev->data->dev_conf.rxmode.offloads &
@@ -5522,6 +5524,15 @@ ice_timesync_enable(struct rte_eth_dev *dev)
 				"Failed to write PHC increment time value");
 			return -1;
 		}
+
+		clock_gettime(CLOCK_MONOTONIC, &system_time);
+		start_time = system_time.tv_sec * NSEC_PER_SEC +
+			     system_time.tv_nsec;
+		ret = ice_ptp_init_time(hw, start_time);
+		if (ret) {
+			PMD_DRV_LOG(ERR, "Failed to write PHC initial time");
+			return -1;
+		}
 	}
 
 	/* Initialize cycle counters for system time/RX/TX timestamp */
-- 
2.9.5


^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH v2] net/ice: fix missing clock initialization
  2022-01-24  5:18 [PATCH] net/ice: fix incorrect Rx timestamp in Windows PTP Simei Su
@ 2022-01-28  2:11 ` Simei Su
  2022-02-11  6:41   ` [PATCH v3] " Simei Su
  0 siblings, 1 reply; 3+ messages in thread
From: Simei Su @ 2022-01-28  2:11 UTC (permalink / raw)
  To: qi.z.zhang, qiming.yang; +Cc: dev, Simei Su, stable

Rx PHY timer init value is not same as primary timer init value when
power up which will lead Rx timestamp always have big gap compared
with PTP timestamp. This patch adds PHC init time in initializing PTP
hardware clock.

Fixes: 646dcbe6c701 ("net/ice: support IEEE 1588 PTP")
Cc: stable@dpdk.org

Signed-off-by: Simei Su <simei.su@intel.com>
---
v2:
* Rename commit title.

 drivers/net/ice/ice_ethdev.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index d01acb8..dbf822e 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -5661,6 +5661,8 @@ ice_timesync_enable(struct rte_eth_dev *dev)
 	struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 	struct ice_adapter *ad =
 			ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+	uint64_t start_time;
+	struct timespec system_time;
 	int ret;
 
 	if (dev->data->dev_started && !(dev->data->dev_conf.rxmode.offloads &
@@ -5682,6 +5684,15 @@ ice_timesync_enable(struct rte_eth_dev *dev)
 				"Failed to write PHC increment time value");
 			return -1;
 		}
+
+		clock_gettime(CLOCK_MONOTONIC, &system_time);
+		start_time = system_time.tv_sec * NSEC_PER_SEC +
+			     system_time.tv_nsec;
+		ret = ice_ptp_init_time(hw, start_time);
+		if (ret) {
+			PMD_DRV_LOG(ERR, "Failed to write PHC initial time");
+			return -1;
+		}
 	}
 
 	/* Initialize cycle counters for system time/RX/TX timestamp */
-- 
2.9.5


^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH v3] net/ice: fix missing clock initialization
  2022-01-28  2:11 ` [PATCH v2] net/ice: fix missing clock initialization Simei Su
@ 2022-02-11  6:41   ` Simei Su
  0 siblings, 0 replies; 3+ messages in thread
From: Simei Su @ 2022-02-11  6:41 UTC (permalink / raw)
  To: qi.z.zhang, qiming.yang; +Cc: dev, Simei Su, stable

Rx PHY timer init value is not same as primary timer init value when
power up which will lead Rx timestamp always have big gap compared
with PTP timestamp. This patch adds PHC init time in initializing PTP
hardware clock.

Fixes: 646dcbe6c701 ("net/ice: support IEEE 1588 PTP")
Cc: stable@dpdk.org

Signed-off-by: Simei Su <simei.su@intel.com>
---
v3:
* Fix use of undeclared identifier 'CLOCK_MONOTONIC'.

v2:
* Rename commit title.

 drivers/net/ice/ice_ethdev.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 1a469af..dcecf69 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 #include <unistd.h>
 
 #include <rte_tailq.h>
@@ -5662,6 +5663,8 @@ ice_timesync_enable(struct rte_eth_dev *dev)
 	struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 	struct ice_adapter *ad =
 			ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+	uint64_t start_time;
+	struct timespec system_time;
 	int ret;
 
 	if (dev->data->dev_started && !(dev->data->dev_conf.rxmode.offloads &
@@ -5683,6 +5686,15 @@ ice_timesync_enable(struct rte_eth_dev *dev)
 				"Failed to write PHC increment time value");
 			return -1;
 		}
+
+		clock_gettime(CLOCK_MONOTONIC, &system_time);
+		start_time = system_time.tv_sec * NSEC_PER_SEC +
+			     system_time.tv_nsec;
+		ret = ice_ptp_init_time(hw, start_time);
+		if (ret) {
+			PMD_DRV_LOG(ERR, "Failed to write PHC initial time");
+			return -1;
+		}
 	}
 
 	/* Initialize cycle counters for system time/RX/TX timestamp */
-- 
2.9.5


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-02-11  7:00 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-24  5:18 [PATCH] net/ice: fix incorrect Rx timestamp in Windows PTP Simei Su
2022-01-28  2:11 ` [PATCH v2] net/ice: fix missing clock initialization Simei Su
2022-02-11  6:41   ` [PATCH v3] " Simei Su

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).