On Thu, Feb 24, 2022 at 1:32 PM Rakesh Kudurumalla
<rkuduruma...@marvell.com> wrote:
>
> timestamp resolution for an incoming and outgoing packets
> is different for CN10k and CN9K.Added platform specific
> callback to retrieve timestamp in correct format when read by
> application
>
> Signed-off-by: Rakesh Kudurumalla <rkuduruma...@marvell.com>
Squashed 2/2 into 1/2.
Acked-by: Jerin Jacob <jer...@marvell.com>
Updated git commit as follows and Applied to
dpdk-next-net-mrvl/for-next-net. Thanks
net/cnxk: add SoC specific PTP timestamp read
Timestamp resolution for an incoming and outgoing packets
is different for CN10k and CN9K. Added SoC specific
callback to retrieve timestamp in correct format
when read by application.
Signed-off-by: Rakesh Kudurumalla <rkuduruma...@marvell.com>
Acked-by: Jerin Jacob <jer...@marvell.com>
> ---
> drivers/net/cnxk/cn10k_ethdev.c | 23 +++++++++++++++++++++++
> drivers/net/cnxk/cn10k_rx.h | 32 +++++++++++++++++++++++++++++++-
> drivers/net/cnxk/cn9k_ethdev.c | 21 +++++++++++++++++++++
> drivers/net/cnxk/cn9k_rx.h | 30 +++++++++++++++++++++++++++++-
> 4 files changed, 104 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/cnxk/cn10k_ethdev.c b/drivers/net/cnxk/cn10k_ethdev.c
> index c6890f3699..e57847ef3a 100644
> --- a/drivers/net/cnxk/cn10k_ethdev.c
> +++ b/drivers/net/cnxk/cn10k_ethdev.c
> @@ -428,6 +428,27 @@ cn10k_nix_timesync_disable(struct rte_eth_dev *eth_dev)
> return 0;
> }
>
> +static int
> +cn10k_nix_timesync_read_tx_timestamp(struct rte_eth_dev *eth_dev,
> + struct timespec *timestamp)
> +{
> + struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
> + struct cnxk_timesync_info *tstamp = &dev->tstamp;
> + uint64_t ns;
> +
> + if (*tstamp->tx_tstamp == 0)
> + return -EINVAL;
> +
> + *tstamp->tx_tstamp = ((*tstamp->tx_tstamp >> 32) * NSEC_PER_SEC) +
> + (*tstamp->tx_tstamp & 0xFFFFFFFFUL);
> + ns = rte_timecounter_update(&dev->tx_tstamp_tc, *tstamp->tx_tstamp);
> + *timestamp = rte_ns_to_timespec(ns);
> + *tstamp->tx_tstamp = 0;
> + rte_wmb();
> +
> + return 0;
> +}
> +
> static int
> cn10k_nix_dev_start(struct rte_eth_dev *eth_dev)
> {
> @@ -499,6 +520,8 @@ nix_eth_dev_ops_override(void)
> cnxk_eth_dev_ops.timesync_disable = cn10k_nix_timesync_disable;
> cnxk_eth_dev_ops.rx_metadata_negotiate =
> cn10k_nix_rx_metadata_negotiate;
> + cnxk_eth_dev_ops.timesync_read_tx_timestamp =
> + cn10k_nix_timesync_read_tx_timestamp;
> }
>
> static void
> diff --git a/drivers/net/cnxk/cn10k_rx.h b/drivers/net/cnxk/cn10k_rx.h
> index 2083c73879..abf280102b 100644
> --- a/drivers/net/cnxk/cn10k_rx.h
> +++ b/drivers/net/cnxk/cn10k_rx.h
> @@ -432,6 +432,36 @@ nix_rx_nb_pkts(struct cn10k_eth_rxq *rxq, const uint64_t
> wdata,
> return RTE_MIN(pkts, available);
> }
>
> +static __rte_always_inline void
> +cn10k_nix_mbuf_to_tstamp(struct rte_mbuf *mbuf,
> + struct cnxk_timesync_info *tstamp,
> + const uint8_t ts_enable, uint64_t *tstamp_ptr)
> +{
> + if (ts_enable) {
> + mbuf->pkt_len -= CNXK_NIX_TIMESYNC_RX_OFFSET;
> + mbuf->data_len -= CNXK_NIX_TIMESYNC_RX_OFFSET;
> +
> + /* Reading the rx timestamp inserted by CGX, viz at
> + * starting of the packet data.
> + */
> + *tstamp_ptr = ((*tstamp_ptr >> 32) * NSEC_PER_SEC) +
> + (*tstamp_ptr & 0xFFFFFFFFUL);
> + *cnxk_nix_timestamp_dynfield(mbuf, tstamp) =
> + rte_be_to_cpu_64(*tstamp_ptr);
> + /* RTE_MBUF_F_RX_IEEE1588_TMST flag needs to be set only in
> case
> + * PTP packets are received.
> + */
> + if (mbuf->packet_type == RTE_PTYPE_L2_ETHER_TIMESYNC) {
> + tstamp->rx_tstamp =
> + *cnxk_nix_timestamp_dynfield(mbuf, tstamp);
> + tstamp->rx_ready = 1;
> + mbuf->ol_flags |= RTE_MBUF_F_RX_IEEE1588_PTP |
> + RTE_MBUF_F_RX_IEEE1588_TMST |
> + tstamp->rx_tstamp_dynflag;
> + }
> + }
> +}
> +
> static __rte_always_inline uint16_t
> cn10k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts,
> const uint16_t flags)
> @@ -486,7 +516,7 @@ cn10k_nix_recv_pkts(void *rx_queue, struct rte_mbuf
> **rx_pkts, uint16_t pkts,
>
> cn10k_nix_cqe_to_mbuf(cq, cq->tag, mbuf, lookup_mem,
> mbuf_init,
> flags);
> - cnxk_nix_mbuf_to_tstamp(mbuf, rxq->tstamp,
> + cn10k_nix_mbuf_to_tstamp(mbuf, rxq->tstamp,
> (flags & NIX_RX_OFFLOAD_TSTAMP_F),
> (uint64_t *)((uint8_t *)mbuf
> + data_off));
> diff --git a/drivers/net/cnxk/cn9k_ethdev.c b/drivers/net/cnxk/cn9k_ethdev.c
> index d81f9ac80f..6b049b2897 100644
> --- a/drivers/net/cnxk/cn9k_ethdev.c
> +++ b/drivers/net/cnxk/cn9k_ethdev.c
> @@ -450,6 +450,25 @@ cn9k_nix_dev_start(struct rte_eth_dev *eth_dev)
> return 0;
> }
>
> +static int
> +cn9k_nix_timesync_read_tx_timestamp(struct rte_eth_dev *eth_dev,
> + struct timespec *timestamp)
> +{
> + struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
> + struct cnxk_timesync_info *tstamp = &dev->tstamp;
> + uint64_t ns;
> +
> + if (*tstamp->tx_tstamp == 0)
> + return -EINVAL;
> +
> + ns = rte_timecounter_update(&dev->tx_tstamp_tc, *tstamp->tx_tstamp);
> + *timestamp = rte_ns_to_timespec(ns);
> + *tstamp->tx_tstamp = 0;
> + rte_wmb();
> +
> + return 0;
> +}
> +
> static int
> cn9k_nix_rx_metadata_negotiate(struct rte_eth_dev *eth_dev, uint64_t
> *features)
> {
> @@ -492,6 +511,8 @@ nix_eth_dev_ops_override(void)
> cnxk_eth_dev_ops.timesync_disable = cn9k_nix_timesync_disable;
> cnxk_eth_dev_ops.mtr_ops_get = NULL;
> cnxk_eth_dev_ops.rx_metadata_negotiate =
> cn9k_nix_rx_metadata_negotiate;
> + cnxk_eth_dev_ops.timesync_read_tx_timestamp =
> + cn9k_nix_timesync_read_tx_timestamp;
> }
>
> static void
> diff --git a/drivers/net/cnxk/cn9k_rx.h b/drivers/net/cnxk/cn9k_rx.h
> index 6b6c5bfbc2..25a4927a33 100644
> --- a/drivers/net/cnxk/cn9k_rx.h
> +++ b/drivers/net/cnxk/cn9k_rx.h
> @@ -435,6 +435,34 @@ nix_rx_nb_pkts(struct cn9k_eth_rxq *rxq, const uint64_t
> wdata,
> return RTE_MIN(pkts, available);
> }
>
> +static __rte_always_inline void
> +cn9k_nix_mbuf_to_tstamp(struct rte_mbuf *mbuf,
> + struct cnxk_timesync_info *tstamp,
> + const uint8_t ts_enable, uint64_t *tstamp_ptr)
> +{
> + if (ts_enable) {
> + mbuf->pkt_len -= CNXK_NIX_TIMESYNC_RX_OFFSET;
> + mbuf->data_len -= CNXK_NIX_TIMESYNC_RX_OFFSET;
> +
> + /* Reading the rx timestamp inserted by CGX, viz at
> + * starting of the packet data.
> + */
> + *cnxk_nix_timestamp_dynfield(mbuf, tstamp) =
> + rte_be_to_cpu_64(*tstamp_ptr);
> + /* RTE_MBUF_F_RX_IEEE1588_TMST flag needs to be set only in
> case
> + * PTP packets are received.
> + */
> + if (mbuf->packet_type == RTE_PTYPE_L2_ETHER_TIMESYNC) {
> + tstamp->rx_tstamp =
> + *cnxk_nix_timestamp_dynfield(mbuf, tstamp);
> + tstamp->rx_ready = 1;
> + mbuf->ol_flags |= RTE_MBUF_F_RX_IEEE1588_PTP |
> + RTE_MBUF_F_RX_IEEE1588_TMST |
> + tstamp->rx_tstamp_dynflag;
> + }
> + }
> +}
> +
> static __rte_always_inline uint16_t
> cn9k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts,
> const uint16_t flags)
> @@ -463,7 +491,7 @@ cn9k_nix_recv_pkts(void *rx_queue, struct rte_mbuf
> **rx_pkts, uint16_t pkts,
>
> cn9k_nix_cqe_to_mbuf(cq, cq->tag, mbuf, lookup_mem, mbuf_init,
> flags);
> - cnxk_nix_mbuf_to_tstamp(mbuf, rxq->tstamp,
> + cn9k_nix_mbuf_to_tstamp(mbuf, rxq->tstamp,
> (flags & NIX_RX_OFFLOAD_TSTAMP_F),
> (uint64_t *)((uint8_t *)mbuf
> + data_off));
> --
> 2.25.1
>
