3df1a1e306
The sequence of reading current RTC time register doesn't meet the hardware requirements, which causes this time obtained is the one before modifying RTC time.
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
From 3cd01cd12d4987b76be0ff1b25bc21a558aab6f1 Mon Sep 17 00:00:00 2001
|
|
From: Huisong Li <lihuisong@huawei.com>
|
|
Date: Mon, 9 Jan 2023 16:23:44 +0800
|
|
Subject: net/hns3: fix inaccurate RTC time to read
|
|
|
|
[ upstream commit 4243282181f38d387188af5fd38a5428864a94a2 ]
|
|
|
|
The sequence of reading current RTC time register doesn't meet
|
|
the hardware requirements, which causes this time obtained is
|
|
the one before modifying RTC time.
|
|
|
|
Fixes: 38b539d96eb6 ("net/hns3: support IEEE 1588 PTP")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Huisong Li <lihuisong@huawei.com>
|
|
Acked-by: Dongdong Liu <liudongdong3@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_ptp.c | 12 ++++++++----
|
|
1 file changed, 8 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_ptp.c b/drivers/net/hns3/hns3_ptp.c
|
|
index 6bbd85ba23..db3c007b12 100644
|
|
--- a/drivers/net/hns3/hns3_ptp.c
|
|
+++ b/drivers/net/hns3/hns3_ptp.c
|
|
@@ -216,17 +216,21 @@ hns3_timesync_read_tx_timestamp(struct rte_eth_dev *dev,
|
|
int
|
|
hns3_timesync_read_time(struct rte_eth_dev *dev, struct timespec *ts)
|
|
{
|
|
+#define HNS3_PTP_SEC_H_OFFSET 32
|
|
+#define HNS3_PTP_SEC_H_MASK 0xFFFF
|
|
+
|
|
struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
|
|
+ uint32_t sec_hi, sec_lo;
|
|
uint64_t ns, sec;
|
|
|
|
if (!hns3_dev_get_support(hw, PTP))
|
|
return -ENOTSUP;
|
|
|
|
- sec = hns3_read_dev(hw, HNS3_CURR_TIME_OUT_L);
|
|
- sec |= (uint64_t)(hns3_read_dev(hw, HNS3_CURR_TIME_OUT_H) & 0xFFFF)
|
|
- << 32;
|
|
-
|
|
ns = hns3_read_dev(hw, HNS3_CURR_TIME_OUT_NS);
|
|
+ sec_hi = hns3_read_dev(hw, HNS3_CURR_TIME_OUT_H) & HNS3_PTP_SEC_H_MASK;
|
|
+ sec_lo = hns3_read_dev(hw, HNS3_CURR_TIME_OUT_L);
|
|
+ sec = ((uint64_t)sec_hi << HNS3_PTP_SEC_H_OFFSET) | sec_lo;
|
|
+
|
|
ns += sec * NSEC_PER_SEC;
|
|
*ts = rte_ns_to_timespec(ns);
|
|
|
|
--
|
|
2.23.0
|
|
|