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

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

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



Saeed Mahameed says:

====================
Mellanox mlx5 fixes 2017-06-14

This series contains some fixes for the mlx5 core and netdev driver.

Please pull and let me know if there's any problem.

For -stable:
("net/mlx5: Wait for FW readiness before initializing command interface") kernels >= 4.4
("net/mlx5e: Fix timestamping capabilities reporting") kernels >= 4.5
("net/mlx5e: Avoid doing a cleanup call if the profile doesn't have it") kernels >= 4.9
("net/mlx5e: Fix min inline value for VF rep SQs") kernels >= 4.11

The "net/mlx5e: Fix min inline .." (a oneliner patch) doesn't cleanly apply
to 4.11, it hits a contextual conflict and can be easily resolved by:
+       mlx5_query_min_inline(mdev, &priv->params.tx_min_inline_mode);
to the end of mlx5e_build_rep_netdev_priv. Note the 2nd parameter of
mlx5_query_min_inline is slightly different from the original one.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3b1bbafb 31ac9338

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

+4 −4
Original line number Diff line number Diff line
@@ -1242,11 +1242,11 @@ static int mlx5e_get_ts_info(struct net_device *dev, 
				 SOF_TIMESTAMPING_RX_HARDWARE |

				 SOF_TIMESTAMPING_RAW_HARDWARE;



	info->tx_types = (BIT(1) << HWTSTAMP_TX_OFF) |

			 (BIT(1) << HWTSTAMP_TX_ON);

	info->tx_types = BIT(HWTSTAMP_TX_OFF) |

			 BIT(HWTSTAMP_TX_ON);



	info->rx_filters = (BIT(1) << HWTSTAMP_FILTER_NONE) |

			   (BIT(1) << HWTSTAMP_FILTER_ALL);

	info->rx_filters = BIT(HWTSTAMP_FILTER_NONE) |

			   BIT(HWTSTAMP_FILTER_ALL);



	return 0;

}

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

+2 −1
Original line number Diff line number Diff line
@@ -4241,6 +4241,7 @@ struct net_device *mlx5e_create_netdev(struct mlx5_core_dev *mdev, 
	return netdev;



err_cleanup_nic:

	if (profile->cleanup)

		profile->cleanup(priv);

	free_netdev(netdev);

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

+2 −0
Original line number Diff line number Diff line
@@ -791,6 +791,8 @@ static void mlx5e_build_rep_params(struct mlx5_core_dev *mdev, 
	params->tx_max_inline         = mlx5e_get_max_inline_cap(mdev);

	params->num_tc                = 1;

	params->lro_wqe_sz            = MLX5E_PARAMS_DEFAULT_LRO_WQE_SZ;



	mlx5_query_min_inline(mdev, &params->tx_min_inline_mode);

}



static void mlx5e_build_rep_netdev(struct net_device *netdev)

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

+0 −1
Original line number Diff line number Diff line
@@ -895,7 +895,6 @@ static struct mlx5_fields fields[] = { 
	{MLX5_ACTION_IN_FIELD_OUT_SMAC_15_0,  2, offsetof(struct pedit_headers, eth.h_source[4])},

	{MLX5_ACTION_IN_FIELD_OUT_ETHERTYPE,  2, offsetof(struct pedit_headers, eth.h_proto)},



	{MLX5_ACTION_IN_FIELD_OUT_IP_DSCP, 1, offsetof(struct pedit_headers, ip4.tos)},

	{MLX5_ACTION_IN_FIELD_OUT_IP_TTL,  1, offsetof(struct pedit_headers, ip4.ttl)},

	{MLX5_ACTION_IN_FIELD_OUT_SIPV4,   4, offsetof(struct pedit_headers, ip4.saddr)},

	{MLX5_ACTION_IN_FIELD_OUT_DIPV4,   4, offsetof(struct pedit_headers, ip4.daddr)},

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

+40 −37
Original line number Diff line number Diff line
@@ -906,21 +906,34 @@ static int esw_inline_mode_to_devlink(u8 mlx5_mode, u8 *mode) 
	return 0;

}



int mlx5_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode)

static int mlx5_devlink_eswitch_check(struct devlink *devlink)

{

	struct mlx5_core_dev *dev;

	u16 cur_mlx5_mode, mlx5_mode = 0;

	struct mlx5_core_dev *dev = devlink_priv(devlink);



	dev = devlink_priv(devlink);

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

		return -EOPNOTSUPP;



	if (!MLX5_CAP_GEN(dev, vport_group_manager))

		return -EOPNOTSUPP;



	cur_mlx5_mode = dev->priv.eswitch->mode;



	if (cur_mlx5_mode == SRIOV_NONE)

	if (dev->priv.eswitch->mode == SRIOV_NONE)

		return -EOPNOTSUPP;



	return 0;

}



int mlx5_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode)

{

	struct mlx5_core_dev *dev = devlink_priv(devlink);

	u16 cur_mlx5_mode, mlx5_mode = 0;

	int err;



	err = mlx5_devlink_eswitch_check(devlink);

	if (err)

		return err;



	cur_mlx5_mode = dev->priv.eswitch->mode;



	if (esw_mode_from_devlink(mode, &mlx5_mode))

		return -EINVAL;
@@ -937,15 +950,12 @@ int mlx5_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode) 


int mlx5_devlink_eswitch_mode_get(struct devlink *devlink, u16 *mode)

{

	struct mlx5_core_dev *dev;



	dev = devlink_priv(devlink);



	if (!MLX5_CAP_GEN(dev, vport_group_manager))

		return -EOPNOTSUPP;

	struct mlx5_core_dev *dev = devlink_priv(devlink);

	int err;



	if (dev->priv.eswitch->mode == SRIOV_NONE)

		return -EOPNOTSUPP;

	err = mlx5_devlink_eswitch_check(devlink);

	if (err)

		return err;



	return esw_mode_to_devlink(dev->priv.eswitch->mode, mode);

}
@@ -954,15 +964,12 @@ int mlx5_devlink_eswitch_inline_mode_set(struct devlink *devlink, u8 mode) 
{

	struct mlx5_core_dev *dev = devlink_priv(devlink);

	struct mlx5_eswitch *esw = dev->priv.eswitch;

	int num_vports = esw->enabled_vports;

	int err, vport;

	u8 mlx5_mode;



	if (!MLX5_CAP_GEN(dev, vport_group_manager))

		return -EOPNOTSUPP;



	if (esw->mode == SRIOV_NONE)

		return -EOPNOTSUPP;

	err = mlx5_devlink_eswitch_check(devlink);

	if (err)

		return err;



	switch (MLX5_CAP_ETH(dev, wqe_inline_mode)) {

	case MLX5_CAP_INLINE_MODE_NOT_REQUIRED:
@@ -985,7 +992,7 @@ int mlx5_devlink_eswitch_inline_mode_set(struct devlink *devlink, u8 mode) 
	if (err)

		goto out;



	for (vport = 1; vport < num_vports; vport++) {

	for (vport = 1; vport < esw->enabled_vports; vport++) {

		err = mlx5_modify_nic_vport_min_inline(dev, vport, mlx5_mode);

		if (err) {

			esw_warn(dev, "Failed to set min inline on vport %d\n",
@@ -1010,12 +1017,11 @@ int mlx5_devlink_eswitch_inline_mode_get(struct devlink *devlink, u8 *mode) 
{

	struct mlx5_core_dev *dev = devlink_priv(devlink);

	struct mlx5_eswitch *esw = dev->priv.eswitch;

	int err;



	if (!MLX5_CAP_GEN(dev, vport_group_manager))

		return -EOPNOTSUPP;



	if (esw->mode == SRIOV_NONE)

		return -EOPNOTSUPP;

	err = mlx5_devlink_eswitch_check(devlink);

	if (err)

		return err;



	return esw_inline_mode_to_devlink(esw->offloads.inline_mode, mode);

}
@@ -1062,11 +1068,9 @@ int mlx5_devlink_eswitch_encap_mode_set(struct devlink *devlink, u8 encap) 
	struct mlx5_eswitch *esw = dev->priv.eswitch;

	int err;



	if (!MLX5_CAP_GEN(dev, vport_group_manager))

		return -EOPNOTSUPP;



	if (esw->mode == SRIOV_NONE)

		return -EOPNOTSUPP;

	err = mlx5_devlink_eswitch_check(devlink);

	if (err)

		return err;



	if (encap != DEVLINK_ESWITCH_ENCAP_MODE_NONE &&

	    (!MLX5_CAP_ESW_FLOWTABLE_FDB(dev, encap) ||
@@ -1105,12 +1109,11 @@ int mlx5_devlink_eswitch_encap_mode_get(struct devlink *devlink, u8 *encap) 
{

	struct mlx5_core_dev *dev = devlink_priv(devlink);

	struct mlx5_eswitch *esw = dev->priv.eswitch;

	int err;



	if (!MLX5_CAP_GEN(dev, vport_group_manager))

		return -EOPNOTSUPP;



	if (esw->mode == SRIOV_NONE)

		return -EOPNOTSUPP;

	err = mlx5_devlink_eswitch_check(devlink);

	if (err)

		return err;



	*encap = esw->offloads.encap;

	return 0;