Commit 67044a88 authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Saeed Mahameed
Browse files

net/mlx5e: Move TX code into functions to be used by MPWQE 



mlx5e_txwqe_complete performs some actions that can be taken to separate
functions:

1. Update the flags needed for hardware timestamping.

2. Stop the TX queue if it's full.

Take these actions into separate functions to be reused by the MPWQE
code in the following commit and to maintain clear responsibilities of
functions.

Signed-off-by: default avatarMaxim Mikityanskiy <maximmi@mellanox.com>
Reviewed-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent b39fe61e

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

+17 −6
Original line number Diff line number Diff line
@@ -327,6 +327,20 @@ static void mlx5e_sq_calc_wqe_attr(struct sk_buff *skb, const struct mlx5e_tx_at 
	};

}



static void mlx5e_tx_skb_update_hwts_flags(struct sk_buff *skb)

{

	if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP))

		skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;

}



static void mlx5e_tx_check_stop(struct mlx5e_txqsq *sq)

{

	if (unlikely(!mlx5e_wqc_has_room_for(&sq->wq, sq->cc, sq->pc, sq->stop_room))) {

		netif_tx_stop_queue(sq->txq);

		sq->stats->stopped++;

	}

}



static inline void

mlx5e_txwqe_complete(struct mlx5e_txqsq *sq, struct sk_buff *skb,

		     const struct mlx5e_tx_attr *attr,
@@ -348,14 +362,11 @@ mlx5e_txwqe_complete(struct mlx5e_txqsq *sq, struct sk_buff *skb, 
	cseg->opmod_idx_opcode = cpu_to_be32((sq->pc << 8) | attr->opcode);

	cseg->qpn_ds           = cpu_to_be32((sq->sqn << 8) | wqe_attr->ds_cnt);



	if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP))

		skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;

	mlx5e_tx_skb_update_hwts_flags(skb);



	sq->pc += wi->num_wqebbs;

	if (unlikely(!mlx5e_wqc_has_room_for(wq, sq->cc, sq->pc, sq->stop_room))) {

		netif_tx_stop_queue(sq->txq);

		sq->stats->stopped++;

	}



	mlx5e_tx_check_stop(sq);



	send_doorbell = __netdev_tx_sent_queue(sq->txq, attr->num_bytes, xmit_more);

	if (send_doorbell)