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 CE56FA0A02 for ; Mon, 17 May 2021 18:11:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9AC4041104; Mon, 17 May 2021 18:11:58 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 504E540041 for ; Mon, 17 May 2021 18:11:57 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifqX-0007ed-5G; Mon, 17 May 2021 16:11:57 +0000 From: Christian Ehrhardt To: Somnath Kotur Cc: Lance Richardson , Ajit Khaparde , dpdk stable Date: Mon, 17 May 2021 18:07:44 +0200 Message-Id: <20210517161039.3132619-35-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix Rx and Tx timestamps' has been queued to stable release 19.11.9 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/1ad0c43258631e82f639756394e4b2c5038f6335 Thanks. Christian Ehrhardt --- >From 1ad0c43258631e82f639756394e4b2c5038f6335 Mon Sep 17 00:00:00 2001 From: Somnath Kotur Date: Fri, 12 Mar 2021 10:51:09 +0530 Subject: [PATCH] net/bnxt: fix Rx and Tx timestamps [ upstream commit 71f5872dd131983932cbfeb5f71345c53473fa81 ] timesync adjust and write_time APIs needed to account for the Rx and Tx timestamp counters as well. Fix it since it was not done earlier. Fixes: b11cceb83a34 ("net/bnxt: support timesync") Reviewed-by: Lance Richardson Reviewed-by: Ajit Khaparde Signed-off-by: Somnath Kotur --- drivers/net/bnxt/bnxt_ethdev.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 3f7e6cf787..eb2c840943 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -3506,6 +3506,8 @@ bnxt_timesync_write_time(struct rte_eth_dev *dev, const struct timespec *ts) ns = rte_timespec_to_ns(ts); /* Set the timecounters to a new value. */ ptp->tc.nsec = ns; + ptp->tx_tstamp_tc.nsec = ns; + ptp->rx_tstamp_tc.nsec = ns; return 0; } @@ -3652,6 +3654,8 @@ bnxt_timesync_adjust_time(struct rte_eth_dev *dev, int64_t delta) return 0; ptp->tc.nsec += delta; + ptp->tx_tstamp_tc.nsec += delta; + ptp->rx_tstamp_tc.nsec += delta; return 0; } -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:30.930293976 +0200 +++ 0035-net-bnxt-fix-Rx-and-Tx-timestamps.patch 2021-05-17 17:40:29.159809382 +0200 @@ -1 +1 @@ -From 71f5872dd131983932cbfeb5f71345c53473fa81 Mon Sep 17 00:00:00 2001 +From 1ad0c43258631e82f639756394e4b2c5038f6335 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 71f5872dd131983932cbfeb5f71345c53473fa81 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 7124f48013..6cc6af0a66 100644 +index 3f7e6cf787..eb2c840943 100644 @@ -23 +24 @@ -@@ -3428,6 +3428,8 @@ bnxt_timesync_write_time(struct rte_eth_dev *dev, const struct timespec *ts) +@@ -3506,6 +3506,8 @@ bnxt_timesync_write_time(struct rte_eth_dev *dev, const struct timespec *ts) @@ -32 +33 @@ -@@ -3578,6 +3580,8 @@ bnxt_timesync_adjust_time(struct rte_eth_dev *dev, int64_t delta) +@@ -3652,6 +3654,8 @@ bnxt_timesync_adjust_time(struct rte_eth_dev *dev, int64_t delta)