DEV-5708 and DEV-5709: add mvpp2 timestamping (#1)

DEV-5709: add support for HW RX TS in mvpp2
Adds:
 * enables HW RX TS using offload flags, but configuration is done
   separately in Linux using Timestamping API
 * detection of mvpp2 TAI using Linux ethtool
 * PHC read using Linux PTP subsystem
 * handling of timestamps with convertion from u32 to u64 nsec
 * alarm worker that triggers PHC gettimex64() in Linux every 2 seconds

DEV-5708: add support for HW TX TS in mvpp2
Adds:
 * includes unification changes for HW RX TS (see prev. commit)
 * enables HW TX TS using offload flags on per-packet basis, but configuration
   is done separately in Linux using Timestamping API before VPP start
 * adds data structures to keep track of egress queue of timestamps
 * adds 1ms poll for new timestamps, masks IRQ for new timestamps (see TODOs)
 * adds hardcoded TX descriptor setup (see TODOs)
 * adds support for 1 TX timesramp queue (see TODOs)

TODO:
 * add support for PTP packet classifier and parser
 * add support for PTP IRQs
 * add support for 2 TX timesramp queues

Author: paul-sirin

drivers/net/mvpp2/meson.build

@@ -24,6 +24,7 @@ sources = files(
         'mrvl_qos.c',
         'mrvl_mtr.c',
         'mrvl_tm.c',
+        'mrvl_ptp.c',
 )
 
 deps += ['cfgfile', 'common_mvep']

drivers/net/mvpp2/mrvl_ethdev.c

@@ -27,6 +27,7 @@
 #include "mrvl_flow.h"
 #include "mrvl_mtr.h"
 #include "mrvl_tm.h"
+#include "mrvl_ptp.h"
 
 /* bitmask with reserved hifs */
 #define MRVL_MUSDK_HIFS_RESERVED 0x0F
@@ -60,7 +61,8 @@
 /** Port Rx offload capabilities */
 #define MRVL_RX_OFFLOADS (DEV_RX_OFFLOAD_VLAN_FILTER | \
 			  DEV_RX_OFFLOAD_JUMBO_FRAME | \
-			  DEV_RX_OFFLOAD_CHECKSUM)
+			  DEV_RX_OFFLOAD_CHECKSUM | \
+			  DEV_RX_OFFLOAD_TIMESTAMP)
 
 /** Port Tx offloads capabilities */
 #define MRVL_TX_OFFLOAD_CHECKSUM (DEV_TX_OFFLOAD_IPV4_CKSUM | \
@@ -71,7 +73,8 @@
 
 #define MRVL_TX_PKT_OFFLOADS (PKT_TX_IP_CKSUM | \
 			      PKT_TX_TCP_CKSUM | \
-			      PKT_TX_UDP_CKSUM)
+			      PKT_TX_UDP_CKSUM | \
+			      PKT_TX_IEEE1588_TMST)
 
 static const char * const valid_args[] = {
 	MRVL_IFACE_NAME_ARG,
@@ -117,16 +120,6 @@ struct mrvl_shadow_txq {
 	struct buff_release_entry ent[MRVL_PP2_TX_SHADOWQ_SIZE]; /* q entries */
 };
 
-struct mrvl_rxq {
-	struct mrvl_priv *priv;
-	struct rte_mempool *mp;
-	int queue_id;
-	int port_id;
-	int cksum_enabled;
-	uint64_t bytes_recv;
-	uint64_t drop_mac;
-};
-
 struct mrvl_txq {
 	struct mrvl_priv *priv;
 	int queue_id;
@@ -508,6 +501,12 @@ mrvl_dev_configure(struct rte_eth_dev *dev)
 		}
 	}
 
+	if (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_TIMESTAMP) {
+		if (!mvpp2_enable_rx_ts(dev->data->port_id)) {
+			return -1;
+		}
+	}
+
 	if (dev->data->dev_conf.txmode.offloads & DEV_TX_OFFLOAD_MULTI_SEGS)
 		priv->multiseg = 1;
 
@@ -653,6 +652,17 @@ mrvl_dev_set_link_up(struct rte_eth_dev *dev)
 		return ret;
 	}
 
+	if (priv->tai != CLOCK_INVALID) {
+		if (mvpp2_schedule_phc_alarm(priv)) {
+			MRVL_LOG(ERR, "%u-%u: failed to schedule PHC poll alarm",
+					priv->ppio->pp2_id, priv->ppio->port_id);
+		}
+		if (mvpp2_schedule_tx_ts_alarm(priv)) {
+			MRVL_LOG(ERR, "%u-%u: failed to schedule TX TS poll alarm",
+					priv->ppio->pp2_id, priv->ppio->port_id);
+		}
+	}
+
 	dev->data->dev_link.link_status = ETH_LINK_UP;
 	return 0;
 }
@@ -676,6 +686,12 @@ mrvl_dev_set_link_down(struct rte_eth_dev *dev)
 		dev->data->dev_link.link_status = ETH_LINK_DOWN;
 		return 0;
 	}
+
+	if (priv->tai != CLOCK_INVALID) {
+		mvpp2_cancel_tx_ts_alarm(priv);
+		mvpp2_cancel_phc_alarm(priv);
+	}
+
 	ret = pp2_ppio_disable(priv->ppio);
 	if (ret)
 		return ret;
@@ -1154,6 +1170,13 @@ mrvl_dev_close(struct rte_eth_dev *dev)
 		priv->bpool = NULL;
 	}
 
+	if (priv->tai != CLOCK_INVALID) {
+		mvpp2_cancel_tx_ts_alarm(priv);
+		mvpp2_cancel_phc_alarm(priv);
+		phc_close(priv->tai);
+		priv->tai = CLOCK_INVALID;
+	}
+
 	mrvl_dev_num--;
 
 	if (mrvl_dev_num == 0) {
@@ -2654,6 +2677,10 @@ mrvl_rx_pkt_burst(void *rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 				mrvl_desc_to_ol_flags(&descs[i],
 						      mbuf->packet_type);
 
+		if (mvpp2_is_rx_ts_enabled(q)) {
+			mvpp2_read_rx_ts(q->priv, &descs[i], mbuf);
+		}
+
 		rx_pkts[rx_done++] = mbuf;
 		q->bytes_recv += mbuf->pkt_len;
 	}
@@ -2871,6 +2898,12 @@ mrvl_tx_pkt_burst(void *txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 		mrvl_fill_desc(&descs[i], mbuf);
 
 		bytes_sent += rte_pktmbuf_pkt_len(mbuf);
+
+		mvpp2_txdesc_clear_ptp(&descs[i]);
+		if (unlikely(mbuf->ol_flags & PKT_TX_IEEE1588_TMST)) {
+			mvpp2_tx_hw_tstamp(q->priv, mbuf, &descs[i]);
+		}
+
 		/*
 		 * in case unsupported ol_flags were passed
 		 * do not update descriptor offload information
@@ -3008,6 +3041,12 @@ mrvl_tx_sg_pkt_burst(void *txq, struct rte_mbuf **tx_pkts,
 		mrvl_fill_desc(&descs[tail++], seg);
 
 		bytes_sent += rte_pktmbuf_pkt_len(mbuf);
+
+		mvpp2_txdesc_clear_ptp(&descs[i]);
+		if (unlikely(mbuf->ol_flags & PKT_TX_IEEE1588_TMST)) {
+			mvpp2_tx_hw_tstamp(q->priv, mbuf, &descs[i]);
+		}
+
 		/* In case unsupported ol_flags were passed
 		 * do not update descriptor offload information
 		 */
@@ -3046,6 +3085,7 @@ mrvl_tx_sg_pkt_burst(void *txq, struct rte_mbuf **tx_pkts,
 	return nb_pkts;
 }
 
+
 /**
  * Create private device structure.
  *
@@ -3099,6 +3139,10 @@ mrvl_priv_create(const char *dev_name)
 	priv->ppio_params.type = PP2_PPIO_T_NIC;
 	rte_spinlock_init(&priv->lock);
 
+	if (sk_get_dev_phc(dev_name, &priv->tai)) {
+		MRVL_LOG(ERR, "failed to open TAI using Linux PHC");
+	}
+
 	return priv;
 out_clear_bpool_bit:
 	used_bpools[priv->pp_id] &= ~(1 << priv->bpool_bit);

drivers/net/mvpp2/mrvl_ethdev.h

@@ -138,6 +138,12 @@ struct mrvl_tm_node {
 	uint64_t stats_mask;
 };
 
+struct mvpp2_hwtstamp_queue {
+	rte_spinlock_t lock;
+	u8 next; // iterator 0..31
+	struct rte_mbuf *mbuf[32];
+};
+
 struct mrvl_priv {
 	/* Hot fields, used in fast path. */
 	struct pp2_bpool *bpool;  /**< BPool pointer */
@@ -146,6 +152,8 @@ struct mrvl_priv {
 	uint16_t bpool_max_size;  /**< BPool maximum size */
 	uint16_t bpool_min_size;  /**< BPool minimum size  */
 	uint16_t bpool_init_size; /**< Configured BPool size  */
+	clockid_t tai;            /**< Linux PHC id */
+	struct mvpp2_hwtstamp_queue tx_hwtstamp_queue[2];
 
 	/** Mapping for DPDK rx queue->(TC, MRVL relative inq) */
 	struct {
@@ -187,9 +195,22 @@ struct mrvl_priv {
 	uint8_t forward_bad_frames;
 	uint32_t fill_bpool_buffs;
 
+	bool scheduled_get_time_alarm;
+	bool scheduled_get_tx_ts_alarm;
+
 	uint8_t configured; /** indicates if device has been configured */
 };
 
+struct mrvl_rxq {
+	struct mrvl_priv *priv;
+	struct rte_mempool *mp;
+	int queue_id;
+	int port_id;
+	int cksum_enabled;
+	uint64_t bytes_recv;
+	uint64_t drop_mac;
+};
+
 /** Flow operations forward declaration. */
 extern const struct rte_flow_ops mrvl_flow_ops;