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 ABE3BA0A0E for ; Mon, 10 May 2021 18:09:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A168E406A3; Mon, 10 May 2021 18:09:03 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2065.outbound.protection.outlook.com [40.107.223.65]) by mails.dpdk.org (Postfix) with ESMTP id EB089406A3 for ; Mon, 10 May 2021 18:09:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HPkqzLjyDDTDuV2uWe31lTWSNxN/JfPO6YxXnRbl942lR8j2kKEufT/0iOuGxnmvbxTT0NKbYD5cgogHLK7X0po/4excDu19BHrIERfY3oCQ+qcAUv8/7R39MCRsUNrITcFcTbo07Q++feroevs+iOP/sgLXkzZPoHVext58LnDFVn3i/SqcBSHCK9zU2rvU6hfVKRbUhYi9fVQiwaUoesn8FBYwtDm/tgoir5rJSgkHJm4fVSLAPCzRca6kOvkpH6pxzeffwvCcRhPce2wYmkOwvWLyMcycLntUSCImzSl3IW8ViGK14PriOkYm/eYL+wg1w34P/cw7DlHgLUSeig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zPTj/LE3ha4IJrfVcPkK/vzeIUbRTkfgycfsHKQSJ7s=; b=K3mrmpZebZDulG/DztOKT5ae9t2MPMu/mfUQLwVFkax5YLir0RNzypwRk2ePwKje8gFGYUlCTcnqnkaWPdoT79iFwiz71q99gJl+YkdHJLUU50HKN9SmaNQmn5O7whoy0uTJec3FZsXRd6JcUyTvB0R30LRW5Q/wfz5OmA9eA75A3jdkubUk4Ytv4Ov21ZfWoIdFnvLOV1ovRtJc8kHuq9edj+2GpI815FNXe1qaGBpchKpBI6Uw0s4JIEhSqTT/wI8/LkzZ0ec2UdiwEImA/rETa/d7iUf9+569kI/XDirxaCYyRcasAqbT8h/FgKRrWpczQ6apah3wYcDo0QgrNA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=broadcom.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zPTj/LE3ha4IJrfVcPkK/vzeIUbRTkfgycfsHKQSJ7s=; b=TbfgguAycd1/fgSBcR8ODhjy5BHTw+esgHPNQV6xGXmq+cxYimklXV6YQXBiVbfvh2NnxuLiXDcTfGnws6vFbbnkVefYI2cjT7N7IBuisNIrHxN2i5JOi8ppVmA/2GMNe/fZTr+H2CMTMpslKxmEy/TDYwVXxCstKB3l8YrSIbNrRI9r8K3JRndAsHUw/FvvkOoXV4UojCtDe2Tpoa3ZVBjx1o1tNCUygUhLEfqbl4iSAB7e/7KebZsD87kB+fw/juMADlhLB81400FPFBdjII2o2jQPa+vn1HpNHjsFMog2gNw76AHcljArJj7j4mMgnRG7qlAysPokttS5bqx0mA== Received: from BN6PR17CA0058.namprd17.prod.outlook.com (2603:10b6:405:75::47) by DM6PR12MB3017.namprd12.prod.outlook.com (2603:10b6:5:3e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24; Mon, 10 May 2021 16:09:01 +0000 Received: from BN8NAM11FT015.eop-nam11.prod.protection.outlook.com (2603:10b6:405:75:cafe::c4) by BN6PR17CA0058.outlook.office365.com (2603:10b6:405:75::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:09:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; broadcom.com; dkim=none (message not signed) header.d=none;broadcom.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT015.mail.protection.outlook.com (10.13.176.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:09:01 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:08:58 +0000 From: Xueming Li To: Somnath Kotur CC: Luca Boccassi , Lance Richardson , Ajit Khaparde , dpdk stable Date: Tue, 11 May 2021 00:00:09 +0800 Message-ID: <20210510160258.30982-60-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: be54a5ef-5f5f-4ec2-8383-08d913cdecf1 X-MS-TrafficTypeDiagnostic: DM6PR12MB3017: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2sAFWd1JyUi5ropVBfz4EYLrE3fAJbVkNGgfoxP4i1pC1JcjvQScJwYXNT458OAzKbNs3iBIXHotz+t7+tddfImZ6/Bq529QwhnpfbYIXqTF1vGVJMckfttYRz8bRWe0xTTfhgfaBkJLl7uyug8kAXoBkyzVd9GZ6RScqs+Wll+k+qzTjfogWFLijQmZJ+aBrEB4RZduogtSo2ZgI2GTQWKGpVo4ktT2u0PxIfMqBbT3h8BFQIvUxwUtnCGXqZQG/t39yWgx+tELlMI98+t6gpKEx4lqUgSuWsszHk42tHRwWrmdidYL8rCEXIpiltrl0FbQup9kf5k4QL0pZKHHnwbD1xyMzsisLT3KpyRhtp7XDKIj1XWmPeaDSbMfmTbM1H7lHmuGIPBEiPbwk9pAMG/6ZqJhwAHSL4yOKDXcwUrWfpr48/r2Ljf7vM/sDu0+CctIBIMU4oHS0jCDizqZ8RYO6zuuI+mwEBwAiNr/aGTq1en0fsR/XGdLPKk4NubpzCRxHi0iVpd70yd5veWPt9IaQ1q6ZJposw/9Fnhz4ZS+KBPtitHbV7nXd/e8gm/zrzOEVLEYd9L5kfzangy4cIuE1gGE6MBlXcWC+y1dR86KCfWMpDCcwGIBv0HP2y/uCicyK/cGvdu30ZH3gMxy/DM5G6zO9jEEG0ZdDlXHHDVRg7UZ6gZ9qGckmTqVFW/Z5U95el6uuu2dHjxNJv6ntPgyDMyyfrO5DuF/1zFQjrZKrFUDB3KNM2YnnWkm1F3zLNtZOz+d05eXbx/qUpG74w== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(346002)(396003)(39860400002)(376002)(136003)(46966006)(36840700001)(19627235002)(26005)(426003)(336012)(6916009)(83380400001)(5660300002)(7636003)(2616005)(8676002)(356005)(53546011)(1076003)(86362001)(82310400003)(82740400003)(47076005)(478600001)(16526019)(6286002)(6666004)(55016002)(186003)(36756003)(8936002)(2906002)(7696005)(36906005)(316002)(966005)(4326008)(54906003)(70586007)(70206006)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:09:01.2351 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: be54a5ef-5f5f-4ec2-8383-08d913cdecf1 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT015.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3017 Subject: [dpdk-stable] patch 'net/bnxt: fix Rx and Tx timestamps' has been queued to stable release 20.11.2 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 20.11.2 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/12/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/211541b614705b5ff5c259af204b315a7664eb0f Thanks. Xueming Li --- >From 211541b614705b5ff5c259af204b315a7664eb0f 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 Cc: Luca Boccassi [ 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 1c7a4d76ed..9252352416 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -3227,6 +3227,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; } @@ -3373,6 +3375,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.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:28.214746100 +0800 +++ 0061-net-bnxt-fix-Rx-and-Tx-timestamps.patch 2021-05-10 23:59:26.410000000 +0800 @@ -1 +1 @@ -From 71f5872dd131983932cbfeb5f71345c53473fa81 Mon Sep 17 00:00:00 2001 +From 211541b614705b5ff5c259af204b315a7664eb0f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 71f5872dd131983932cbfeb5f71345c53473fa81 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 7124f48013..6cc6af0a66 100644 +index 1c7a4d76ed..9252352416 100644 @@ -23 +25 @@ -@@ -3428,6 +3428,8 @@ bnxt_timesync_write_time(struct rte_eth_dev *dev, const struct timespec *ts) +@@ -3227,6 +3227,8 @@ bnxt_timesync_write_time(struct rte_eth_dev *dev, const struct timespec *ts) @@ -32 +34 @@ -@@ -3578,6 +3580,8 @@ bnxt_timesync_adjust_time(struct rte_eth_dev *dev, int64_t delta) +@@ -3373,6 +3375,8 @@ bnxt_timesync_adjust_time(struct rte_eth_dev *dev, int64_t delta)