Commit 114a5c32 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5-fixes-2019-07-11' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
Mellanox, mlx5 fixes 2019-07-11

This series introduces some fixes to mlx5 driver.

Please pull and let me know if there is any problem.

For -stable v4.15
('net/mlx5e: IPoIB, Add error path in mlx5_rdma_setup_rn')

For -stable v5.1
('net/mlx5e: Fix port tunnel GRE entropy control')
('net/mlx5e: Rx, Fix checksum calculation for new hardware')
('net/mlx5e: Fix return value from timeout recover function')
('net/mlx5e: Fix error flow in tx reporter diagnose')

For -stable v5.2
('net/mlx5: E-Switch, Fix default encap mode')

Conflict note: This pull request will produce a small conflict when
merged with net-next.
In drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
Take the hunk from net and replace:
esw_offloads_steering_init(esw, vf_nvports, total_nvports);
with:
esw_offloads_steering_init(esw);
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 08d14c49 ef1ce7d7

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

+1 −0
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ enum { 
	MLX5E_RQ_STATE_ENABLED,

	MLX5E_RQ_STATE_AM,

	MLX5E_RQ_STATE_NO_CSUM_COMPLETE,

	MLX5E_RQ_STATE_CSUM_FULL, /* cqe_csum_full hw bit is set */

};



struct mlx5e_cq {

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

+4 −6
Original line number Diff line number Diff line
@@ -142,22 +142,20 @@ static int mlx5e_tx_reporter_timeout_recover(struct mlx5e_txqsq *sq) 
{

	struct mlx5_eq_comp *eq = sq->cq.mcq.eq;

	u32 eqe_count;

	int ret;



	netdev_err(sq->channel->netdev, "EQ 0x%x: Cons = 0x%x, irqn = 0x%x\n",

		   eq->core.eqn, eq->core.cons_index, eq->core.irqn);



	eqe_count = mlx5_eq_poll_irq_disabled(eq);

	ret = eqe_count ? false : true;

	if (!eqe_count) {

		clear_bit(MLX5E_SQ_STATE_ENABLED, &sq->state);

		return ret;

		return -EIO;

	}



	netdev_err(sq->channel->netdev, "Recover %d eqes on EQ 0x%x\n",

		   eqe_count, eq->core.eqn);

	sq->channel->stats->eq_rearm++;

	return ret;

	return 0;

}



int mlx5e_tx_reporter_timeout(struct mlx5e_txqsq *sq)
@@ -264,13 +262,13 @@ static int mlx5e_tx_reporter_diagnose(struct devlink_health_reporter *reporter, 


		err = mlx5_core_query_sq_state(priv->mdev, sq->sqn, &state);

		if (err)

			break;

			goto unlock;



		err = mlx5e_tx_reporter_build_diagnose_output(fmsg, sq->sqn,

							      state,

							      netif_xmit_stopped(sq->txq));

		if (err)

			break;

			goto unlock;

	}

	err = devlink_fmsg_arr_pair_nest_end(fmsg);

	if (err)

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

+3 −0
Original line number Diff line number Diff line
@@ -889,6 +889,9 @@ int mlx5e_open_rq(struct mlx5e_channel *c, struct mlx5e_params *params, 
	if (err)

		goto err_destroy_rq;



	if (MLX5_CAP_ETH(c->mdev, cqe_checksum_full))

		__set_bit(MLX5E_RQ_STATE_CSUM_FULL, &c->rq.state);



	if (params->rx_dim_enabled)

		__set_bit(MLX5E_RQ_STATE_AM, &c->rq.state);

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

+6 −1
Original line number Diff line number Diff line
@@ -923,8 +923,14 @@ static inline void mlx5e_handle_csum(struct net_device *netdev, 
		if (unlikely(get_ip_proto(skb, network_depth, proto) == IPPROTO_SCTP))

			goto csum_unnecessary;



		stats->csum_complete++;

		skb->ip_summed = CHECKSUM_COMPLETE;

		skb->csum = csum_unfold((__force __sum16)cqe->check_sum);



		if (test_bit(MLX5E_RQ_STATE_CSUM_FULL, &rq->state))

			return; /* CQE csum covers all received bytes */



		/* csum might need some fixups ...*/

		if (network_depth > ETH_HLEN)

			/* CQE csum is calculated from the IP header and does

			 * not cover VLAN headers (if present). This will add
@@ -935,7 +941,6 @@ static inline void mlx5e_handle_csum(struct net_device *netdev, 
						 skb->csum);



		mlx5e_skb_padding_csum(skb, network_depth, proto, stats);

		stats->csum_complete++;

		return;

	}

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

+0 −5
Original line number Diff line number Diff line
@@ -1946,11 +1946,6 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev) 
	esw->enabled_vports = 0;

	esw->mode = MLX5_ESWITCH_NONE;

	esw->offloads.inline_mode = MLX5_INLINE_MODE_NONE;

	if (MLX5_CAP_ESW_FLOWTABLE_FDB(dev, reformat) &&

	    MLX5_CAP_ESW_FLOWTABLE_FDB(dev, decap))

		esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_BASIC;

	else

		esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_NONE;



	dev->priv.eswitch = esw;

	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE