* [PATCH v1] net/ice: fix incorrect reading of PHY timestamp
@ 2024-10-11 13:00 Soumyadeep Hore
2024-10-25 5:14 ` [PATCH v2] " Soumyadeep Hore
0 siblings, 1 reply; 6+ messages in thread
From: Soumyadeep Hore @ 2024-10-11 13:00 UTC (permalink / raw)
To: bruce.richardson, aman.deep.singh; +Cc: dev, shaiq.wani, stable
In ICE PMD, previously the ready bitmap checking before reading
PHY timestamp was not present. This caused incorrect Tx
timestamping.
The ready bitmap checking is enabled and PHY timestamp is read once
the ready bitmap gives positive value.
Fixes: 881169950d80 ("net/ice/base: implement initial PTP support for E830")
Cc: stable@dpdk.org
Signed-off-by: Soumyadeep Hore <soumyadeep.hore@intel.com>
---
drivers/net/ice/ice_ethdev.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 7b1bd163a2..2357d6e1da 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -6516,14 +6516,32 @@ ice_timesync_read_tx_timestamp(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);
+ struct ice_tx_queue *txq;
uint8_t lport;
- uint64_t ts_ns, ns, tstamp;
+ uint64_t ts_ns, ns, tstamp, tstamp_ready = 0;
+ uint64_t start_time, curr_time;
const uint64_t mask = 0xFFFFFFFF;
int ret;
+ txq = dev->data->tx_queues[0];
lport = hw->port_info->lport;
- ret = ice_read_phy_tstamp(hw, lport, 0, &tstamp);
+ start_time = rte_get_timer_cycles() / (rte_get_timer_hz() / 1000);
+
+ while (!(tstamp_ready & BIT_ULL(0))) {
+ ret = ice_get_phy_tx_tstamp_ready(hw, lport, &tstamp_ready);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "Failed to get phy ready for timestamp");
+ return -1;
+ }
+ curr_time = rte_get_timer_cycles() / (rte_get_timer_hz() / 1000);
+ if (curr_time - start_time > 1000) {
+ PMD_DRV_LOG(ERR, "Timeout to get phy ready for timestamp");
+ return -1;
+ }
+ }
+
+ ret = ice_read_phy_tstamp(hw, lport, txq->queue_id, &tstamp);
if (ret) {
PMD_DRV_LOG(ERR, "Failed to read phy timestamp");
return -1;
--
2.43.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] net/ice: fix incorrect reading of PHY timestamp
2024-10-11 13:00 [PATCH v1] net/ice: fix incorrect reading of PHY timestamp Soumyadeep Hore
@ 2024-10-25 5:14 ` Soumyadeep Hore
2024-10-25 7:32 ` [PATCH v3] " Soumyadeep Hore
2024-10-25 7:50 ` [PATCH v4] " Soumyadeep Hore
0 siblings, 2 replies; 6+ messages in thread
From: Soumyadeep Hore @ 2024-10-25 5:14 UTC (permalink / raw)
To: bruce.richardson, aman.deep.singh; +Cc: dev, shaiq.wani, stable
In ICE PMD, previously the ready bitmap checking before reading
PHY timestamp was not present. This caused incorrect Tx
timestamping.
The ready bitmap checking is enabled and PHY timestamp is read once
the ready bitmap gives positive value.
Fixes: 881169950d80 ("net/ice/base: implement initial PTP support for E830")
Cc: stable@dpdk.org
Signed-off-by: Soumyadeep Hore <soumyadeep.hore@intel.com>
---
drivers/net/ice/ice_ethdev.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 7b1bd163a2..e0db47cf28 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -6517,12 +6517,28 @@ ice_timesync_read_tx_timestamp(struct rte_eth_dev *dev,
struct ice_adapter *ad =
ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
uint8_t lport;
- uint64_t ts_ns, ns, tstamp;
+ uint64_t ts_ns, ns, tstamp, tstamp_ready = 0;
+ uint64_t start_time, curr_time;
const uint64_t mask = 0xFFFFFFFF;
int ret;
lport = hw->port_info->lport;
+ start_time = rte_get_timer_cycles() / (rte_get_timer_hz() / 1000);
+
+ while (!(tstamp_ready & BIT_ULL(0))) {
+ ret = ice_get_phy_tx_tstamp_ready(hw, lport, &tstamp_ready);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "Failed to get phy ready for timestamp");
+ return -1;
+ }
+ curr_time = rte_get_timer_cycles() / (rte_get_timer_hz() / 1000);
+ if (curr_time - start_time > 1000) {
+ PMD_DRV_LOG(ERR, "Timeout to get phy ready for timestamp");
+ return -1;
+ }
+ }
+
ret = ice_read_phy_tstamp(hw, lport, 0, &tstamp);
if (ret) {
PMD_DRV_LOG(ERR, "Failed to read phy timestamp");
--
2.43.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3] net/ice: fix incorrect reading of PHY timestamp
2024-10-25 5:14 ` [PATCH v2] " Soumyadeep Hore
@ 2024-10-25 7:32 ` Soumyadeep Hore
2024-10-25 8:55 ` Bruce Richardson
2024-10-25 7:50 ` [PATCH v4] " Soumyadeep Hore
1 sibling, 1 reply; 6+ messages in thread
From: Soumyadeep Hore @ 2024-10-25 7:32 UTC (permalink / raw)
To: bruce.richardson, aman.deep.singh; +Cc: dev, shaiq.wani, stable
In ICE PMD, previously the ready bitmap checking before reading
PHY timestamp was not present. This caused incorrect Tx
timestamping.
The ready bitmap checking is enabled and PHY timestamp is read once
the ready bitmap gives positive value.
Fixes: 881169950d80 ("net/ice/base: implement initial PTP support for E830")
Cc: stable@dpdk.org
Signed-off-by: Soumyadeep Hore <soumyadeep.hore@intel.com>
---
drivers/net/ice/ice_ethdev.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 7b1bd163a2..e0db47cf28 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -6517,12 +6517,28 @@ ice_timesync_read_tx_timestamp(struct rte_eth_dev *dev,
struct ice_adapter *ad =
ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
uint8_t lport;
- uint64_t ts_ns, ns, tstamp;
+ uint64_t ts_ns, ns, tstamp, tstamp_ready = 0;
+ uint64_t start_time, curr_time;
const uint64_t mask = 0xFFFFFFFF;
int ret;
lport = hw->port_info->lport;
+ start_time = rte_get_timer_cycles() / (rte_get_timer_hz() / 1000);
+
+ while (!(tstamp_ready & BIT_ULL(0))) {
+ ret = ice_get_phy_tx_tstamp_ready(hw, lport, &tstamp_ready);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "Failed to get phy ready for timestamp");
+ return -1;
+ }
+ curr_time = rte_get_timer_cycles() / (rte_get_timer_hz() / 1000);
+ if (curr_time - start_time > 1000) {
+ PMD_DRV_LOG(ERR, "Timeout to get phy ready for timestamp");
+ return -1;
+ }
+ }
+
ret = ice_read_phy_tstamp(hw, lport, 0, &tstamp);
if (ret) {
PMD_DRV_LOG(ERR, "Failed to read phy timestamp");
--
2.43.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v4] net/ice: fix incorrect reading of PHY timestamp
2024-10-25 5:14 ` [PATCH v2] " Soumyadeep Hore
2024-10-25 7:32 ` [PATCH v3] " Soumyadeep Hore
@ 2024-10-25 7:50 ` Soumyadeep Hore
2024-10-25 9:02 ` Bruce Richardson
1 sibling, 1 reply; 6+ messages in thread
From: Soumyadeep Hore @ 2024-10-25 7:50 UTC (permalink / raw)
To: bruce.richardson, aman.deep.singh; +Cc: dev, shaiq.wani, stable
In ICE PMD, previously the ready bitmap checking before reading
PHY timestamp was not present. This caused incorrect Tx
timestamping.
The ready bitmap checking is enabled and PHY timestamp is read once
the ready bitmap gives positive value.
Fixes: 881169950d80 ("net/ice/base: implement initial PTP support for E830")
Cc: stable@dpdk.org
Signed-off-by: Soumyadeep Hore <soumyadeep.hore@intel.com>
---
drivers/net/ice/ice_ethdev.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 7b1bd163a2..e0db47cf28 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -6517,12 +6517,28 @@ ice_timesync_read_tx_timestamp(struct rte_eth_dev *dev,
struct ice_adapter *ad =
ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
uint8_t lport;
- uint64_t ts_ns, ns, tstamp;
+ uint64_t ts_ns, ns, tstamp, tstamp_ready = 0;
+ uint64_t start_time, curr_time;
const uint64_t mask = 0xFFFFFFFF;
int ret;
lport = hw->port_info->lport;
+ start_time = rte_get_timer_cycles() / (rte_get_timer_hz() / 1000);
+
+ while (!(tstamp_ready & BIT_ULL(0))) {
+ ret = ice_get_phy_tx_tstamp_ready(hw, lport, &tstamp_ready);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "Failed to get phy ready for timestamp");
+ return -1;
+ }
+ curr_time = rte_get_timer_cycles() / (rte_get_timer_hz() / 1000);
+ if (curr_time - start_time > 1000) {
+ PMD_DRV_LOG(ERR, "Timeout to get phy ready for timestamp");
+ return -1;
+ }
+ }
+
ret = ice_read_phy_tstamp(hw, lport, 0, &tstamp);
if (ret) {
PMD_DRV_LOG(ERR, "Failed to read phy timestamp");
--
2.43.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3] net/ice: fix incorrect reading of PHY timestamp
2024-10-25 7:32 ` [PATCH v3] " Soumyadeep Hore
@ 2024-10-25 8:55 ` Bruce Richardson
0 siblings, 0 replies; 6+ messages in thread
From: Bruce Richardson @ 2024-10-25 8:55 UTC (permalink / raw)
To: Soumyadeep Hore; +Cc: aman.deep.singh, dev, shaiq.wani, stable
On Fri, Oct 25, 2024 at 07:32:11AM +0000, Soumyadeep Hore wrote:
> In ICE PMD, previously the ready bitmap checking before reading
> PHY timestamp was not present. This caused incorrect Tx
> timestamping.
>
> The ready bitmap checking is enabled and PHY timestamp is read once
> the ready bitmap gives positive value.
>
> Fixes: 881169950d80 ("net/ice/base: implement initial PTP support for E830")
> Cc: stable@dpdk.org
>
> Signed-off-by: Soumyadeep Hore <soumyadeep.hore@intel.com>
> ---
> drivers/net/ice/ice_ethdev.c | 18 +++++++++++++++++-
> 1 file changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
> index 7b1bd163a2..e0db47cf28 100644
> --- a/drivers/net/ice/ice_ethdev.c
> +++ b/drivers/net/ice/ice_ethdev.c
> @@ -6517,12 +6517,28 @@ ice_timesync_read_tx_timestamp(struct rte_eth_dev *dev,
> struct ice_adapter *ad =
> ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
> uint8_t lport;
> - uint64_t ts_ns, ns, tstamp;
> + uint64_t ts_ns, ns, tstamp, tstamp_ready = 0;
> + uint64_t start_time, curr_time;
> const uint64_t mask = 0xFFFFFFFF;
> int ret;
>
> lport = hw->port_info->lport;
>
> + start_time = rte_get_timer_cycles() / (rte_get_timer_hz() / 1000);
Why all the division by 1000?
> +
> + while (!(tstamp_ready & BIT_ULL(0))) {
> + ret = ice_get_phy_tx_tstamp_ready(hw, lport, &tstamp_ready);
> + if (ret) {
> + PMD_DRV_LOG(ERR, "Failed to get phy ready for timestamp");
> + return -1;
> + }
> + curr_time = rte_get_timer_cycles() / (rte_get_timer_hz() / 1000);
> + if (curr_time - start_time > 1000) {
Is 1 second not a very long time to wait for this? Surely even milliseconds
is a very long delay in this case.
In terms of the logic, rather than constantly comparing vs the start time
and doing lots of division, I think it would be simpler to just set a max
end-time. For example, to keep the current 1s limit:
uint64_t end_time = rte_get_timer_cycles?() + rte_get_timer_hz()
...
if (rte_get_timer_cycles() > end_time) {
...
}
> + PMD_DRV_LOG(ERR, "Timeout to get phy ready for timestamp");
> + return -1;
> + }
> + }
> +
> ret = ice_read_phy_tstamp(hw, lport, 0, &tstamp);
> if (ret) {
> PMD_DRV_LOG(ERR, "Failed to read phy timestamp");
> --
> 2.43.0
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v4] net/ice: fix incorrect reading of PHY timestamp
2024-10-25 7:50 ` [PATCH v4] " Soumyadeep Hore
@ 2024-10-25 9:02 ` Bruce Richardson
0 siblings, 0 replies; 6+ messages in thread
From: Bruce Richardson @ 2024-10-25 9:02 UTC (permalink / raw)
To: Soumyadeep Hore; +Cc: aman.deep.singh, dev, shaiq.wani, stable
On Fri, Oct 25, 2024 at 07:50:25AM +0000, Soumyadeep Hore wrote:
> In ICE PMD, previously the ready bitmap checking before reading
> PHY timestamp was not present. This caused incorrect Tx
> timestamping.
>
> The ready bitmap checking is enabled and PHY timestamp is read once
> the ready bitmap gives positive value.
>
> Fixes: 881169950d80 ("net/ice/base: implement initial PTP support for E830")
> Cc: stable@dpdk.org
>
> Signed-off-by: Soumyadeep Hore <soumyadeep.hore@intel.com>
> ---
> drivers/net/ice/ice_ethdev.c | 18 +++++++++++++++++-
> 1 file changed, 17 insertions(+), 1 deletion(-)
>
Hi Soumyadeep,
see review I made on the previous version. Also, when sending new revisions
- especially if there hasn't been previous on-list review, please include
below the cutline a summary of what has changed from previous version.
Thanks,
/Bruce
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-10-25 9:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-10-11 13:00 [PATCH v1] net/ice: fix incorrect reading of PHY timestamp Soumyadeep Hore
2024-10-25 5:14 ` [PATCH v2] " Soumyadeep Hore
2024-10-25 7:32 ` [PATCH v3] " Soumyadeep Hore
2024-10-25 8:55 ` Bruce Richardson
2024-10-25 7:50 ` [PATCH v4] " Soumyadeep Hore
2024-10-25 9:02 ` Bruce Richardson
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).