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

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

Merge tag 'mlx5-updates-2017-06-20' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2017-06-20 (mlx5 IPoIB updates)

This series includes updates to mlx5 IPoIB netdevice driver (mlx5i),

1. We move ipoib files into separate directory, to allow it to grow
   separately in its own space
2. Remove HW update carrier logic from IPoIB and VF representors profiles.
3. Add basic ethtool support. (Rings options/statistics and driver info).
4. Change MTU support.
5. Xmit path statistics reporting.
6. add PTP support.

For the new ethtool ops, PTP (ioctl) and change_mtu ndos in IPoIB, we didn't add new
implementation or new logic, we only reused those callbacks from the already existing
mlx5e (ethernet netdevice profile) and exposed them in IPoIB netdevice/ethtool ops.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8abd5599 1170fbd8

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -15,4 +15,4 @@ mlx5_core-$(CONFIG_MLX5_CORE_EN) += wq.o eswitch.o eswitch_offloads.o \ 


mlx5_core-$(CONFIG_MLX5_CORE_EN_DCB) +=  en_dcbnl.o



mlx5_core-$(CONFIG_MLX5_CORE_IPOIB) += ipoib.o
 
mlx5_core-$(CONFIG_MLX5_CORE_IPOIB) += ipoib/ipoib.o ipoib/ethtool.o

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

+31 −4
Original line number Diff line number Diff line
@@ -52,8 +52,10 @@ 


#define MLX5_SET_CFG(p, f, v) MLX5_SET(create_flow_group_in, p, f, v)



#define MLX5E_HW2SW_MTU(hwmtu) ((hwmtu) - (ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN))

#define MLX5E_SW2HW_MTU(swmtu) ((swmtu) + (ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN))

#define MLX5E_ETH_HARD_MTU (ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN)



#define MLX5E_HW2SW_MTU(priv, hwmtu) ((hwmtu) - ((priv)->hard_mtu))

#define MLX5E_SW2HW_MTU(priv, swmtu) ((swmtu) + ((priv)->hard_mtu))



#define MLX5E_MAX_NUM_TC	8
@@ -747,6 +749,7 @@ struct mlx5e_priv { 
	struct mlx5e_tir           indir_tir[MLX5E_NUM_INDIR_TIRS];

	struct mlx5e_tir           direct_tir[MLX5E_MAX_NUM_CHANNELS];

	u32                        tx_rates[MLX5E_MAX_NUM_SQS];

	int                        hard_mtu;



	struct mlx5e_flow_steering fs;

	struct mlx5e_vxlan_db      vxlan;
@@ -782,6 +785,7 @@ struct mlx5e_profile { 
	void	(*enable)(struct mlx5e_priv *priv);

	void	(*disable)(struct mlx5e_priv *priv);

	void	(*update_stats)(struct mlx5e_priv *priv);

	void	(*update_carrier)(struct mlx5e_priv *priv);

	int	(*max_nch)(struct mlx5_core_dev *mdev);

	struct {

		mlx5e_fp_handle_rx_cqe handle_rx_cqe;
@@ -849,8 +853,8 @@ 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 net_device *dev, struct ifreq *ifr);

int mlx5e_hwstamp_get(struct net_device *dev, struct ifreq *ifr);

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);



int mlx5e_vlan_rx_add_vid(struct net_device *dev, __always_unused __be16 proto,
@@ -1021,6 +1025,29 @@ int mlx5e_open(struct net_device *netdev); 
void mlx5e_update_stats_work(struct work_struct *work);

u32 mlx5e_choose_lro_timeout(struct mlx5_core_dev *mdev, u32 wanted_timeout);



/* ethtool helpers */

void mlx5e_ethtool_get_drvinfo(struct mlx5e_priv *priv,

			       struct ethtool_drvinfo *drvinfo);

void mlx5e_ethtool_get_strings(struct mlx5e_priv *priv,

			       uint32_t stringset, uint8_t *data);

int mlx5e_ethtool_get_sset_count(struct mlx5e_priv *priv, int sset);

void mlx5e_ethtool_get_ethtool_stats(struct mlx5e_priv *priv,

				     struct ethtool_stats *stats, u64 *data);

void mlx5e_ethtool_get_ringparam(struct mlx5e_priv *priv,

				 struct ethtool_ringparam *param);

int mlx5e_ethtool_set_ringparam(struct mlx5e_priv *priv,

				struct ethtool_ringparam *param);

void mlx5e_ethtool_get_channels(struct mlx5e_priv *priv,

				struct ethtool_channels *ch);

int mlx5e_ethtool_set_channels(struct mlx5e_priv *priv,

			       struct ethtool_channels *ch);

int mlx5e_ethtool_get_coalesce(struct mlx5e_priv *priv,

			       struct ethtool_coalesce *coal);

int mlx5e_ethtool_set_coalesce(struct mlx5e_priv *priv,

			       struct ethtool_coalesce *coal);

int mlx5e_ethtool_get_ts_info(struct mlx5e_priv *priv,

			      struct ethtool_ts_info *info);



/* mlx5e generic netdev management API */

struct net_device*

mlx5e_create_netdev(struct mlx5_core_dev *mdev, const struct mlx5e_profile *profile,

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

+4 −6
Original line number Diff line number Diff line
@@ -86,9 +86,8 @@ static void mlx5e_timestamp_overflow(struct work_struct *work) 
	schedule_delayed_work(&tstamp->overflow_work, tstamp->overflow_period);

}



int mlx5e_hwstamp_set(struct net_device *dev, struct ifreq *ifr)

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

{

	struct mlx5e_priv *priv = netdev_priv(dev);

	struct hwtstamp_config config;

	int err;
@@ -130,10 +129,10 @@ int mlx5e_hwstamp_set(struct net_device *dev, struct ifreq *ifr) 
	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:

	case HWTSTAMP_FILTER_NTP_ALL:

		/* Disable CQE compression */

		netdev_warn(dev, "Disabling cqe compression");

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

		err = mlx5e_modify_rx_cqe_compression_locked(priv, false);

		if (err) {

			netdev_err(dev, "Failed disabling cqe compression err=%d\n", err);

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

			mutex_unlock(&priv->state_lock);

			return err;

		}
@@ -151,9 +150,8 @@ int mlx5e_hwstamp_set(struct net_device *dev, struct ifreq *ifr) 
			    sizeof(config)) ? -EFAULT : 0;

}



int mlx5e_hwstamp_get(struct net_device *dev, struct ifreq *ifr)

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

{

	struct mlx5e_priv *priv = netdev_priv(dev);

	struct hwtstamp_config *cfg = &priv->tstamp.hwtstamp_config;



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

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

+120 −39
Original line number Diff line number Diff line
@@ -32,10 +32,9 @@ 


#include "en.h"



static void mlx5e_get_drvinfo(struct net_device *dev,

void mlx5e_ethtool_get_drvinfo(struct mlx5e_priv *priv,

			       struct ethtool_drvinfo *drvinfo)

{

	struct mlx5e_priv *priv = netdev_priv(dev);

	struct mlx5_core_dev *mdev = priv->mdev;



	strlcpy(drvinfo->driver, DRIVER_NAME, sizeof(drvinfo->driver));
@@ -49,6 +48,14 @@ static void mlx5e_get_drvinfo(struct net_device *dev, 
		sizeof(drvinfo->bus_info));

}



static void mlx5e_get_drvinfo(struct net_device *dev,

			      struct ethtool_drvinfo *drvinfo)

{

	struct mlx5e_priv *priv = netdev_priv(dev);



	mlx5e_ethtool_get_drvinfo(priv, drvinfo);

}



struct ptys2ethtool_config {

	__ETHTOOL_DECLARE_LINK_MODE_MASK(supported);

	__ETHTOOL_DECLARE_LINK_MODE_MASK(advertised);
@@ -135,6 +142,9 @@ static unsigned long mlx5e_query_pfc_combined(struct mlx5e_priv *priv) 
	u8 pfc_en_rx;

	int err;



	if (MLX5_CAP_GEN(mdev, port_type) != MLX5_CAP_PORT_TYPE_ETH)

		return 0;



	err = mlx5_query_port_pfc(mdev, &pfc_en_tx, &pfc_en_rx);



	return err ? 0 : pfc_en_tx | pfc_en_rx;
@@ -147,6 +157,9 @@ static bool mlx5e_query_global_pause_combined(struct mlx5e_priv *priv) 
	u32 tx_pause;

	int err;



	if (MLX5_CAP_GEN(mdev, port_type) != MLX5_CAP_PORT_TYPE_ETH)

		return false;



	err = mlx5_query_port_pause(mdev, &rx_pause, &tx_pause);



	return err ? false : rx_pause | tx_pause;
@@ -160,9 +173,8 @@ static bool mlx5e_query_global_pause_combined(struct mlx5e_priv *priv) 
	((mlx5e_query_global_pause_combined(priv) + hweight8(mlx5e_query_pfc_combined(priv))) * \

	  NUM_PPORT_PER_PRIO_PFC_COUNTERS)



static int mlx5e_get_sset_count(struct net_device *dev, int sset)

int mlx5e_ethtool_get_sset_count(struct mlx5e_priv *priv, int sset)

{

	struct mlx5e_priv *priv = netdev_priv(dev);



	switch (sset) {

	case ETH_SS_STATS:
@@ -186,6 +198,13 @@ static int mlx5e_get_sset_count(struct net_device *dev, int sset) 
	}

}



static int mlx5e_get_sset_count(struct net_device *dev, int sset)

{

	struct mlx5e_priv *priv = netdev_priv(dev);



	return mlx5e_ethtool_get_sset_count(priv, sset);

}



static void mlx5e_fill_stats_strings(struct mlx5e_priv *priv, uint8_t *data)

{

	int i, j, tc, prio, idx = 0;
@@ -273,10 +292,9 @@ static void mlx5e_fill_stats_strings(struct mlx5e_priv *priv, uint8_t *data) 
					priv->channel_tc2txq[i][tc]);

}



static void mlx5e_get_strings(struct net_device *dev,

void mlx5e_ethtool_get_strings(struct mlx5e_priv *priv,

			       uint32_t stringset, uint8_t *data)

{

	struct mlx5e_priv *priv = netdev_priv(dev);

	int i;



	switch (stringset) {
@@ -297,10 +315,17 @@ static void mlx5e_get_strings(struct net_device *dev, 
	}

}



static void mlx5e_get_ethtool_stats(struct net_device *dev,

				    struct ethtool_stats *stats, u64 *data)

static void mlx5e_get_strings(struct net_device *dev,

			      uint32_t stringset, uint8_t *data)

{

	struct mlx5e_priv *priv = netdev_priv(dev);



	mlx5e_ethtool_get_strings(priv, stringset, data);

}



void mlx5e_ethtool_get_ethtool_stats(struct mlx5e_priv *priv,

				     struct ethtool_stats *stats, u64 *data)

{

	struct mlx5e_channels *channels;

	struct mlx5_priv *mlx5_priv;

	int i, j, tc, prio, idx = 0;
@@ -395,6 +420,15 @@ static void mlx5e_get_ethtool_stats(struct net_device *dev, 
								   sq_stats_desc, j);

}



static void mlx5e_get_ethtool_stats(struct net_device *dev,

				    struct ethtool_stats *stats,

				    u64 *data)

{

	struct mlx5e_priv *priv = netdev_priv(dev);



	mlx5e_ethtool_get_ethtool_stats(priv, stats, data);

}



static u32 mlx5e_rx_wqes_to_packets(struct mlx5e_priv *priv, int rq_wq_type,

				    int num_wqe)

{
@@ -439,10 +473,9 @@ static u32 mlx5e_packets_to_rx_wqes(struct mlx5e_priv *priv, int rq_wq_type, 
	return 1 << (order_base_2(num_wqes));

}



static void mlx5e_get_ringparam(struct net_device *dev,

void mlx5e_ethtool_get_ringparam(struct mlx5e_priv *priv,

				 struct ethtool_ringparam *param)

{

	struct mlx5e_priv *priv = netdev_priv(dev);

	int rq_wq_type = priv->channels.params.rq_wq_type;



	param->rx_max_pending = mlx5e_rx_wqes_to_packets(priv, rq_wq_type,
@@ -453,10 +486,17 @@ static void mlx5e_get_ringparam(struct net_device *dev, 
	param->tx_pending     = 1 << priv->channels.params.log_sq_size;

}



static int mlx5e_set_ringparam(struct net_device *dev,

static void mlx5e_get_ringparam(struct net_device *dev,

				struct ethtool_ringparam *param)

{

	struct mlx5e_priv *priv = netdev_priv(dev);



	mlx5e_ethtool_get_ringparam(priv, param);

}



int mlx5e_ethtool_set_ringparam(struct mlx5e_priv *priv,

				struct ethtool_ringparam *param)

{

	int rq_wq_type = priv->channels.params.rq_wq_type;

	struct mlx5e_channels new_channels = {};

	u32 rx_pending_wqes;
@@ -468,12 +508,12 @@ static int mlx5e_set_ringparam(struct net_device *dev, 
	int err = 0;



	if (param->rx_jumbo_pending) {

		netdev_info(dev, "%s: rx_jumbo_pending not supported\n",

		netdev_info(priv->netdev, "%s: rx_jumbo_pending not supported\n",

			    __func__);

		return -EINVAL;

	}

	if (param->rx_mini_pending) {

		netdev_info(dev, "%s: rx_mini_pending not supported\n",

		netdev_info(priv->netdev, "%s: rx_mini_pending not supported\n",

			    __func__);

		return -EINVAL;

	}
@@ -486,13 +526,13 @@ static int mlx5e_set_ringparam(struct net_device *dev, 
						   param->rx_pending);



	if (param->rx_pending < min_rq_size) {

		netdev_info(dev, "%s: rx_pending (%d) < min (%d)\n",

		netdev_info(priv->netdev, "%s: rx_pending (%d) < min (%d)\n",

			    __func__, param->rx_pending,

			    min_rq_size);

		return -EINVAL;

	}

	if (param->rx_pending > max_rq_size) {

		netdev_info(dev, "%s: rx_pending (%d) > max (%d)\n",

		netdev_info(priv->netdev, "%s: rx_pending (%d) > max (%d)\n",

			    __func__, param->rx_pending,

			    max_rq_size);

		return -EINVAL;
@@ -501,19 +541,19 @@ static int mlx5e_set_ringparam(struct net_device *dev, 
	num_mtts = MLX5E_REQUIRED_MTTS(rx_pending_wqes);

	if (priv->channels.params.rq_wq_type == MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ &&

	    !MLX5E_VALID_NUM_MTTS(num_mtts)) {

		netdev_info(dev, "%s: rx_pending (%d) request can't be satisfied, try to reduce.\n",

		netdev_info(priv->netdev, "%s: rx_pending (%d) request can't be satisfied, try to reduce.\n",

			    __func__, param->rx_pending);

		return -EINVAL;

	}



	if (param->tx_pending < (1 << MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE)) {

		netdev_info(dev, "%s: tx_pending (%d) < min (%d)\n",

		netdev_info(priv->netdev, "%s: tx_pending (%d) < min (%d)\n",

			    __func__, param->tx_pending,

			    1 << MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE);

		return -EINVAL;

	}

	if (param->tx_pending > (1 << MLX5E_PARAMS_MAXIMUM_LOG_SQ_SIZE)) {

		netdev_info(dev, "%s: tx_pending (%d) > max (%d)\n",

		netdev_info(priv->netdev, "%s: tx_pending (%d) > max (%d)\n",

			    __func__, param->tx_pending,

			    1 << MLX5E_PARAMS_MAXIMUM_LOG_SQ_SIZE);

		return -EINVAL;
@@ -549,26 +589,39 @@ static int mlx5e_set_ringparam(struct net_device *dev, 
	return err;

}



static void mlx5e_get_channels(struct net_device *dev,

			       struct ethtool_channels *ch)

static int mlx5e_set_ringparam(struct net_device *dev,

			       struct ethtool_ringparam *param)

{

	struct mlx5e_priv *priv = netdev_priv(dev);



	return mlx5e_ethtool_set_ringparam(priv, param);

}



void mlx5e_ethtool_get_channels(struct mlx5e_priv *priv,

				struct ethtool_channels *ch)

{

	ch->max_combined   = priv->profile->max_nch(priv->mdev);

	ch->combined_count = priv->channels.params.num_channels;

}



static int mlx5e_set_channels(struct net_device *dev,

static void mlx5e_get_channels(struct net_device *dev,

			       struct ethtool_channels *ch)

{

	struct mlx5e_priv *priv = netdev_priv(dev);



	mlx5e_ethtool_get_channels(priv, ch);

}



int mlx5e_ethtool_set_channels(struct mlx5e_priv *priv,

			       struct ethtool_channels *ch)

{

	unsigned int count = ch->combined_count;

	struct mlx5e_channels new_channels = {};

	bool arfs_enabled;

	int err = 0;



	if (!count) {

		netdev_info(dev, "%s: combined_count=0 not supported\n",

		netdev_info(priv->netdev, "%s: combined_count=0 not supported\n",

			    __func__);

		return -EINVAL;

	}
@@ -593,7 +646,7 @@ static int mlx5e_set_channels(struct net_device *dev, 
	if (err)

		goto out;



	arfs_enabled = dev->features & NETIF_F_NTUPLE;

	arfs_enabled = priv->netdev->features & NETIF_F_NTUPLE;

	if (arfs_enabled)

		mlx5e_arfs_disable(priv);
@@ -603,7 +656,7 @@ static int mlx5e_set_channels(struct net_device *dev, 
	if (arfs_enabled) {

		err = mlx5e_arfs_enable(priv);

		if (err)

			netdev_err(dev, "%s: mlx5e_arfs_enable failed: %d\n",

			netdev_err(priv->netdev, "%s: mlx5e_arfs_enable failed: %d\n",

				   __func__, err);

	}
@@ -613,11 +666,17 @@ static int mlx5e_set_channels(struct net_device *dev, 
	return err;

}



static int mlx5e_get_coalesce(struct net_device *netdev,

			      struct ethtool_coalesce *coal)

static int mlx5e_set_channels(struct net_device *dev,

			      struct ethtool_channels *ch)

{

	struct mlx5e_priv *priv = netdev_priv(netdev);

	struct mlx5e_priv *priv = netdev_priv(dev);



	return mlx5e_ethtool_set_channels(priv, ch);

}



int mlx5e_ethtool_get_coalesce(struct mlx5e_priv *priv,

			       struct ethtool_coalesce *coal)

{

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

		return -EOPNOTSUPP;
@@ -630,6 +689,14 @@ static int mlx5e_get_coalesce(struct net_device *netdev, 
	return 0;

}



static int mlx5e_get_coalesce(struct net_device *netdev,

			      struct ethtool_coalesce *coal)

{

	struct mlx5e_priv *priv = netdev_priv(netdev);



	return mlx5e_ethtool_get_coalesce(priv, coal);

}



static void

mlx5e_set_priv_channels_coalesce(struct mlx5e_priv *priv, struct ethtool_coalesce *coal)

{
@@ -653,10 +720,9 @@ mlx5e_set_priv_channels_coalesce(struct mlx5e_priv *priv, struct ethtool_coalesc 
	}

}



static int mlx5e_set_coalesce(struct net_device *netdev,

int mlx5e_ethtool_set_coalesce(struct mlx5e_priv *priv,

			       struct ethtool_coalesce *coal)

{

	struct mlx5e_priv *priv    = netdev_priv(netdev);

	struct mlx5_core_dev *mdev = priv->mdev;

	struct mlx5e_channels new_channels = {};

	int err = 0;
@@ -699,6 +765,14 @@ static int mlx5e_set_coalesce(struct net_device *netdev, 
	return err;

}



static int mlx5e_set_coalesce(struct net_device *netdev,

			      struct ethtool_coalesce *coal)

{

	struct mlx5e_priv *priv    = netdev_priv(netdev);



	return mlx5e_ethtool_set_coalesce(priv, coal);

}



static void ptys2ethtool_supported_link(unsigned long *supported_modes,

					u32 eth_proto_cap)

{
@@ -1298,13 +1372,12 @@ static int mlx5e_set_pauseparam(struct net_device *netdev, 
	return err;

}



static int mlx5e_get_ts_info(struct net_device *dev,

int mlx5e_ethtool_get_ts_info(struct mlx5e_priv *priv,

			      struct ethtool_ts_info *info)

{

	struct mlx5e_priv *priv = netdev_priv(dev);

	int ret;



	ret = ethtool_op_get_ts_info(dev, info);

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

	if (ret)

		return ret;
@@ -1327,6 +1400,14 @@ static int mlx5e_get_ts_info(struct net_device *dev, 
	return 0;

}



static int mlx5e_get_ts_info(struct net_device *dev,

			     struct ethtool_ts_info *info)

{

	struct mlx5e_priv *priv = netdev_priv(dev);



	return mlx5e_ethtool_get_ts_info(priv, info);

}



static __u32 mlx5e_get_wol_supported(struct mlx5_core_dev *mdev)

{

	__u32 ret = 0;

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

+20 −10
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ static void mlx5e_update_carrier_work(struct work_struct *work) 


	mutex_lock(&priv->state_lock);

	if (test_bit(MLX5E_STATE_OPENED, &priv->state))

		mlx5e_update_carrier(priv);

		if (priv->profile->update_carrier)

			priv->profile->update_carrier(priv);

	mutex_unlock(&priv->state_lock);

}
@@ -634,7 +635,7 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c, 


		rq->buff.wqe_sz = params->lro_en  ?

				params->lro_wqe_sz :

				MLX5E_SW2HW_MTU(c->netdev->mtu);

				MLX5E_SW2HW_MTU(c->priv, c->netdev->mtu);

		byte_count = rq->buff.wqe_sz;



		/* calc the required page order */
@@ -2467,7 +2468,7 @@ static int mlx5e_modify_tirs_lro(struct mlx5e_priv *priv) 
static int mlx5e_set_mtu(struct mlx5e_priv *priv, u16 mtu)

{

	struct mlx5_core_dev *mdev = priv->mdev;

	u16 hw_mtu = MLX5E_SW2HW_MTU(mtu);

	u16 hw_mtu = MLX5E_SW2HW_MTU(priv, mtu);

	int err;



	err = mlx5_set_port_mtu(mdev, hw_mtu, 1);
@@ -2489,7 +2490,7 @@ static void mlx5e_query_mtu(struct mlx5e_priv *priv, u16 *mtu) 
	if (err || !hw_mtu) /* fallback to port oper mtu */

		mlx5_query_port_oper_mtu(mdev, &hw_mtu, 1);



	*mtu = MLX5E_HW2SW_MTU(hw_mtu);

	*mtu = MLX5E_HW2SW_MTU(priv, hw_mtu);

}



static int mlx5e_set_dev_port_mtu(struct mlx5e_priv *priv)
@@ -2598,9 +2599,10 @@ void mlx5e_switch_priv_channels(struct mlx5e_priv *priv, 
{

	struct net_device *netdev = priv->netdev;

	int new_num_txqs;



	int carrier_ok;

	new_num_txqs = new_chs->num * new_chs->params.num_tc;



	carrier_ok = netif_carrier_ok(netdev);

	netif_carrier_off(netdev);



	if (new_num_txqs < netdev->real_num_tx_queues)
@@ -2618,7 +2620,9 @@ void mlx5e_switch_priv_channels(struct mlx5e_priv *priv, 
	mlx5e_refresh_tirs(priv, false);

	mlx5e_activate_priv_channels(priv);



	mlx5e_update_carrier(priv);

	/* return carrier back if needed */

	if (carrier_ok)

		netif_carrier_on(netdev);

}



int mlx5e_open_locked(struct net_device *netdev)
@@ -2634,7 +2638,8 @@ int mlx5e_open_locked(struct net_device *netdev) 


	mlx5e_refresh_tirs(priv, false);

	mlx5e_activate_priv_channels(priv);

	mlx5e_update_carrier(priv);

	if (priv->profile->update_carrier)

		priv->profile->update_carrier(priv);

	mlx5e_timestamp_init(priv);



	if (priv->profile->update_stats)
@@ -3312,11 +3317,13 @@ static int mlx5e_change_mtu(struct net_device *netdev, int new_mtu) 


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

{

	struct mlx5e_priv *priv = netdev_priv(dev);



	switch (cmd) {

	case SIOCSHWTSTAMP:

		return mlx5e_hwstamp_set(dev, ifr);

		return mlx5e_hwstamp_set(priv, ifr);

	case SIOCGHWTSTAMP:

		return mlx5e_hwstamp_get(dev, ifr);

		return mlx5e_hwstamp_get(priv, ifr);

	default:

		return -EOPNOTSUPP;

	}
@@ -3871,6 +3878,7 @@ void mlx5e_build_nic_params(struct mlx5_core_dev *mdev, 
	mlx5e_set_rq_params(mdev, params);



	/* HW LRO */



	/* TODO: && MLX5_CAP_ETH(mdev, lro_cap) */

	if (params->rq_wq_type == MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ)

		params->lro_en = hw_lro_heuristic(link_speed, pci_bw);
@@ -3911,6 +3919,7 @@ static void mlx5e_build_nic_netdev_priv(struct mlx5_core_dev *mdev, 
	priv->netdev      = netdev;

	priv->profile     = profile;

	priv->ppriv       = ppriv;

	priv->hard_mtu = MLX5E_ETH_HARD_MTU;



	mlx5e_build_nic_params(mdev, &priv->channels.params, profile->max_nch(mdev));
@@ -4156,7 +4165,7 @@ static void mlx5e_nic_enable(struct mlx5e_priv *priv) 
	/* MTU range: 68 - hw-specific max */

	netdev->min_mtu = ETH_MIN_MTU;

	mlx5_query_port_max_mtu(priv->mdev, &max_mtu, 1);

	netdev->max_mtu = MLX5E_HW2SW_MTU(max_mtu);

	netdev->max_mtu = MLX5E_HW2SW_MTU(priv, max_mtu);

	mlx5e_set_dev_port_mtu(priv);



	mlx5_lag_add(mdev, netdev);
@@ -4215,6 +4224,7 @@ static const struct mlx5e_profile mlx5e_nic_profile = { 
	.disable	   = mlx5e_nic_disable,

	.update_stats	   = mlx5e_update_ndo_stats,

	.max_nch	   = mlx5e_get_max_num_channels,

	.update_carrier	   = mlx5e_update_carrier,

	.rx_handlers.handle_rx_cqe       = mlx5e_handle_rx_cqe,

	.rx_handlers.handle_rx_cqe_mpwqe = mlx5e_handle_rx_cqe_mpwrq,

	.max_tc		   = MLX5E_MAX_NUM_TC,