net/mlx5e: IPoIB, Add PTP support to IPoIB device driver

Enable PTP for IPoIB rdma_netdev and add the ability
to get the time stamping parameters using ethtool.

Signed-off-by: Feras Daoud <ferasda@mellanox.com>
Signed-off-by: Eitan Rabin <rabin@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index 318ef7f0292fb973185b2de6426c8178652a6210..626683f0f4870f2ea8c02cee627c6735495da593 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -1045,6 +1045,8 @@ int mlx5e_ethtool_get_coalesce(struct mlx5e_priv *priv,
                               struct ethtool_coalesce *coal);
 int mlx5e_ethtool_set_coalesce(struct mlx5e_priv *priv,
                               struct ethtool_coalesce *coal);
+int mlx5e_ethtool_get_ts_info(struct mlx5e_priv *priv,
+                             struct ethtool_ts_info *info);
 
 /* mlx5e generic netdev management API */
 struct net_device*

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
index fa472c4d3d00b28e483474ea194015ce07bde802..ab46061f72abc8e95c19ac04d445f8cc045c5434 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
@@ -1372,13 +1372,12 @@ static int mlx5e_set_pauseparam(struct net_device *netdev,
        return err;
 }
 
-static int mlx5e_get_ts_info(struct net_device *dev,
-                            struct ethtool_ts_info *info)
+int mlx5e_ethtool_get_ts_info(struct mlx5e_priv *priv,
+                             struct ethtool_ts_info *info)
 {
-       struct mlx5e_priv *priv = netdev_priv(dev);
        int ret;
 
-       ret = ethtool_op_get_ts_info(dev, info);
+       ret = ethtool_op_get_ts_info(priv->netdev, info);
        if (ret)
                return ret;
 
@@ -1401,6 +1400,14 @@ static int mlx5e_get_ts_info(struct net_device *dev,
        return 0;
 }
 
+static int mlx5e_get_ts_info(struct net_device *dev,
+                            struct ethtool_ts_info *info)
+{
+       struct mlx5e_priv *priv = netdev_priv(dev);
+
+       return mlx5e_ethtool_get_ts_info(priv, info);
+}
+
 static __u32 mlx5e_get_wol_supported(struct mlx5_core_dev *mdev)
 {
        __u32 ret = 0;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
index da42d55939edfb08aa1e2f13f03dc6382f6b66d5..abf6d2fcfe0f3f8d914204c179007cc51f2d62b6 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
@@ -1046,6 +1046,7 @@ static inline void mlx5i_complete_rx_cqe(struct mlx5e_rq *rq,
                                         struct sk_buff *skb)
 {
        struct net_device *netdev = rq->netdev;
+       struct mlx5e_tstamp *tstamp = rq->tstamp;
        char *pseudo_header;
        u8 *dgid;
        u8 g;
@@ -1070,6 +1071,9 @@ static inline void mlx5i_complete_rx_cqe(struct mlx5e_rq *rq,
        skb->ip_summed = CHECKSUM_COMPLETE;
        skb->csum = csum_unfold((__force __sum16)cqe->check_sum);
 
+       if (unlikely(mlx5e_rx_hw_stamp(tstamp)))
+               mlx5e_fill_hwstamp(tstamp, get_cqe_ts(cqe), skb_hwtstamps(skb));
+
        skb_record_rx_queue(skb, rq->ix);
 
        if (likely(netdev->features & NETIF_F_RXHASH))

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c
index 20105eda2e118b3a6e2b0cf9718ff3587340706d..bf686f0fde5d713ae9197a501e22aff31e9990fb 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c
@@ -113,6 +113,14 @@ static int mlx5i_get_coalesce(struct net_device *netdev,
        return mlx5e_ethtool_get_coalesce(priv, coal);
 }
 
+static int mlx5i_get_ts_info(struct net_device *netdev,
+                            struct ethtool_ts_info *info)
+{
+       struct mlx5e_priv *priv = mlx5i_epriv(netdev);
+
+       return mlx5e_ethtool_get_ts_info(priv, info);
+}
+
 const struct ethtool_ops mlx5i_ethtool_ops = {
        .get_drvinfo       = mlx5i_get_drvinfo,
        .get_strings       = mlx5i_get_strings,
@@ -124,4 +132,5 @@ const struct ethtool_ops mlx5i_ethtool_ops = {
        .set_channels      = mlx5i_set_channels,
        .get_coalesce      = mlx5i_get_coalesce,
        .set_coalesce      = mlx5i_set_coalesce,
+       .get_ts_info       = mlx5i_get_ts_info,
 };

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c b/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c
index 52a58af571a240a0961b46cafffe0ee319ada175..58bf0665f50b73b070fcd9b404bea1d7749687a4 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c
@@ -382,6 +382,7 @@ static int mlx5i_open(struct net_device *netdev)
 
        mlx5e_refresh_tirs(priv, false);
        mlx5e_activate_priv_channels(priv);
+       mlx5e_timestamp_init(priv);
 
        mutex_unlock(&priv->state_lock);
        return 0;
@@ -406,6 +407,7 @@ static int mlx5i_close(struct net_device *netdev)
 
        clear_bit(MLX5E_STATE_OPENED, &priv->state);
 
+       mlx5e_timestamp_cleanup(priv);
        netif_carrier_off(priv->netdev);
        mlx5e_deactivate_priv_channels(priv);
        mlx5e_close_channels(&priv->channels);