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 0822042ECF for ; Thu, 20 Jul 2023 17:22:37 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 04255410FB; Thu, 20 Jul 2023 17:22:37 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id BDE6C40685 for ; Thu, 20 Jul 2023 17:22:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866554; 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=+MK9f9LmBwCEk44ZOMPNuFp0PaiembqJg/ResJS12hE=; b=K76i2r2u+ZjLTbfnD9DwcIEQJQM+2T3iIiA8UP9FYClLRf7nWuFzookgmIKwhBAXkpDEP+ jtrHVj3BL5xMPkfQGLFxIhe8kMEj7u8X0CIGLevSVxHLlVX8O79MafLEFWqHfTMhivTbDd YZdWQktFPKGQVMRR7s6PJ2etND0RIWk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-299-H5eA-ll2OPKzLCmoMbVjMw-1; Thu, 20 Jul 2023 11:21:24 -0400 X-MC-Unique: H5eA-ll2OPKzLCmoMbVjMw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BF301106522B; Thu, 20 Jul 2023 15:20:53 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id B5816492C13; Thu, 20 Jul 2023 15:20:52 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix RTC time on initialization' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:17:49 +0100 Message-ID: <20230720151942.262154-38-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/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/bf28f06d51f5449623f36474ec2a42186fbb3a58 Thanks. Kevin --- >From bf28f06d51f5449623f36474ec2a42186fbb3a58 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Fri, 2 Jun 2023 19:41:55 +0800 Subject: [PATCH] net/hns3: fix RTC time on initialization [ upstream commit f901c570e50d042f466de29b186db68e177f93ab ] Driver doesn't initialize RTC time during probe phase, which lead to an inaccurate time. Fixes: 38b539d96eb6 ("net/hns3: support IEEE 1588 PTP") Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_ptp.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/net/hns3/hns3_ptp.c b/drivers/net/hns3/hns3_ptp.c index db3c007b12..1e27e4aeca 100644 --- a/drivers/net/hns3/hns3_ptp.c +++ b/drivers/net/hns3/hns3_ptp.c @@ -57,7 +57,21 @@ hns3_ptp_int_en(struct hns3_hw *hw, bool en) } +static void +hns3_ptp_timesync_write_time(struct hns3_hw *hw, const struct timespec *ts) +{ + uint64_t sec = ts->tv_sec; + uint64_t ns = ts->tv_nsec; + + /* Set the timecounters to a new value. */ + hns3_write_dev(hw, HNS3_CFG_TIME_SYNC_H, upper_32_bits(sec)); + hns3_write_dev(hw, HNS3_CFG_TIME_SYNC_M, lower_32_bits(sec)); + hns3_write_dev(hw, HNS3_CFG_TIME_SYNC_L, lower_32_bits(ns)); + hns3_write_dev(hw, HNS3_CFG_TIME_SYNC_RDY, 1); +} + int hns3_ptp_init(struct hns3_hw *hw) { + struct timespec sys_time; int ret; @@ -72,4 +86,8 @@ hns3_ptp_init(struct hns3_hw *hw) hns3_write_dev(hw, HNS3_CFG_TIME_CYC_EN, 1); + /* Initializing the RTC. */ + clock_gettime(CLOCK_REALTIME, &sys_time); + hns3_ptp_timesync_write_time(hw, &sys_time); + return 0; } @@ -242,15 +260,9 @@ hns3_timesync_write_time(struct rte_eth_dev *dev, const struct timespec *ts) { struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private); - uint64_t sec = ts->tv_sec; - uint64_t ns = ts->tv_nsec; if (!hns3_dev_get_support(hw, PTP)) return -ENOTSUP; - /* Set the timecounters to a new value. */ - hns3_write_dev(hw, HNS3_CFG_TIME_SYNC_H, upper_32_bits(sec)); - hns3_write_dev(hw, HNS3_CFG_TIME_SYNC_M, lower_32_bits(sec)); - hns3_write_dev(hw, HNS3_CFG_TIME_SYNC_L, lower_32_bits(ns)); - hns3_write_dev(hw, HNS3_CFG_TIME_SYNC_RDY, 1); + hns3_ptp_timesync_write_time(hw, ts); return 0; -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:17:59.677026403 +0100 +++ 0038-net-hns3-fix-RTC-time-on-initialization.patch 2023-07-20 16:17:54.616750324 +0100 @@ -1 +1 @@ -From f901c570e50d042f466de29b186db68e177f93ab Mon Sep 17 00:00:00 2001 +From bf28f06d51f5449623f36474ec2a42186fbb3a58 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f901c570e50d042f466de29b186db68e177f93ab ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org