Commit 44c32039 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux 

Saeed Mahameed says:
====================
pull-request: mlx5-next 2021-02-16

The patches in this pr are already submitted and reviewed through the
netdev and rdma mailing lists.

The series includes mlx5 HW bits and definitions for mlx5 real time clock
translation and handling in the mlx5 driver clock module to enable and
support such mode [1]

[1] https://patchwork.kernel.org/project/netdevbpf/patch/20210212223042.449816-7-saeed@kernel.org/


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 18af77c5 432119de

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

+3 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#include "en/fs.h"

#include "en/qos.h"

#include "lib/hv_vhca.h"

#include "lib/clock.h"



extern const struct net_device_ops mlx5e_netdev_ops;

struct page_pool;
@@ -393,6 +394,7 @@ struct mlx5e_txqsq { 
	u32                        rate_limit;

	struct work_struct         recover_work;

	struct mlx5e_ptpsq        *ptpsq;

	cqe_ts_to_ns               ptp_cyc2time;

} ____cacheline_aligned_in_smp;



struct mlx5e_dma_info {
@@ -655,6 +657,7 @@ struct mlx5e_rq { 


	/* XDP read-mostly */

	struct xdp_rxq_info    xdp_rxq;

	cqe_ts_to_ns           ptp_cyc2time;

} ____cacheline_aligned_in_smp;



enum mlx5e_channel_state {

drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c

+5 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 


#include "en/ptp.h"

#include "en/txrx.h"

#include "lib/clock.h"



struct mlx5e_skb_cb_hwtstamp {

	ktime_t cqe_hwtstamp;
@@ -70,6 +69,7 @@ static void mlx5e_ptp_handle_ts_cqe(struct mlx5e_ptpsq *ptpsq, 
				    int budget)

{

	struct sk_buff *skb = mlx5e_skb_fifo_pop(&ptpsq->skb_fifo);

	struct mlx5e_txqsq *sq = &ptpsq->txqsq;

	ktime_t hwtstamp;



	if (unlikely(MLX5E_RX_ERR_CQE(cqe))) {
@@ -77,7 +77,7 @@ static void mlx5e_ptp_handle_ts_cqe(struct mlx5e_ptpsq *ptpsq, 
		goto out;

	}



	hwtstamp = mlx5_timecounter_cyc2time(ptpsq->txqsq.clock, get_cqe_ts(cqe));

	hwtstamp = mlx5e_cqe_ts_to_ns(sq->ptp_cyc2time, sq->clock, get_cqe_ts(cqe));

	mlx5e_skb_cb_hwtstamp_handler(skb, MLX5E_SKB_CB_PORT_HWTSTAMP,

				      hwtstamp, ptpsq->cq_stats);

	ptpsq->cq_stats->cqe++;
@@ -183,6 +183,9 @@ static int mlx5e_ptp_alloc_txqsq(struct mlx5e_port_ptp *c, int txq_ix, 
	if (!MLX5_CAP_ETH(mdev, wqe_vlan_insert))

		set_bit(MLX5E_SQ_STATE_VLAN_NEED_L2_INLINE, &sq->state);

	sq->stop_room = param->stop_room;

	sq->ptp_cyc2time = mlx5_is_real_time_sq(mdev) ?

			   mlx5_real_time_cyc2time :

			   mlx5_timecounter_cyc2time;



	node = dev_to_node(mlx5_core_dma_dev(mdev));

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

+7 −0
Original line number Diff line number Diff line
@@ -26,6 +26,13 @@ 


#define MLX5E_RX_ERR_CQE(cqe) (get_cqe_opcode(cqe) != MLX5_CQE_RESP_SEND)



static inline

ktime_t mlx5e_cqe_ts_to_ns(cqe_ts_to_ns func, struct mlx5_clock *clock, u64 cqe_ts)

{

	return INDIRECT_CALL_2(func, mlx5_real_time_cyc2time, mlx5_timecounter_cyc2time,

			       clock, cqe_ts);

}



enum mlx5e_icosq_wqe_type {

	MLX5E_ICOSQ_WQE_NOP,

	MLX5E_ICOSQ_WQE_UMR_RX,

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

+17 −1
Original line number Diff line number Diff line
@@ -449,6 +449,9 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c, 
	rq->hw_mtu  = MLX5E_SW2HW_MTU(params, params->sw_mtu);

	rq->xdpsq   = &c->rq_xdpsq;

	rq->xsk_pool = xsk_pool;

	rq->ptp_cyc2time = mlx5_is_real_time_rq(mdev) ?

			   mlx5_real_time_cyc2time :

			   mlx5_timecounter_cyc2time;



	if (rq->xsk_pool)

		rq->stats = &c->priv->channel_stats[c->ix].xskrq;
@@ -680,7 +683,7 @@ static void mlx5e_free_rq(struct mlx5e_rq *rq) 
int mlx5e_create_rq(struct mlx5e_rq *rq, struct mlx5e_rq_param *param)

{

	struct mlx5_core_dev *mdev = rq->mdev;



	u8 ts_format;

	void *in;

	void *rqc;

	void *wq;
@@ -693,6 +696,9 @@ int mlx5e_create_rq(struct mlx5e_rq *rq, struct mlx5e_rq_param *param) 
	if (!in)

		return -ENOMEM;



	ts_format = mlx5_is_real_time_rq(mdev) ?

		    MLX5_RQC_TIMESTAMP_FORMAT_REAL_TIME :

		    MLX5_RQC_TIMESTAMP_FORMAT_FREE_RUNNING;

	rqc = MLX5_ADDR_OF(create_rq_in, in, ctx);

	wq  = MLX5_ADDR_OF(rqc, rqc, wq);
@@ -700,6 +706,7 @@ int mlx5e_create_rq(struct mlx5e_rq *rq, struct mlx5e_rq_param *param) 


	MLX5_SET(rqc,  rqc, cqn,		rq->cq.mcq.cqn);

	MLX5_SET(rqc,  rqc, state,		MLX5_RQC_STATE_RST);

	MLX5_SET(rqc,  rqc, ts_format,		ts_format);

	MLX5_SET(wq,   wq,  log_wq_pg_sz,	rq->wq_ctrl.buf.page_shift -

						MLX5_ADAPTER_PAGE_SHIFT);

	MLX5_SET64(wq, wq,  dbr_addr,		rq->wq_ctrl.db.dma);
@@ -1179,6 +1186,9 @@ static int mlx5e_alloc_txqsq(struct mlx5e_channel *c, 
	if (param->is_mpw)

		set_bit(MLX5E_SQ_STATE_MPWQE, &sq->state);

	sq->stop_room = param->stop_room;

	sq->ptp_cyc2time = mlx5_is_real_time_sq(mdev) ?

			   mlx5_real_time_cyc2time :

			   mlx5_timecounter_cyc2time;



	param->wq.db_numa_node = cpu_to_node(c->cpu);

	err = mlx5_wq_cyc_create(mdev, &param->wq, sqc_wq, wq, &sq->wq_ctrl);
@@ -1212,6 +1222,7 @@ static int mlx5e_create_sq(struct mlx5_core_dev *mdev, 
			   struct mlx5e_create_sq_param *csp,

			   u32 *sqn)

{

	u8 ts_format;

	void *in;

	void *sqc;

	void *wq;
@@ -1224,6 +1235,9 @@ static int mlx5e_create_sq(struct mlx5_core_dev *mdev, 
	if (!in)

		return -ENOMEM;



	ts_format = mlx5_is_real_time_sq(mdev) ?

		    MLX5_SQC_TIMESTAMP_FORMAT_REAL_TIME :

		    MLX5_SQC_TIMESTAMP_FORMAT_FREE_RUNNING;

	sqc = MLX5_ADDR_OF(create_sq_in, in, ctx);

	wq = MLX5_ADDR_OF(sqc, sqc, wq);
@@ -1232,6 +1246,8 @@ static int mlx5e_create_sq(struct mlx5_core_dev *mdev, 
	MLX5_SET(sqc,  sqc, tis_num_0, csp->tisn);

	MLX5_SET(sqc,  sqc, cqn, csp->cqn);

	MLX5_SET(sqc,  sqc, ts_cqe_to_dest_cqn, csp->ts_cqe_to_dest_cqn);

	MLX5_SET(sqc,  sqc, ts_format, ts_format);





	if (MLX5_CAP_ETH(mdev, wqe_inline_mode) == MLX5_CAP_INLINE_MODE_VPORT_CONTEXT)

		MLX5_SET(sqc,  sqc, min_wqe_inline_mode, csp->min_inline_mode);

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

+4 −7
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 
#include "fpga/ipsec.h"

#include "en_accel/ipsec_rxtx.h"

#include "en_accel/tls_rxtx.h"

#include "lib/clock.h"

#include "en/xdp.h"

#include "en/xsk/rx.h"

#include "en/health.h"
@@ -1062,9 +1061,8 @@ static inline void mlx5e_build_rx_skb(struct mlx5_cqe64 *cqe, 
	}



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

		skb_hwtstamps(skb)->hwtstamp =

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



		skb_hwtstamps(skb)->hwtstamp = mlx5e_cqe_ts_to_ns(rq->ptp_cyc2time,

								  rq->clock, get_cqe_ts(cqe));

	skb_record_rx_queue(skb, rq->ix);



	if (likely(netdev->features & NETIF_F_RXHASH))
@@ -1667,9 +1665,8 @@ static inline void mlx5i_complete_rx_cqe(struct mlx5e_rq *rq, 
	}



	if (unlikely(mlx5e_rx_hw_stamp(tstamp)))

		skb_hwtstamps(skb)->hwtstamp =

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



		skb_hwtstamps(skb)->hwtstamp = mlx5e_cqe_ts_to_ns(rq->ptp_cyc2time,

								  rq->clock, get_cqe_ts(cqe));

	skb_record_rx_queue(skb, rq->ix);



	if (likely(netdev->features & NETIF_F_RXHASH))