* [PATCH] net/hns3: fix inaccurate RTC time to read
@ 2023-01-09 8:23 Huisong Li
2023-01-13 6:49 ` Dongdong Liu
0 siblings, 1 reply; 3+ messages in thread
From: Huisong Li @ 2023-01-09 8:23 UTC (permalink / raw)
To: dev; +Cc: andrew.rybchenko, ferruh.yigit, huangdaode, liudongdong3, lihuisong
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>
---
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.22.0
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] net/hns3: fix inaccurate RTC time to read
2023-01-09 8:23 [PATCH] net/hns3: fix inaccurate RTC time to read Huisong Li
@ 2023-01-13 6:49 ` Dongdong Liu
2023-01-13 11:05 ` Ferruh Yigit
0 siblings, 1 reply; 3+ messages in thread
From: Dongdong Liu @ 2023-01-13 6:49 UTC (permalink / raw)
To: Huisong Li, dev; +Cc: andrew.rybchenko, ferruh.yigit, huangdaode
Hi Huisong
On 2023/1/9 16:23, Huisong Li wrote:
> 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>
Thanks,
Dongdong
> ---
> 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);
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] net/hns3: fix inaccurate RTC time to read
2023-01-13 6:49 ` Dongdong Liu
@ 2023-01-13 11:05 ` Ferruh Yigit
0 siblings, 0 replies; 3+ messages in thread
From: Ferruh Yigit @ 2023-01-13 11:05 UTC (permalink / raw)
To: Dongdong Liu, Huisong Li, dev; +Cc: andrew.rybchenko, huangdaode
On 1/13/2023 6:49 AM, Dongdong Liu wrote:
> Hi Huisong
>
> On 2023/1/9 16:23, Huisong Li wrote:
>> 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>
>
Applied to dpdk-next-net/main, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-13 11:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-09 8:23 [PATCH] net/hns3: fix inaccurate RTC time to read Huisong Li
2023-01-13 6:49 ` Dongdong Liu
2023-01-13 11:05 ` Ferruh Yigit
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).