From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 50BC441D52 for ; Thu, 23 Feb 2023 16:07:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4CE2043221; Thu, 23 Feb 2023 16:07:15 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 27A5F4321C for ; Thu, 23 Feb 2023 16:07:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5etg30HKWKgscZE3c6pKQPJHoHqvArLqG/+skHX2ves=; b=XtRXEm8tq5pJcglVwe8E0zLeD9ZVXtADXCYlDY6OZakhugIs+NC1O26QBMtBrX1SnoOtFW OwQ4yfw7+tGxDTIQ/TnPvgNhprPnNsZdvAWRF43+TAyVvSG+D9GiD+0+Wn0i+tveFeIjr+ nbG33YKubB+BrDCAEUf8UfQ7SSgtT/k= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-358-j_6YjIhMM52LSbo0JZlJGQ-1; Thu, 23 Feb 2023 10:07:08 -0500 X-MC-Unique: j_6YjIhMM52LSbo0JZlJGQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B1CEC3C0F686; Thu, 23 Feb 2023 15:07:06 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0D9982166B29; Thu, 23 Feb 2023 15:07:05 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix inaccurate RTC time to read' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:05:05 +0000 Message-Id: <20230223150631.723699-14-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/28/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/f43191608a6ed14b030696e008187217f5476357 Thanks. Kevin --- >From f43191608a6ed14b030696e008187217f5476357 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Mon, 9 Jan 2023 16:23:44 +0800 Subject: [PATCH] net/hns3: fix inaccurate RTC time to read [ upstream commit 6170abd5c0cc3d8cf4e358c4200ed7737d639d10 ] 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") Signed-off-by: Huisong Li Acked-by: Dongdong Liu --- 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 @@ -217,5 +217,9 @@ 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; @@ -223,9 +227,9 @@ hns3_timesync_read_time(struct rte_eth_dev *dev, struct timespec *ts) 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.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:24.194725863 +0000 +++ 0014-net-hns3-fix-inaccurate-RTC-time-to-read.patch 2023-02-23 14:46:23.714235771 +0000 @@ -1 +1 @@ -From 6170abd5c0cc3d8cf4e358c4200ed7737d639d10 Mon Sep 17 00:00:00 2001 +From f43191608a6ed14b030696e008187217f5476357 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6170abd5c0cc3d8cf4e358c4200ed7737d639d10 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org