Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c39afb3 authored by Feras Daoud's avatar Feras Daoud Committed by Saeed Mahameed
Browse files

net/mlx5: PTP code migration to driver core section 



PTP code is moved to core section of mlx5 driver in order to share
it between ethernet and infiniband. This movement involves the following
changes:
- Change mlx5e_ prefix to be mlx5_
- Add clock structs to Core
- Add clock object to mlx5_core_dev
- Call Init/Uninit clock from core init/cleanup
- Rename mlx5e_tstamp to be mlx5_clock

Signed-off-by: default avatarFeras Daoud <ferasda@mellanox.com>
Signed-off-by: default avatarEitan Rabin <rabin@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent ae904bea

drivers/net/ethernet/mellanox/mlx5/core/en.h

+7 −32
Original line number Diff line number Diff line
@@ -267,28 +267,6 @@ struct mlx5e_dcbx { 
};

#endif



#define MAX_PIN_NUM	8

struct mlx5e_pps {

	u8                         pin_caps[MAX_PIN_NUM];

	struct work_struct         out_work;

	u64                        start[MAX_PIN_NUM];

	u8                         enabled;

};



struct mlx5e_tstamp {

	rwlock_t                   lock;

	struct cyclecounter        cycles;

	struct timecounter         clock;

	struct hwtstamp_config     hwtstamp_config;

	u32                        nominal_c_mult;

	unsigned long              overflow_period;

	struct delayed_work        overflow_work;

	struct mlx5_core_dev      *mdev;

	struct ptp_clock          *ptp;

	struct ptp_clock_info      ptp_info;

	struct mlx5e_pps           pps_info;

};



enum {

	MLX5E_RQ_STATE_ENABLED,

	MLX5E_RQ_STATE_AM,
@@ -375,9 +353,10 @@ struct mlx5e_txqsq { 
	u8                         min_inline_mode;

	u16                        edge;

	struct device             *pdev;

	struct mlx5e_tstamp       *tstamp;

	__be32                     mkey_be;

	unsigned long              state;

	struct hwtstamp_config    *tstamp;

	struct mlx5_clock         *clock;



	/* control path */

	struct mlx5_wq_ctrl        wq_ctrl;
@@ -543,10 +522,11 @@ struct mlx5e_rq { 
	struct mlx5e_channel  *channel;

	struct device         *pdev;

	struct net_device     *netdev;

	struct mlx5e_tstamp   *tstamp;

	struct mlx5e_rq_stats  stats;

	struct mlx5e_cq        cq;

	struct mlx5e_page_cache page_cache;

	struct hwtstamp_config *tstamp;

	struct mlx5_clock      *clock;



	mlx5e_fp_handle_rx_cqe handle_rx_cqe;

	mlx5e_fp_post_rx_wqes  post_wqes;
@@ -588,7 +568,7 @@ struct mlx5e_channel { 
	/* control */

	struct mlx5e_priv         *priv;

	struct mlx5_core_dev      *mdev;

	struct mlx5e_tstamp       *tstamp;

	struct hwtstamp_config    *tstamp;

	int                        ix;

};
@@ -789,7 +769,7 @@ struct mlx5e_priv { 
	struct mlx5_core_dev      *mdev;

	struct net_device         *netdev;

	struct mlx5e_stats         stats;

	struct mlx5e_tstamp        tstamp;

	struct hwtstamp_config     tstamp;

	u16 q_counter;

#ifdef CONFIG_MLX5_CORE_EN_DCB

	struct mlx5e_dcbx          dcbx;
@@ -873,12 +853,6 @@ void mlx5e_ethtool_init_steering(struct mlx5e_priv *priv); 
void mlx5e_ethtool_cleanup_steering(struct mlx5e_priv *priv);

void mlx5e_set_rx_mode_work(struct work_struct *work);



void mlx5e_fill_hwstamp(struct mlx5e_tstamp *clock, u64 timestamp,

			struct skb_shared_hwtstamps *hwts);

void mlx5e_timestamp_init(struct mlx5e_priv *priv);

void mlx5e_timestamp_cleanup(struct mlx5e_priv *priv);

void mlx5e_pps_event_handler(struct mlx5e_priv *priv,

			     struct ptp_clock_event *event);

int mlx5e_hwstamp_set(struct mlx5e_priv *priv, struct ifreq *ifr);

int mlx5e_hwstamp_get(struct mlx5e_priv *priv, struct ifreq *ifr);

int mlx5e_modify_rx_cqe_compression_locked(struct mlx5e_priv *priv, bool val);
@@ -889,6 +863,7 @@ int mlx5e_vlan_rx_kill_vid(struct net_device *dev, __always_unused __be16 proto, 
			   u16 vid);

void mlx5e_enable_vlan_filter(struct mlx5e_priv *priv);

void mlx5e_disable_vlan_filter(struct mlx5e_priv *priv);

void mlx5e_timestamp_set(struct mlx5e_priv *priv);



struct mlx5e_redirect_rqt_param {

	bool is_rss;

drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c

+4 −3
Original line number Diff line number Diff line
@@ -1417,14 +1417,15 @@ static int mlx5e_set_pauseparam(struct net_device *netdev, 
int mlx5e_ethtool_get_ts_info(struct mlx5e_priv *priv,

			      struct ethtool_ts_info *info)

{

	struct mlx5_core_dev *mdev = priv->mdev;

	int ret;



	ret = ethtool_op_get_ts_info(priv->netdev, info);

	if (ret)

		return ret;



	info->phc_index = priv->tstamp.ptp ?

			  ptp_clock_index(priv->tstamp.ptp) : -1;

	info->phc_index = mdev->clock.ptp ?

			  ptp_clock_index(mdev->clock.ptp) : -1;



	if (!MLX5_CAP_GEN(priv->mdev, device_frequency_khz))

		return 0;
@@ -1754,7 +1755,7 @@ static int set_pflag_rx_cqe_compress(struct net_device *netdev, 
	if (!MLX5_CAP_GEN(mdev, cqe_compression))

		return -EOPNOTSUPP;



	if (enable && priv->tstamp.hwtstamp_config.rx_filter != HWTSTAMP_FILTER_NONE) {

	if (enable && priv->tstamp.rx_filter != HWTSTAMP_FILTER_NONE) {

		netdev_err(netdev, "Can't enable cqe compression while timestamping is enabled.\n");

		return -EINVAL;

	}

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+83 −12
Original line number Diff line number Diff line
@@ -373,8 +373,6 @@ static void mlx5e_async_event(struct mlx5_core_dev *mdev, void *vpriv, 
			      enum mlx5_dev_event event, unsigned long param)

{

	struct mlx5e_priv *priv = vpriv;

	struct ptp_clock_event ptp_event;

	struct mlx5_eqe *eqe = NULL;



	if (!test_bit(MLX5E_STATE_ASYNC_EVENTS_ENABLED, &priv->state))

		return;
@@ -384,14 +382,6 @@ static void mlx5e_async_event(struct mlx5_core_dev *mdev, void *vpriv, 
	case MLX5_DEV_EVENT_PORT_DOWN:

		queue_work(priv->wq, &priv->update_carrier_work);

		break;

	case MLX5_DEV_EVENT_PPS:

		eqe = (struct mlx5_eqe *)param;

		ptp_event.index = eqe->data.pps.pin;

		ptp_event.timestamp =

			timecounter_cyc2time(&priv->tstamp.clock,

					     be64_to_cpu(eqe->data.pps.time_stamp));

		mlx5e_pps_event_handler(vpriv, &ptp_event);

		break;

	default:

		break;

	}
@@ -585,6 +575,7 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c, 
	rq->pdev    = c->pdev;

	rq->netdev  = c->netdev;

	rq->tstamp  = c->tstamp;

	rq->clock   = &mdev->clock;

	rq->channel = c;

	rq->ix      = c->ix;

	rq->mdev    = mdev;
@@ -1123,6 +1114,7 @@ static int mlx5e_alloc_txqsq(struct mlx5e_channel *c, 


	sq->pdev      = c->pdev;

	sq->tstamp    = c->tstamp;

	sq->clock     = &mdev->clock;

	sq->mkey_be   = c->mkey_be;

	sq->channel   = c;

	sq->txq_ix    = txq_ix;
@@ -2678,6 +2670,12 @@ void mlx5e_switch_priv_channels(struct mlx5e_priv *priv, 
		netif_carrier_on(netdev);

}



void mlx5e_timestamp_set(struct mlx5e_priv *priv)

{

	priv->tstamp.tx_type   = HWTSTAMP_TX_OFF;

	priv->tstamp.rx_filter = HWTSTAMP_FILTER_NONE;

}



int mlx5e_open_locked(struct net_device *netdev)

{

	struct mlx5e_priv *priv = netdev_priv(netdev);
@@ -2693,7 +2691,7 @@ int mlx5e_open_locked(struct net_device *netdev) 
	mlx5e_activate_priv_channels(priv);

	if (priv->profile->update_carrier)

		priv->profile->update_carrier(priv);

	mlx5e_timestamp_init(priv);

	mlx5e_timestamp_set(priv);



	if (priv->profile->update_stats)

		queue_delayed_work(priv->wq, &priv->update_stats_work, 0);
@@ -2731,7 +2729,6 @@ int mlx5e_close_locked(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);
@@ -3403,6 +3400,80 @@ static int mlx5e_change_mtu(struct net_device *netdev, int new_mtu) 
	return err;

}



int mlx5e_hwstamp_set(struct mlx5e_priv *priv, struct ifreq *ifr)

{

	struct hwtstamp_config config;

	int err;



	if (!MLX5_CAP_GEN(priv->mdev, device_frequency_khz))

		return -EOPNOTSUPP;



	if (copy_from_user(&config, ifr->ifr_data, sizeof(config)))

		return -EFAULT;



	/* TX HW timestamp */

	switch (config.tx_type) {

	case HWTSTAMP_TX_OFF:

	case HWTSTAMP_TX_ON:

		break;

	default:

		return -ERANGE;

	}



	mutex_lock(&priv->state_lock);

	/* RX HW timestamp */

	switch (config.rx_filter) {

	case HWTSTAMP_FILTER_NONE:

		/* Reset CQE compression to Admin default */

		mlx5e_modify_rx_cqe_compression_locked(priv, priv->channels.params.rx_cqe_compress_def);

		break;

	case HWTSTAMP_FILTER_ALL:

	case HWTSTAMP_FILTER_SOME:

	case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:

	case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:

	case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:

	case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:

	case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:

	case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:

	case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:

	case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:

	case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:

	case HWTSTAMP_FILTER_PTP_V2_EVENT:

	case HWTSTAMP_FILTER_PTP_V2_SYNC:

	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:

	case HWTSTAMP_FILTER_NTP_ALL:

		/* Disable CQE compression */

		netdev_warn(priv->netdev, "Disabling cqe compression");

		err = mlx5e_modify_rx_cqe_compression_locked(priv, false);

		if (err) {

			netdev_err(priv->netdev, "Failed disabling cqe compression err=%d\n", err);

			mutex_unlock(&priv->state_lock);

			return err;

		}

		config.rx_filter = HWTSTAMP_FILTER_ALL;

		break;

	default:

		mutex_unlock(&priv->state_lock);

		return -ERANGE;

	}



	memcpy(&priv->tstamp, &config, sizeof(config));

	mutex_unlock(&priv->state_lock);



	return copy_to_user(ifr->ifr_data, &config,

			    sizeof(config)) ? -EFAULT : 0;

}



int mlx5e_hwstamp_get(struct mlx5e_priv *priv, struct ifreq *ifr)

{

	struct hwtstamp_config *cfg = &priv->tstamp;



	if (!MLX5_CAP_GEN(priv->mdev, device_frequency_khz))

		return -EOPNOTSUPP;



	return copy_to_user(ifr->ifr_data, cfg, sizeof(*cfg)) ? -EFAULT : 0;

}



static int mlx5e_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)

{

	struct mlx5e_priv *priv = netdev_priv(dev);

drivers/net/ethernet/mellanox/mlx5/core/en_rx.c

+9 −8
Original line number Diff line number Diff line
@@ -42,10 +42,11 @@ 
#include "en_rep.h"

#include "ipoib/ipoib.h"

#include "en_accel/ipsec_rxtx.h"

#include "lib/clock.h"



static inline bool mlx5e_rx_hw_stamp(struct mlx5e_tstamp *tstamp)

static inline bool mlx5e_rx_hw_stamp(struct hwtstamp_config *config)

{

	return tstamp->hwtstamp_config.rx_filter == HWTSTAMP_FILTER_ALL;

	return config->rx_filter == HWTSTAMP_FILTER_ALL;

}



static inline void mlx5e_read_cqe_slot(struct mlx5e_cq *cq, u32 cqcc,
@@ -661,7 +662,6 @@ static inline void mlx5e_build_rx_skb(struct mlx5_cqe64 *cqe, 
				      struct sk_buff *skb)

{

	struct net_device *netdev = rq->netdev;

	struct mlx5e_tstamp *tstamp = rq->tstamp;

	int lro_num_seg;



	lro_num_seg = be32_to_cpu(cqe->srqn) >> 24;
@@ -676,8 +676,9 @@ static inline void mlx5e_build_rx_skb(struct mlx5_cqe64 *cqe, 
		rq->stats.lro_bytes += cqe_bcnt;

	}



	if (unlikely(mlx5e_rx_hw_stamp(tstamp)))

		mlx5e_fill_hwstamp(tstamp, get_cqe_ts(cqe), skb_hwtstamps(skb));

	if (unlikely(mlx5e_rx_hw_stamp(rq->tstamp)))

		skb_hwtstamps(skb)->hwtstamp =

				mlx5_timecounter_cyc2time(rq->clock, get_cqe_ts(cqe));



	skb_record_rx_queue(skb, rq->ix);
@@ -1163,7 +1164,6 @@ 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;
@@ -1188,8 +1188,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));

	if (unlikely(mlx5e_rx_hw_stamp(rq->tstamp)))

		skb_hwtstamps(skb)->hwtstamp =

				mlx5_timecounter_cyc2time(rq->clock, get_cqe_ts(cqe));



	skb_record_rx_queue(skb, rq->ix);

drivers/net/ethernet/mellanox/mlx5/core/en_tx.c

+4 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "en.h"

#include "ipoib/ipoib.h"

#include "en_accel/ipsec_rxtx.h"

#include "lib/clock.h"



#define MLX5E_SQ_NOPS_ROOM  MLX5_SEND_WQE_MAX_WQEBBS

#define MLX5E_SQ_STOP_ROOM (MLX5_SEND_WQE_MAX_WQEBBS +\
@@ -452,8 +453,9 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget) 
				     SKBTX_HW_TSTAMP)) {

				struct skb_shared_hwtstamps hwts = {};



				mlx5e_fill_hwstamp(sq->tstamp,

						   get_cqe_ts(cqe), &hwts);

				hwts.hwtstamp =

					mlx5_timecounter_cyc2time(sq->clock,

								  get_cqe_ts(cqe));

				skb_tstamp_tx(skb, &hwts);

			}