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 CD5CFA0C3F for ; Sat, 12 Jun 2021 01:11:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C6F6A4003F; Sat, 12 Jun 2021 01:11:49 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2045.outbound.protection.outlook.com [40.107.237.45]) by mails.dpdk.org (Postfix) with ESMTP id B85A540E46 for ; Sat, 12 Jun 2021 01:11:47 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OFC/n+ZrtvBMKZckvXCTyMqdgU5ybBv4Q5ySS7eOANyvk/MAkE+pEC+zKrHXzVCDPi4FqPqDlQCKvNMJNQl2svLNlJLu+MYhMRcR4J4uGRadrVoorBIZF3+3lDzoVEmICx4BHDtQwDGURx7v5HkedrXCjwr7zDd8rKaJ96vcYpkZ5Qspu49+lCvW5xtdwGb21VWz1wOFucHUbK641YNlEpjTvTkO18a+bS9JeuR2HN6+u9BftDJO+zoP4wMsQGX0woPk2ZCHqmyLxNMq743P64HxOEWE2IKj7v35XUMD9rjkgT9pcWErPiwTKUPp/Z1kBnPcV+ZZGzRS5qfJKlle4A== 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=Wsf61+MsQuujYysBKOoHwFB2Z1cJNBr8l+gBqIkklhk=; b=jrUFyt3n0xBYRnNX2s7siLTV26CmX9YOJwW2mw1qB7GZhNCZBNhp/h4Szy/Oo9KPGta/FL9usENIxexyD78SWSoLELsbLZwQXBmJTTXnCWm7bfDBdtZLEB7aRbi1j3XhKHMzQEVBxfLM25oHCOn7VEaU0a2yShfWekSA6CSNfo+6ew6bLtbKY5AOnO4icEjGdwfCoT/m5kFLGH1IgwqM/YbNVRDL5DFx/KpsCK7/34FsrtVqwWPrmfJx+wnBMx3Vtu90rSemT1mxT4WHJ3OT/P6/zJqqNOGefDnh20DCb15+dKLvEYYAXWPGRINDvQQzcMsUDFBrVXeNOAbzWuw3VQ== 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=Wsf61+MsQuujYysBKOoHwFB2Z1cJNBr8l+gBqIkklhk=; b=mjwQyM8X6o7okrv4swt0bzq80GSrQcAYklYsgZFFJCiwWRFMb0eZ3+9tXuZVhVZhwdB34aQ/htsDxwXqAzaTG0RzZRv+oq+VYRMF3q0zlMuqIx+6CbDN5aYG7l8Je6xx1IjGVLBfVRN/s+8Gp1VOaGHysCnIEHsL+4fzYRTovDXhOblre2mUcPH1V9OGH8/dTtUoS0uvQzLxKPPRlH2N0XHFCoad6d1NkHEE/7skBaO0Xbu2U9mDMeyUaIPvS+EEEe6LnDlpTIIc46SmGjWwcXmpyXb4C+mBAX8IsrtP7rE5/D4rAj4mC4wut+308VUP/kOUlIRHiHJD53uG4n9PJA== Received: from MWHPR17CA0081.namprd17.prod.outlook.com (2603:10b6:300:c2::19) by CH2PR12MB3734.namprd12.prod.outlook.com (2603:10b6:610:2a::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.22; Fri, 11 Jun 2021 23:11:46 +0000 Received: from CO1NAM11FT061.eop-nam11.prod.protection.outlook.com (2603:10b6:300:c2:cafe::32) by MWHPR17CA0081.outlook.office365.com (2603:10b6:300:c2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:11:46 +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 CO1NAM11FT061.mail.protection.outlook.com (10.13.175.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:11:46 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:11:44 +0000 From: Xueming Li To: Somnath Kotur CC: Luca Boccassi , Ajit Khaparde , dpdk stable Date: Sat, 12 Jun 2021 07:02:48 +0800 Message-ID: <20210611230433.8208-74-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 71b44db2-c268-4807-4d22-08d92d2e48d7 X-MS-TrafficTypeDiagnostic: CH2PR12MB3734: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zmugRqbTfQsgWxuWwvz2/rD91eM39AXk/6wA74Wgl0VEviFfk3RfNayssrF5pPWitZPw6zp6QwFfl6vbk6+V502YM6AYjDVLQQxJdqBKB8p7VDUaJDH9ImjKYPAKb/qMqY7eqF7uXUjKXAkRwOPHq9hqjcI2GVaxbpsrrubPqvZypgljpRkD/uVVNiNhEzX1ebiUrhYa0ARkLbEXR8pMihnwgYQtnvuoVIp/EXF4vP+uyZuGNlY28t/sCXtaMYIhsM3QTErlo+5EJB/WnSvVE2dEvBWUbt41yRFTj2UzwHIqg6fsNKEdmNOQvxkpRTPqWLvzKsKdle2BJP48gfQq7vvFLw9f5gCf0ZutInIBcHplEgrNGmXmUOmaAOVjeBv+Rkej9xOGpgsANAosfeKYJafzjrE2va8yQ4qcauV6KICwKaYEUsuN5VhZ3rfpybql/33LGfLkhOLMKVzGHqchJXprTyvUg2z/FANpfQYfNvB+iAb/AC8wU1XY7EJVaPWS7Z0Lr4kQSEvpCU4YVPmMomsfwSeYZJQ3UTte7DDFzHTLU+rNvNQSkYtGISEgyUkPuryxOpZq9XZVi/lkklMKITQDCGaoyyQ9eL4r4xYtfMkKq6AZxQCC+v+wu2mvxdrKXHZu6dKUe+iY18ZTIFg+Hs642vsn9nGBD19LvxfcwtTJmHw1E8PgaVQp9E361ezXsWNX5TkqEbh3sHSRVUjaqAlyghAaz3I1xwHDELQv77zzyZN5KikiW9nV5Cceq/3fzOclMAbPfdH895FhecpCPyfN1GUWn8AzCjeDdbjqNgmYdy/K6MP8Y9Wq8wcnlLTr 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)(39860400002)(396003)(346002)(136003)(376002)(36840700001)(46966006)(5660300002)(83380400001)(316002)(356005)(54906003)(186003)(26005)(36756003)(8936002)(47076005)(2616005)(2906002)(53546011)(426003)(478600001)(4326008)(7636003)(8676002)(82740400003)(82310400003)(966005)(1076003)(6916009)(36906005)(336012)(86362001)(70206006)(16526019)(55016002)(36860700001)(6286002)(7696005)(70586007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:11:46.2441 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 71b44db2-c268-4807-4d22-08d92d2e48d7 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: CO1NAM11FT061.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB3734 Subject: [dpdk-stable] patch 'net/bnxt: fix Rx timestamp when FIFO pending bit is set' 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 06/14/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/a7375b06e879cc3319d2269640d6d20f45f97d1e Thanks. Xueming Li --- >From a7375b06e879cc3319d2269640d6d20f45f97d1e Mon Sep 17 00:00:00 2001 From: Somnath Kotur Date: Mon, 26 Apr 2021 11:37:55 +0530 Subject: [PATCH] net/bnxt: fix Rx timestamp when FIFO pending bit is set Cc: Luca Boccassi [ upstream commit f8120fd07bf0ebdbcfa7e1a46c91df9d611ca940 ] Fix to clear the Rx FIFO while reading the timestamp. If the Rx FIFO has pending bit set, keep reading to clear it and return the last valid timestamp instead of unconditionally returning an error. Fixes: b11cceb83a34 ("net/bnxt: support timesync") Signed-off-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt.h | 1 + drivers/net/bnxt/bnxt_ethdev.c | 38 ++++++++++++++++++++++++++++++---- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index 272e076072..600154f654 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -316,6 +316,7 @@ struct rte_flow { struct bnxt_vnic_info *vnic; }; +#define BNXT_PTP_RX_PND_CNT 10 #define BNXT_PTP_FLAGS_PATH_TX 0x0 #define BNXT_PTP_FLAGS_PATH_RX 0x1 #define BNXT_PTP_FLAGS_CURRENT_TIME 0x2 diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index c2344dabc0..5d15116d8a 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -3373,6 +3373,38 @@ static int bnxt_get_tx_ts(struct bnxt *bp, uint64_t *ts) return 0; } +static int bnxt_clr_rx_ts(struct bnxt *bp, uint64_t *last_ts) +{ + struct bnxt_ptp_cfg *ptp = bp->ptp_cfg; + struct bnxt_pf_info *pf = bp->pf; + uint16_t port_id; + int i = 0; + uint32_t fifo; + + if (!ptp || (bp->flags & BNXT_FLAG_THOR_CHIP)) + return -EINVAL; + + port_id = pf->port_id; + fifo = rte_le_to_cpu_32(rte_read32((uint8_t *)bp->bar0 + + ptp->rx_mapped_regs[BNXT_PTP_RX_FIFO])); + while ((fifo & BNXT_PTP_RX_FIFO_PENDING) && (i < BNXT_PTP_RX_PND_CNT)) { + rte_write32(1 << port_id, (uint8_t *)bp->bar0 + + ptp->rx_mapped_regs[BNXT_PTP_RX_FIFO_ADV]); + fifo = rte_le_to_cpu_32(rte_read32((uint8_t *)bp->bar0 + + ptp->rx_mapped_regs[BNXT_PTP_RX_FIFO])); + *last_ts = rte_le_to_cpu_32(rte_read32((uint8_t *)bp->bar0 + + ptp->rx_mapped_regs[BNXT_PTP_RX_TS_L])); + *last_ts |= (uint64_t)rte_le_to_cpu_32(rte_read32((uint8_t *)bp->bar0 + + ptp->rx_mapped_regs[BNXT_PTP_RX_TS_H])) << 32; + i++; + } + + if (i >= BNXT_PTP_RX_PND_CNT) + return -EBUSY; + + return 0; +} + static int bnxt_get_rx_ts(struct bnxt *bp, uint64_t *ts) { struct bnxt_ptp_cfg *ptp = bp->ptp_cfg; @@ -3391,10 +3423,8 @@ static int bnxt_get_rx_ts(struct bnxt *bp, uint64_t *ts) fifo = rte_le_to_cpu_32(rte_read32((uint8_t *)bp->bar0 + ptp->rx_mapped_regs[BNXT_PTP_RX_FIFO])); - if (fifo & BNXT_PTP_RX_FIFO_PENDING) { -/* bnxt_clr_rx_ts(bp); TBD */ - return -EBUSY; - } + if (fifo & BNXT_PTP_RX_FIFO_PENDING) + return bnxt_clr_rx_ts(bp, ts); *ts = rte_le_to_cpu_32(rte_read32((uint8_t *)bp->bar0 + ptp->rx_mapped_regs[BNXT_PTP_RX_TS_L])); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:58.518810400 +0800 +++ 0074-net-bnxt-fix-Rx-timestamp-when-FIFO-pending-bit-is-s.patch 2021-06-12 06:53:56.350000000 +0800 @@ -1 +1 @@ -From f8120fd07bf0ebdbcfa7e1a46c91df9d611ca940 Mon Sep 17 00:00:00 2001 +From a7375b06e879cc3319d2269640d6d20f45f97d1e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit f8120fd07bf0ebdbcfa7e1a46c91df9d611ca940 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index bd2dec4d63..72513fe66b 100644 +index 272e076072..600154f654 100644 @@ -25 +27 @@ -@@ -306,6 +306,7 @@ struct rte_flow { +@@ -316,6 +316,7 @@ struct rte_flow { @@ -34 +36 @@ -index dba5b9f94d..748b766969 100644 +index c2344dabc0..5d15116d8a 100644 @@ -37 +39 @@ -@@ -3390,6 +3390,38 @@ static int bnxt_get_tx_ts(struct bnxt *bp, uint64_t *ts) +@@ -3373,6 +3373,38 @@ static int bnxt_get_tx_ts(struct bnxt *bp, uint64_t *ts) @@ -49 +51 @@ -+ if (!ptp || (bp->flags & BNXT_FLAG_CHIP_P5)) ++ if (!ptp || (bp->flags & BNXT_FLAG_THOR_CHIP)) @@ -76 +78 @@ -@@ -3408,10 +3440,8 @@ static int bnxt_get_rx_ts(struct bnxt *bp, uint64_t *ts) +@@ -3391,10 +3423,8 @@ static int bnxt_get_rx_ts(struct bnxt *bp, uint64_t *ts)