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

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

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



Saeed Mahameed says:

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

This series introduces some fixes to mlx5 driver.

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

For -stable v4.17
  ('net/mlx5: Avoid reloading already removed devices')

For -stable v5.0
  ('net/mlx5e: Avoid detaching non-existing netdev under switchdev mode')

For -stable v5.1
  ('net/mlx5e: Fix source port matching in fdb peer flow rule')
  ('net/mlx5e: Support tagged tunnel over bond')
  ('net/mlx5e: Add ndo_set_feature for uplink representor')
  ('net/mlx5: Update pci error handler entries and command translation')
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 62f42a11 45e7d4c0

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

+8 −0
Original line number Diff line number Diff line
@@ -441,6 +441,10 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 
	case MLX5_CMD_OP_CREATE_GENERAL_OBJECT:

	case MLX5_CMD_OP_MODIFY_GENERAL_OBJECT:

	case MLX5_CMD_OP_QUERY_GENERAL_OBJECT:

	case MLX5_CMD_OP_CREATE_UCTX:

	case MLX5_CMD_OP_DESTROY_UCTX:

	case MLX5_CMD_OP_CREATE_UMEM:

	case MLX5_CMD_OP_DESTROY_UMEM:

	case MLX5_CMD_OP_ALLOC_MEMIC:

		*status = MLX5_DRIVER_STATUS_ABORTED;

		*synd = MLX5_DRIVER_SYND;
@@ -629,6 +633,10 @@ const char *mlx5_command_str(int command) 
	MLX5_COMMAND_STR_CASE(ALLOC_MEMIC);

	MLX5_COMMAND_STR_CASE(DEALLOC_MEMIC);

	MLX5_COMMAND_STR_CASE(QUERY_HOST_PARAMS);

	MLX5_COMMAND_STR_CASE(CREATE_UCTX);

	MLX5_COMMAND_STR_CASE(DESTROY_UCTX);

	MLX5_COMMAND_STR_CASE(CREATE_UMEM);

	MLX5_COMMAND_STR_CASE(DESTROY_UMEM);

	default: return "unknown command opcode";

	}

}

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

+23 −2
Original line number Diff line number Diff line
@@ -248,11 +248,32 @@ void mlx5_unregister_interface(struct mlx5_interface *intf) 
}

EXPORT_SYMBOL(mlx5_unregister_interface);



/* Must be called with intf_mutex held */

static bool mlx5_has_added_dev_by_protocol(struct mlx5_core_dev *mdev, int protocol)

{

	struct mlx5_device_context *dev_ctx;

	struct mlx5_interface *intf;

	bool found = false;



	list_for_each_entry(intf, &intf_list, list) {

		if (intf->protocol == protocol) {

			dev_ctx = mlx5_get_device(intf, &mdev->priv);

			if (dev_ctx && test_bit(MLX5_INTERFACE_ADDED, &dev_ctx->state))

				found = true;

			break;

		}

	}



	return found;

}



void mlx5_reload_interface(struct mlx5_core_dev *mdev, int protocol)

{

	mutex_lock(&mlx5_intf_mutex);

	if (mlx5_has_added_dev_by_protocol(mdev, protocol)) {

		mlx5_remove_dev_by_protocol(mdev, protocol);

		mlx5_add_dev_by_protocol(mdev, protocol);

	}

	mutex_unlock(&mlx5_intf_mutex);

}

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

+2 −0
Original line number Diff line number Diff line
@@ -385,6 +385,7 @@ struct mlx5e_txqsq { 
	/* control path */

	struct mlx5_wq_ctrl        wq_ctrl;

	struct mlx5e_channel      *channel;

	int                        ch_ix;

	int                        txq_ix;

	u32                        rate_limit;

	struct work_struct         recover_work;
@@ -1112,6 +1113,7 @@ void mlx5e_del_vxlan_port(struct net_device *netdev, struct udp_tunnel_info *ti) 
netdev_features_t mlx5e_features_check(struct sk_buff *skb,

				       struct net_device *netdev,

				       netdev_features_t features);

int mlx5e_set_features(struct net_device *netdev, netdev_features_t features);

#ifdef CONFIG_MLX5_ESWITCH

int mlx5e_set_vf_mac(struct net_device *dev, int vf, u8 *mac);

int mlx5e_set_vf_rate(struct net_device *dev, int vf, int min_tx_rate, int max_tx_rate);

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

+6 −5
Original line number Diff line number Diff line
@@ -11,24 +11,25 @@ static int get_route_and_out_devs(struct mlx5e_priv *priv, 
				  struct net_device **route_dev,

				  struct net_device **out_dev)

{

	struct net_device *uplink_dev, *uplink_upper, *real_dev;

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

	struct net_device *uplink_dev, *uplink_upper;

	bool dst_is_lag_dev;



	real_dev = is_vlan_dev(dev) ? vlan_dev_real_dev(dev) : dev;

	uplink_dev = mlx5_eswitch_uplink_get_proto_dev(esw, REP_ETH);

	uplink_upper = netdev_master_upper_dev_get(uplink_dev);

	dst_is_lag_dev = (uplink_upper &&

			  netif_is_lag_master(uplink_upper) &&

			  dev == uplink_upper &&

			  real_dev == uplink_upper &&

			  mlx5_lag_is_sriov(priv->mdev));



	/* if the egress device isn't on the same HW e-switch or

	 * it's a LAG device, use the uplink

	 */

	if (!netdev_port_same_parent_id(priv->netdev, dev) ||

	if (!netdev_port_same_parent_id(priv->netdev, real_dev) ||

	    dst_is_lag_dev) {

		*route_dev = uplink_dev;

		*out_dev = *route_dev;

		*route_dev = dev;

		*out_dev = uplink_dev;

	} else {

		*route_dev = dev;

		if (is_vlan_dev(*route_dev))

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

+7 −2
Original line number Diff line number Diff line
@@ -1082,6 +1082,7 @@ static int mlx5e_alloc_txqsq(struct mlx5e_channel *c, 
	sq->clock     = &mdev->clock;

	sq->mkey_be   = c->mkey_be;

	sq->channel   = c;

	sq->ch_ix     = c->ix;

	sq->txq_ix    = txq_ix;

	sq->uar_map   = mdev->mlx5e_res.bfreg.map;

	sq->min_inline_mode = params->tx_min_inline_mode;
@@ -3635,8 +3636,7 @@ static int mlx5e_handle_feature(struct net_device *netdev, 
	return 0;

}



static int mlx5e_set_features(struct net_device *netdev,

			      netdev_features_t features)

int mlx5e_set_features(struct net_device *netdev, netdev_features_t features)

{

	netdev_features_t oper_features = netdev->features;

	int err = 0;
@@ -5108,6 +5108,11 @@ static void mlx5e_detach(struct mlx5_core_dev *mdev, void *vpriv) 
	struct mlx5e_priv *priv = vpriv;

	struct net_device *netdev = priv->netdev;



#ifdef CONFIG_MLX5_ESWITCH

	if (MLX5_ESWITCH_MANAGER(mdev) && vpriv == mdev)

		return;

#endif



	if (!netif_device_present(netdev))

		return;