| Message ID | 1564235652-29983-1-git-send-email-hkalra@marvell.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Jerin Jacob |
| Headers | show |
| Series | [v2] net/octeontx2: fix PTP enable via Rx ofload flags | expand |
| Context | Check | Description |
|---|---|---|
| ci/checkpatch | success | coding style OK |
| ci/iol-Compile-Testing | success | Compile Testing PASS |
| ci/Intel-compilation | success | Compilation OK |
> -----Original Message----- > From: Harman Kalra <hkalra@marvell.com> > Sent: Saturday, July 27, 2019 7:26 PM > To: Jerin Jacob Kollanukkaran <jerinj@marvell.com>; Nithin Kumar > Dabilpuram <ndabilpuram@marvell.com>; Kiran Kumar Kokkilagadda > <kirankumark@marvell.com> > Cc: dev@dpdk.org; Harman Kalra <hkalra@marvell.com> > Subject: [PATCH v2] net/octeontx2: fix PTP enable via Rx ofload flags > > Earlier implementation for enabling ptp via RX offload flag was causing > segmentation fault as it was getting executed in the device configuration > stage where RX and TX queues were not configured. As in the ptp enable > process rx queues are used for mbuf setup while tx queues are used for > send descriptor setup. > Moving the logic in dev start as all the resources will be configured. > > Fixes: b5dc3140448ee ("net/octeontx2: support base PTP") > > Signed-off-by: Harman Kalra <hkalra@marvell.com> Acked-by: Jerin Jacob <jerinj@marvell.com> Applied to dpdk-next-net-mrvl/master. Thanks
diff --git a/drivers/net/octeontx2/otx2_ethdev.c b/drivers/net/octeontx2/otx2_ethdev.c index 725fb2431..b018b25b7 100644 --- a/drivers/net/octeontx2/otx2_ethdev.c +++ b/drivers/net/octeontx2/otx2_ethdev.c @@ -625,6 +625,9 @@ nix_tx_offload_flags(struct rte_eth_dev *eth_dev) if (conf & DEV_TX_OFFLOAD_MULTI_SEGS) flags |= NIX_TX_MULTI_SEG_F; + if ((dev->rx_offloads & DEV_RX_OFFLOAD_TIMESTAMP)) + flags |= NIX_TX_OFFLOAD_TSTAMP_F; + return flags; } @@ -1333,16 +1336,6 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev) goto q_irq_fini; } - /* Enable PTP if it was requested by the app or if it is already - * enabled in PF owning this VF - */ - memset(&dev->tstamp, 0, sizeof(struct otx2_timesync_info)); - if ((dev->rx_offloads & DEV_RX_OFFLOAD_TIMESTAMP) || - otx2_ethdev_is_ptp_en(dev)) - otx2_nix_timesync_enable(eth_dev); - else - otx2_nix_timesync_disable(eth_dev); - /* * Restore queue config when reconfigure followed by * reconfigure and no queue configure invoked from application case. @@ -1551,6 +1544,16 @@ otx2_nix_dev_start(struct rte_eth_dev *eth_dev) return rc; } + /* Enable PTP if it was requested by the app or if it is already + * enabled in PF owning this VF + */ + memset(&dev->tstamp, 0, sizeof(struct otx2_timesync_info)); + if ((dev->rx_offloads & DEV_RX_OFFLOAD_TIMESTAMP) || + otx2_ethdev_is_ptp_en(dev)) + otx2_nix_timesync_enable(eth_dev); + else + otx2_nix_timesync_disable(eth_dev); + rc = npc_rx_enable(dev); if (rc) { otx2_err("Failed to enable NPC rx %d", rc);
Earlier implementation for enabling ptp via RX offload flag was causing segmentation fault as it was getting executed in the device configuration stage where RX and TX queues were not configured. As in the ptp enable process rx queues are used for mbuf setup while tx queues are used for send descriptor setup. Moving the logic in dev start as all the resources will be configured. Fixes: b5dc3140448ee ("net/octeontx2: support base PTP") Signed-off-by: Harman Kalra <hkalra@marvell.com> --- drivers/net/octeontx2/otx2_ethdev.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)