Commit 9d0279d0 authored by David S. Miller's avatar David S. Miller
Browse files

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



Saeed Mahameed says:

====================
mlx5 fixes 2021-07-27

This series introduces some fixes to mlx5 driver.
Please pull and let me know if there is any problem.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8373cd38 740452e0

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

+1 −4
Original line number Diff line number Diff line
@@ -500,10 +500,7 @@ static int next_phys_dev(struct device *dev, const void *data) 
	return 1;

}



/* This function is called with two flows:

 * 1. During initialization of mlx5_core_dev and we don't need to lock it.

 * 2. During LAG configure stage and caller holds &mlx5_intf_mutex.

 */

/* Must be called with intf_mutex held */

struct mlx5_core_dev *mlx5_get_next_phys_dev(struct mlx5_core_dev *dev)

{

	struct auxiliary_device *adev;

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

+10 −1
Original line number Diff line number Diff line
@@ -471,6 +471,15 @@ static void mlx5e_build_rx_cq_param(struct mlx5_core_dev *mdev, 
	param->cq_period_mode = params->rx_cq_moderation.cq_period_mode;

}



static u8 rq_end_pad_mode(struct mlx5_core_dev *mdev, struct mlx5e_params *params)

{

	bool ro = pcie_relaxed_ordering_enabled(mdev->pdev) &&

		MLX5_CAP_GEN(mdev, relaxed_ordering_write);



	return ro && params->lro_en ?

		MLX5_WQ_END_PAD_MODE_NONE : MLX5_WQ_END_PAD_MODE_ALIGN;

}



int mlx5e_build_rq_param(struct mlx5_core_dev *mdev,

			 struct mlx5e_params *params,

			 struct mlx5e_xsk_param *xsk,
@@ -508,7 +517,7 @@ int mlx5e_build_rq_param(struct mlx5_core_dev *mdev, 
	}



	MLX5_SET(wq, wq, wq_type,          params->rq_wq_type);

	MLX5_SET(wq, wq, end_padding_mode, MLX5_WQ_END_PAD_MODE_ALIGN);

	MLX5_SET(wq, wq, end_padding_mode, rq_end_pad_mode(mdev, params));

	MLX5_SET(wq, wq, log_wq_stride,

		 mlx5e_get_rqwq_log_stride(params->rq_wq_type, ndsegs));

	MLX5_SET(wq, wq, pd,               mdev->mlx5e_res.hw_objs.pdn);

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

+5 −2
Original line number Diff line number Diff line
@@ -482,9 +482,12 @@ static void mlx5e_ptp_build_params(struct mlx5e_ptp *c, 
		params->log_sq_size = orig->log_sq_size;

		mlx5e_ptp_build_sq_param(c->mdev, params, &cparams->txq_sq_param);

	}

	if (test_bit(MLX5E_PTP_STATE_RX, c->state))

	/* RQ */

	if (test_bit(MLX5E_PTP_STATE_RX, c->state)) {

		params->vlan_strip_disable = orig->vlan_strip_disable;

		mlx5e_ptp_build_rq_param(c->mdev, c->netdev, c->priv->q_counter, cparams);

	}

}



static int mlx5e_init_ptp_rq(struct mlx5e_ptp *c, struct mlx5e_params *params,

			     struct mlx5e_rq *rq)
@@ -494,7 +497,7 @@ static int mlx5e_init_ptp_rq(struct mlx5e_ptp *c, struct mlx5e_params *params, 
	int err;



	rq->wq_type      = params->rq_wq_type;

	rq->pdev         = mdev->device;

	rq->pdev         = c->pdev;

	rq->netdev       = priv->netdev;

	rq->priv         = priv;

	rq->clock        = &mdev->clock;

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

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static void mlx5e_init_trap_rq(struct mlx5e_trap *t, struct mlx5e_params *params 
	struct mlx5e_priv *priv = t->priv;



	rq->wq_type      = params->rq_wq_type;

	rq->pdev         = mdev->device;

	rq->pdev         = t->pdev;

	rq->netdev       = priv->netdev;

	rq->priv         = priv;

	rq->clock        = &mdev->clock;

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

+26 −12
Original line number Diff line number Diff line
@@ -3384,7 +3384,7 @@ static int mlx5e_modify_channels_scatter_fcs(struct mlx5e_channels *chs, bool en 


static int mlx5e_modify_channels_vsd(struct mlx5e_channels *chs, bool vsd)

{

	int err = 0;

	int err;

	int i;



	for (i = 0; i < chs->num; i++) {
@@ -3392,6 +3392,8 @@ static int mlx5e_modify_channels_vsd(struct mlx5e_channels *chs, bool vsd) 
		if (err)

			return err;

	}

	if (chs->ptp && test_bit(MLX5E_PTP_STATE_RX, chs->ptp->state))

		return mlx5e_modify_rq_vsd(&chs->ptp->rq, vsd);



	return 0;

}
@@ -3829,6 +3831,24 @@ int mlx5e_set_features(struct net_device *netdev, netdev_features_t features) 
	return 0;

}



static netdev_features_t mlx5e_fix_uplink_rep_features(struct net_device *netdev,

						       netdev_features_t features)

{

	features &= ~NETIF_F_HW_TLS_RX;

	if (netdev->features & NETIF_F_HW_TLS_RX)

		netdev_warn(netdev, "Disabling hw_tls_rx, not supported in switchdev mode\n");



	features &= ~NETIF_F_HW_TLS_TX;

	if (netdev->features & NETIF_F_HW_TLS_TX)

		netdev_warn(netdev, "Disabling hw_tls_tx, not supported in switchdev mode\n");



	features &= ~NETIF_F_NTUPLE;

	if (netdev->features & NETIF_F_NTUPLE)

		netdev_warn(netdev, "Disabling ntuple, not supported in switchdev mode\n");



	return features;

}



static netdev_features_t mlx5e_fix_features(struct net_device *netdev,

					    netdev_features_t features)

{
@@ -3860,15 +3880,8 @@ static netdev_features_t mlx5e_fix_features(struct net_device *netdev, 
			netdev_warn(netdev, "Disabling rxhash, not supported when CQE compress is active\n");

	}



	if (mlx5e_is_uplink_rep(priv)) {

		features &= ~NETIF_F_HW_TLS_RX;

		if (netdev->features & NETIF_F_HW_TLS_RX)

			netdev_warn(netdev, "Disabling hw_tls_rx, not supported in switchdev mode\n");



		features &= ~NETIF_F_HW_TLS_TX;

		if (netdev->features & NETIF_F_HW_TLS_TX)

			netdev_warn(netdev, "Disabling hw_tls_tx, not supported in switchdev mode\n");

	}

	if (mlx5e_is_uplink_rep(priv))

		features = mlx5e_fix_uplink_rep_features(netdev, features);



	mutex_unlock(&priv->state_lock);
@@ -4859,6 +4872,9 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev) 
	if (MLX5_CAP_ETH(mdev, scatter_fcs))

		netdev->hw_features |= NETIF_F_RXFCS;



	if (mlx5_qos_is_supported(mdev))

		netdev->hw_features |= NETIF_F_HW_TC;



	netdev->features          = netdev->hw_features;



	/* Defaults */
@@ -4879,8 +4895,6 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev) 
		netdev->hw_features	 |= NETIF_F_NTUPLE;

#endif

	}

	if (mlx5_qos_is_supported(mdev))

		netdev->features |= NETIF_F_HW_TC;



	netdev->features         |= NETIF_F_HIGHDMA;

	netdev->features         |= NETIF_F_HW_VLAN_STAG_FILTER;