diff mbox series

[06/33] net/cnxk: handle timestamp correctly for VF

Message ID	20240910085909.1514457-7-ndabilpuram@marvell.com (mailing list archive)
State	Changes Requested
Delegated to:	Jerin Jacob
Headers	From: Nithin Dabilpuram <ndabilpuram@marvell.com> To: <jerinj@marvell.com>, Nithin Dabilpuram <ndabilpuram@marvell.com>, "Kiran Kumar K" <kirankumark@marvell.com>, Sunil Kumar Kori <skori@marvell.com>, Satha Rao <skoteshwar@marvell.com>, Harman Kalra <hkalra@marvell.com> CC: <dev@dpdk.org>, Rakesh Kudurumalla <rkudurumalla@marvell.com> Subject: [PATCH 06/33] net/cnxk: handle timestamp correctly for VF Date: Tue, 10 Sep 2024 14:28:42 +0530 Message-ID: <20240910085909.1514457-7-ndabilpuram@marvell.com> In-Reply-To: <20240910085909.1514457-1-ndabilpuram@marvell.com> References: <20240910085909.1514457-1-ndabilpuram@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Precedence: list Errors-To: dev-bounces@dpdk.org
Series	add Marvell cn20k SOC support for mempool and net \| [00/33] add Marvell cn20k SOC support for mempool and net [01/33] mempool/cnxk: add cn20k PCI device ids [02/33] common/cnxk: accommodate change in aura field width [03/33] common/cnxk: use new NPA aq enq mbox for cn20k [04/33] mempool/cnxk: initialize mempool ops for cn20k [05/33] net/cnxk: added telemetry support do dump SA information [06/33] net/cnxk: handle timestamp correctly for VF [07/33] net/cnxk: update Rx offloads to handle timestamp [08/33] event/cnxk: handle timestamp for event mode [09/33] net/cnxk: update mbuf and rearm data for Rx inject packets [10/33] common/cnxk: remove restriction to clear RPM stats [11/33] common/cnxk: allow MAC address set/add with active VFs [12/33] net/cnxk: move PMD function defines to common code [13/33] common/cnxk: add cn20k NIX register definitions [14/33] common/cnxk: support NIX queue config for cn20k [15/33] common/cnxk: support bandwidth profile for cn20k [16/33] common/cnxk: support NIX debug for cn20k [17/33] common/cnxk: add RSS support for cn20k [18/33] net/cnxk: add cn20k base control path support [19/33] net/cnxk: support Rx function select for cn20k [20/33] net/cnxk: support Tx function select for cn20k [21/33] net/cnxk: support Rx burst scalar for cn20k [22/33] net/cnxk: support Rx burst vector for cn20k [23/33] net/cnxk: support Tx burst scalar for cn20k [24/33] net/cnxk: support Tx multi-seg in cn20k [25/33] net/cnxk: support Tx burst vector for cn20k [26/33] net/cnxk: support Tx multi-seg in vector for cn20k [27/33] common/cnxk: add flush wait after write of inline ctx [28/33] common/cnxk: fix CPT HW word size for outbound SA [29/33] net/cnxk: add PMD APIs for IPsec SA base and flush [30/33] net/cnxk: add PMD APIs to submit CPT instruction [31/33] net/cnxk: add PMD API to retrieve CPT queue statistics [32/33] net/cnxk: add option to enable custom inbound sa usage [33/33] net/cnxk: add PMD API to retrieve the model string

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Nithin Dabilpuram Sept. 10, 2024, 8:58 a.m. UTC

From: Rakesh Kudurumalla <rkudurumalla@marvell.com>

When timestamp is enabled on PF in kernel and respective
VF is attached to application in DPDK mbuf_addr is getting
corrupted in cnxk_nix_timestamp_dynfield() as
"tstamp_dynfield_offset" is zero for PTP enabled PF
This patch fixes the same

Signed-off-by: Rakesh Kudurumalla <rkudurumalla@marvell.com>
---
 drivers/net/cnxk/cn10k_ethdev.c | 12 +++++++++++-
 drivers/net/cnxk/cn9k_ethdev.c  | 12 +++++++++++-
 drivers/net/cnxk/cnxk_ethdev.c  |  2 +-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/cnxk/cn10k_ethdev.c b/drivers/net/cnxk/cn10k_ethdev.c
index 55ed54bb0f..099890e959 100644
--- a/drivers/net/cnxk/cn10k_ethdev.c
+++ b/drivers/net/cnxk/cn10k_ethdev.c
@@ -473,7 +473,7 @@  cn10k_nix_ptp_info_update_cb(struct roc_nix *nix, bool ptp_en)
 	struct cnxk_eth_dev *dev = (struct cnxk_eth_dev *)nix;
 	struct rte_eth_dev *eth_dev;
 	struct cn10k_eth_rxq *rxq;
-	int i;
+	int i, rc;
 
 	if (!dev)
 		return -EINVAL;
@@ -496,7 +496,17 @@  cn10k_nix_ptp_info_update_cb(struct roc_nix *nix, bool ptp_en)
 		 * and MTU setting also requires MBOX message to be
 		 * sent(VF->PF)
 		 */
+		if (dev->ptp_en) {
+			rc = rte_mbuf_dyn_rx_timestamp_register
+				(&dev->tstamp.tstamp_dynfield_offset,
+				 &dev->tstamp.rx_tstamp_dynflag);
+			if (rc != 0) {
+				plt_err("Failed to register Rx timestamp field/flag");
+				return -EINVAL;
+			}
+		}
 		eth_dev->rx_pkt_burst = nix_ptp_vf_burst;
+		rte_eth_fp_ops[eth_dev->data->port_id].rx_pkt_burst = eth_dev->rx_pkt_burst;
 		rte_mb();
 	}
 
diff --git a/drivers/net/cnxk/cn9k_ethdev.c b/drivers/net/cnxk/cn9k_ethdev.c
index ea92b1dcb6..4851e60f16 100644
--- a/drivers/net/cnxk/cn9k_ethdev.c
+++ b/drivers/net/cnxk/cn9k_ethdev.c
@@ -432,7 +432,7 @@  cn9k_nix_ptp_info_update_cb(struct roc_nix *nix, bool ptp_en)
 	struct cnxk_eth_dev *dev = (struct cnxk_eth_dev *)nix;
 	struct rte_eth_dev *eth_dev;
 	struct cn9k_eth_rxq *rxq;
-	int i;
+	int i, rc;
 
 	if (!dev)
 		return -EINVAL;
@@ -455,7 +455,17 @@  cn9k_nix_ptp_info_update_cb(struct roc_nix *nix, bool ptp_en)
 		 * and MTU setting also requires MBOX message to be
 		 * sent(VF->PF)
 		 */
+		if (dev->ptp_en) {
+			rc = rte_mbuf_dyn_rx_timestamp_register
+				(&dev->tstamp.tstamp_dynfield_offset,
+				 &dev->tstamp.rx_tstamp_dynflag);
+			if (rc != 0) {
+				plt_err("Failed to register Rx timestamp field/flag");
+				return -EINVAL;
+			}
+		}
 		eth_dev->rx_pkt_burst = nix_ptp_vf_burst;
+		rte_eth_fp_ops[eth_dev->data->port_id].rx_pkt_burst = eth_dev->rx_pkt_burst;
 		rte_mb();
 	}
 
diff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c
index 38746c81c5..dd065c8269 100644
--- a/drivers/net/cnxk/cnxk_ethdev.c
+++ b/drivers/net/cnxk/cnxk_ethdev.c
@@ -1751,7 +1751,7 @@  cnxk_nix_dev_start(struct rte_eth_dev *eth_dev)
 	else
 		cnxk_eth_dev_ops.timesync_disable(eth_dev);
 
-	if (dev->rx_offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP) {
+	if (dev->rx_offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP || dev->ptp_en) {
 		rc = rte_mbuf_dyn_rx_timestamp_register
 			(&dev->tstamp.tstamp_dynfield_offset,
 			 &dev->tstamp.rx_tstamp_dynflag);