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

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



Saeed Mahameed says:

====================
Mellanox, mlx5 fixes 2019-12-05

This series introduces some fixes to mlx5 driver.

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

For -stable v4.19:
 ('net/mlx5e: Query global pause state before setting prio2buffer')

For -stable v5.3
 ('net/mlx5e: Fix SFF 8472 eeprom length')
 ('net/mlx5e: Fix translation of link mode into speed')
 ('net/mlx5e: Fix freeing flow with kfree() and not kvfree()')
 ('net/mlx5e: ethtool, Fix analysis of speed setting')
 ('net/mlx5e: Fix TXQ indices to be sequential')
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 04aa1bc4 b7826076

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

+1 −1
Original line number Diff line number Diff line
@@ -816,7 +816,7 @@ struct mlx5e_xsk { 
struct mlx5e_priv {

	/* priv data path fields - start */

	struct mlx5e_txqsq *txq2sq[MLX5E_MAX_NUM_CHANNELS * MLX5E_MAX_NUM_TC];

	int channel_tc2txq[MLX5E_MAX_NUM_CHANNELS][MLX5E_MAX_NUM_TC];

	int channel_tc2realtxq[MLX5E_MAX_NUM_CHANNELS][MLX5E_MAX_NUM_TC];

#ifdef CONFIG_MLX5_CORE_EN_DCB

	struct mlx5e_dcbx_dp       dcbx_dp;

#endif

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

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ static const u32 mlx5e_ext_link_speed[MLX5E_EXT_LINK_MODES_NUMBER] = { 
	[MLX5E_50GAUI_2_LAUI_2_50GBASE_CR2_KR2]	= 50000,

	[MLX5E_50GAUI_1_LAUI_1_50GBASE_CR_KR]	= 50000,

	[MLX5E_CAUI_4_100GBASE_CR4_KR4]		= 100000,

	[MLX5E_100GAUI_2_100GBASE_CR2_KR2]	= 100000,

	[MLX5E_200GAUI_4_200GBASE_CR4_KR4]	= 200000,

	[MLX5E_400GAUI_8]			= 400000,

};

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

+25 −2
Original line number Diff line number Diff line
@@ -155,8 +155,11 @@ static int update_xoff_threshold(struct mlx5e_port_buffer *port_buffer, 
		}



		if (port_buffer->buffer[i].size <

		    (xoff + max_mtu + (1 << MLX5E_BUFFER_CELL_SHIFT)))

		    (xoff + max_mtu + (1 << MLX5E_BUFFER_CELL_SHIFT))) {

			pr_err("buffer_size[%d]=%d is not enough for lossless buffer\n",

			       i, port_buffer->buffer[i].size);

			return -ENOMEM;

		}



		port_buffer->buffer[i].xoff = port_buffer->buffer[i].size - xoff;

		port_buffer->buffer[i].xon  =
@@ -232,6 +235,26 @@ static int update_buffer_lossy(unsigned int max_mtu, 
	return 0;

}



static int fill_pfc_en(struct mlx5_core_dev *mdev, u8 *pfc_en)

{

	u32 g_rx_pause, g_tx_pause;

	int err;



	err = mlx5_query_port_pause(mdev, &g_rx_pause, &g_tx_pause);

	if (err)

		return err;



	/* If global pause enabled, set all active buffers to lossless.

	 * Otherwise, check PFC setting.

	 */

	if (g_rx_pause || g_tx_pause)

		*pfc_en = 0xff;

	else

		err = mlx5_query_port_pfc(mdev, pfc_en, NULL);



	return err;

}



#define MINIMUM_MAX_MTU 9216

int mlx5e_port_manual_buffer_config(struct mlx5e_priv *priv,

				    u32 change, unsigned int mtu,
@@ -277,7 +300,7 @@ int mlx5e_port_manual_buffer_config(struct mlx5e_priv *priv, 


	if (change & MLX5E_PORT_BUFFER_PRIO2BUFFER) {

		update_prio2buffer = true;

		err = mlx5_query_port_pfc(priv->mdev, &curr_pfc_en, NULL);

		err = fill_pfc_en(priv->mdev, &curr_pfc_en);

		if (err)

			return err;

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

+4 −11
Original line number Diff line number Diff line
@@ -1027,18 +1027,11 @@ static bool ext_link_mode_requested(const unsigned long *adver) 
	return bitmap_intersects(modes, adver, __ETHTOOL_LINK_MODE_MASK_NBITS);

}



static bool ext_speed_requested(u32 speed)

{

#define MLX5E_MAX_PTYS_LEGACY_SPEED 100000

	return !!(speed > MLX5E_MAX_PTYS_LEGACY_SPEED);

}



static bool ext_requested(u8 autoneg, const unsigned long *adver, u32 speed)

static bool ext_requested(u8 autoneg, const unsigned long *adver, bool ext_supported)

{

	bool ext_link_mode = ext_link_mode_requested(adver);

	bool ext_speed = ext_speed_requested(speed);



	return  autoneg == AUTONEG_ENABLE ? ext_link_mode : ext_speed;

	return  autoneg == AUTONEG_ENABLE ? ext_link_mode : ext_supported;

}



int mlx5e_ethtool_set_link_ksettings(struct mlx5e_priv *priv,
@@ -1065,8 +1058,8 @@ int mlx5e_ethtool_set_link_ksettings(struct mlx5e_priv *priv, 
	autoneg = link_ksettings->base.autoneg;

	speed = link_ksettings->base.speed;



	ext = ext_requested(autoneg, adver, speed),

	ext_supported = MLX5_CAP_PCAM_FEATURE(mdev, ptys_extended_ethernet);

	ext = ext_requested(autoneg, adver, ext_supported);

	if (!ext_supported && ext)

		return -EOPNOTSUPP;
@@ -1643,7 +1636,7 @@ static int mlx5e_get_module_info(struct net_device *netdev, 
		break;

	case MLX5_MODULE_ID_SFP:

		modinfo->type       = ETH_MODULE_SFF_8472;

		modinfo->eeprom_len = MLX5_EEPROM_PAGE_LENGTH;

		modinfo->eeprom_len = ETH_MODULE_SFF_8472_LEN;

		break;

	default:

		netdev_err(priv->netdev, "%s: cable type not recognized:0x%x\n",

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

+12 −19
Original line number Diff line number Diff line
@@ -1691,11 +1691,10 @@ static int mlx5e_open_sqs(struct mlx5e_channel *c, 
			  struct mlx5e_params *params,

			  struct mlx5e_channel_param *cparam)

{

	struct mlx5e_priv *priv = c->priv;

	int err, tc;



	for (tc = 0; tc < params->num_tc; tc++) {

		int txq_ix = c->ix + tc * priv->max_nch;

		int txq_ix = c->ix + tc * params->num_channels;



		err = mlx5e_open_txqsq(c, c->priv->tisn[c->lag_port][tc], txq_ix,

				       params, &cparam->sq, &c->sq[tc], tc);
@@ -2876,26 +2875,21 @@ static void mlx5e_netdev_set_tcs(struct net_device *netdev) 
		netdev_set_tc_queue(netdev, tc, nch, 0);

}



static void mlx5e_build_tc2txq_maps(struct mlx5e_priv *priv)

static void mlx5e_build_txq_maps(struct mlx5e_priv *priv)

{

	int i, tc;

	int i, ch;



	for (i = 0; i < priv->max_nch; i++)

		for (tc = 0; tc < priv->profile->max_tc; tc++)

			priv->channel_tc2txq[i][tc] = i + tc * priv->max_nch;

}

	ch = priv->channels.num;



static void mlx5e_build_tx2sq_maps(struct mlx5e_priv *priv)

{

	struct mlx5e_channel *c;

	struct mlx5e_txqsq *sq;

	int i, tc;

	for (i = 0; i < ch; i++) {

		int tc;



		for (tc = 0; tc < priv->channels.params.num_tc; tc++) {

			struct mlx5e_channel *c = priv->channels.c[i];

			struct mlx5e_txqsq *sq = &c->sq[tc];



	for (i = 0; i < priv->channels.num; i++) {

		c = priv->channels.c[i];

		for (tc = 0; tc < c->num_tc; tc++) {

			sq = &c->sq[tc];

			priv->txq2sq[sq->txq_ix] = sq;

			priv->channel_tc2realtxq[i][tc] = i + tc * ch;

		}

	}

}
@@ -2910,7 +2904,7 @@ void mlx5e_activate_priv_channels(struct mlx5e_priv *priv) 
	netif_set_real_num_tx_queues(netdev, num_txqs);

	netif_set_real_num_rx_queues(netdev, num_rxqs);



	mlx5e_build_tx2sq_maps(priv);

	mlx5e_build_txq_maps(priv);

	mlx5e_activate_channels(&priv->channels);

	mlx5e_xdp_tx_enable(priv);

	netif_tx_start_all_queues(priv->netdev);
@@ -5021,7 +5015,6 @@ static int mlx5e_nic_init(struct mlx5_core_dev *mdev, 
	if (err)

		mlx5_core_err(mdev, "TLS initialization failed, %d\n", err);

	mlx5e_build_nic_netdev(netdev);

	mlx5e_build_tc2txq_maps(priv);

	mlx5e_health_create_reporters(priv);



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE