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

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

Merge tag 'mlx5-fixes-2018-01-11' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
Mellanox, mlx5 fixes 2018-01-11

The following series includes fixes to mlx5 core and netdev driver.
To highlight we have two critical fixes in this series:
1st patch from Eran to address a fix for Host2BMC Breakage.

2nd patch from Saeed to address the RDMA IRQ vector affinity settings query
issue, the patch provides the correct mlx5_core implementation for RDMA to
correctly  query vector affinity.
I sent this patch privately to Sagi a week a go, so he could to test it
but I didn't hear from him.

All other patches are trivial misc fixes.
Please pull and let me know if there's any problem.

for -stable v4.14-y and later:
("net/mlx5: Fix get vector affinity helper function")
("{net,ib}/mlx5: Don't disable local loopback multicast traffic when needed")

Note: Merging this series with net-next will produce the following conflict:
<<<<<<< HEAD
        u8         disable_local_lb[0x1];
        u8         reserved_at_3e2[0x1];
        u8         log_min_hairpin_wq_data_sz[0x5];
        u8         reserved_at_3e8[0x3];
=======
        u8         disable_local_lb_uc[0x1];
        u8         disable_local_lb_mc[0x1];
        u8         reserved_at_3e3[0x8];
>>>>>>> 359c96447ac2297fabe15ef30b60f3b4b71e7fd0

To resolve, use the following hunk:
i.e:
<<<<<<
        u8         disable_local_lb_uc[0x1];
        u8         disable_local_lb_mc[0x1];
        u8         log_min_hairpin_wq_data_sz[0x5];
        u8         reserved_at_3e8[0x3];
>>>>>>
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9c70f1a7 237f258c

drivers/infiniband/hw/mlx5/main.c

+7 −4
Original line number Diff line number Diff line
@@ -1324,7 +1324,8 @@ static int mlx5_ib_alloc_transport_domain(struct mlx5_ib_dev *dev, u32 *tdn) 
		return err;



	if ((MLX5_CAP_GEN(dev->mdev, port_type) != MLX5_CAP_PORT_TYPE_ETH) ||

	    !MLX5_CAP_GEN(dev->mdev, disable_local_lb))

	    (!MLX5_CAP_GEN(dev->mdev, disable_local_lb_uc) &&

	     !MLX5_CAP_GEN(dev->mdev, disable_local_lb_mc)))

		return err;



	mutex_lock(&dev->lb_mutex);
@@ -1342,7 +1343,8 @@ static void mlx5_ib_dealloc_transport_domain(struct mlx5_ib_dev *dev, u32 tdn) 
	mlx5_core_dealloc_transport_domain(dev->mdev, tdn);



	if ((MLX5_CAP_GEN(dev->mdev, port_type) != MLX5_CAP_PORT_TYPE_ETH) ||

	    !MLX5_CAP_GEN(dev->mdev, disable_local_lb))

	    (!MLX5_CAP_GEN(dev->mdev, disable_local_lb_uc) &&

	     !MLX5_CAP_GEN(dev->mdev, disable_local_lb_mc)))

		return;



	mutex_lock(&dev->lb_mutex);
@@ -4158,7 +4160,7 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) 
		goto err_cnt;



	dev->mdev->priv.uar = mlx5_get_uars_page(dev->mdev);

	if (!dev->mdev->priv.uar)

	if (IS_ERR(dev->mdev->priv.uar))

		goto err_cong;



	err = mlx5_alloc_bfreg(dev->mdev, &dev->bfreg, false, false);
@@ -4187,7 +4189,8 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) 
	}



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

	    MLX5_CAP_GEN(mdev, disable_local_lb))

	    (MLX5_CAP_GEN(mdev, disable_local_lb_uc) ||

	     MLX5_CAP_GEN(mdev, disable_local_lb_mc)))

		mutex_init(&dev->lb_mutex);



	dev->ib_active = true;

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

+1 −1
Original line number Diff line number Diff line
@@ -895,7 +895,7 @@ int mlx5e_vlan_rx_kill_vid(struct net_device *dev, __always_unused __be16 proto, 
			   u16 vid);

void mlx5e_enable_cvlan_filter(struct mlx5e_priv *priv);

void mlx5e_disable_cvlan_filter(struct mlx5e_priv *priv);

void mlx5e_timestamp_set(struct mlx5e_priv *priv);

void mlx5e_timestamp_init(struct mlx5e_priv *priv);



struct mlx5e_redirect_rqt_param {

	bool is_rss;

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

+11 −5
Original line number Diff line number Diff line
@@ -922,8 +922,9 @@ static void mlx5e_dcbnl_query_dcbx_mode(struct mlx5e_priv *priv, 


static void mlx5e_ets_init(struct mlx5e_priv *priv)

{

	int i;

	struct ieee_ets ets;

	int err;

	int i;



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

		return;
@@ -936,11 +937,16 @@ static void mlx5e_ets_init(struct mlx5e_priv *priv) 
		ets.prio_tc[i] = i;

	}



	if (ets.ets_cap > 1) {

		/* tclass[prio=0]=1, tclass[prio=1]=0, tclass[prio=i]=i (for i>1) */

		ets.prio_tc[0] = 1;

		ets.prio_tc[1] = 0;

	}



	mlx5e_dcbnl_ieee_setets_core(priv, &ets);

	err = mlx5e_dcbnl_ieee_setets_core(priv, &ets);

	if (err)

		netdev_err(priv->netdev,

			   "%s, Failed to init ETS: %d\n", __func__, err);

}



enum {

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

+1 −2
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ void mlx5e_ethtool_get_ethtool_stats(struct mlx5e_priv *priv, 
		return;



	mutex_lock(&priv->state_lock);

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

	mlx5e_update_stats(priv, true);

	mutex_unlock(&priv->state_lock);

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

+28 −20
Original line number Diff line number Diff line
@@ -2669,7 +2669,7 @@ void mlx5e_switch_priv_channels(struct mlx5e_priv *priv, 
		netif_carrier_on(netdev);

}



void mlx5e_timestamp_set(struct mlx5e_priv *priv)

void mlx5e_timestamp_init(struct mlx5e_priv *priv)

{

	priv->tstamp.tx_type   = HWTSTAMP_TX_OFF;

	priv->tstamp.rx_filter = HWTSTAMP_FILTER_NONE;
@@ -2690,7 +2690,6 @@ int mlx5e_open_locked(struct net_device *netdev) 
	mlx5e_activate_priv_channels(priv);

	if (priv->profile->update_carrier)

		priv->profile->update_carrier(priv);

	mlx5e_timestamp_set(priv);



	if (priv->profile->update_stats)

		queue_delayed_work(priv->wq, &priv->update_stats_work, 0);
@@ -3219,12 +3218,12 @@ static int mlx5e_set_mac(struct net_device *netdev, void *addr) 
	return 0;

}



#define MLX5E_SET_FEATURE(netdev, feature, enable)	\

#define MLX5E_SET_FEATURE(features, feature, enable)	\

	do {						\

		if (enable)				\

			netdev->features |= feature;	\

			*features |= feature;		\

		else					\

			netdev->features &= ~feature;	\

			*features &= ~feature;		\

	} while (0)



typedef int (*mlx5e_feature_handler)(struct net_device *netdev, bool enable);
@@ -3347,6 +3346,7 @@ static int set_feature_arfs(struct net_device *netdev, bool enable) 
#endif



static int mlx5e_handle_feature(struct net_device *netdev,

				netdev_features_t *features,

				netdev_features_t wanted_features,

				netdev_features_t feature,

				mlx5e_feature_handler feature_handler)
@@ -3365,34 +3365,40 @@ static int mlx5e_handle_feature(struct net_device *netdev, 
		return err;

	}



	MLX5E_SET_FEATURE(netdev, feature, enable);

	MLX5E_SET_FEATURE(features, feature, enable);

	return 0;

}



static int mlx5e_set_features(struct net_device *netdev,

			      netdev_features_t features)

{

	netdev_features_t oper_features = netdev->features;

	int err;



	err  = mlx5e_handle_feature(netdev, features, NETIF_F_LRO,

				    set_feature_lro);

	err |= mlx5e_handle_feature(netdev, features,

	err  = mlx5e_handle_feature(netdev, &oper_features, features,

				    NETIF_F_LRO, set_feature_lro);

	err |= mlx5e_handle_feature(netdev, &oper_features, features,

				    NETIF_F_HW_VLAN_CTAG_FILTER,

				    set_feature_cvlan_filter);

	err |= mlx5e_handle_feature(netdev, features, NETIF_F_HW_TC,

				    set_feature_tc_num_filters);

	err |= mlx5e_handle_feature(netdev, features, NETIF_F_RXALL,

				    set_feature_rx_all);

	err |= mlx5e_handle_feature(netdev, features, NETIF_F_RXFCS,

				    set_feature_rx_fcs);

	err |= mlx5e_handle_feature(netdev, features, NETIF_F_HW_VLAN_CTAG_RX,

				    set_feature_rx_vlan);

	err |= mlx5e_handle_feature(netdev, &oper_features, features,

				    NETIF_F_HW_TC, set_feature_tc_num_filters);

	err |= mlx5e_handle_feature(netdev, &oper_features, features,

				    NETIF_F_RXALL, set_feature_rx_all);

	err |= mlx5e_handle_feature(netdev, &oper_features, features,

				    NETIF_F_RXFCS, set_feature_rx_fcs);

	err |= mlx5e_handle_feature(netdev, &oper_features, features,

				    NETIF_F_HW_VLAN_CTAG_RX, set_feature_rx_vlan);

#ifdef CONFIG_RFS_ACCEL

	err |= mlx5e_handle_feature(netdev, features, NETIF_F_NTUPLE,

				    set_feature_arfs);

	err |= mlx5e_handle_feature(netdev, &oper_features, features,

				    NETIF_F_NTUPLE, set_feature_arfs);

#endif



	return err ? -EINVAL : 0;

	if (err) {

		netdev->features = oper_features;

		return -EINVAL;

	}



	return 0;

}



static netdev_features_t mlx5e_fix_features(struct net_device *netdev,
@@ -4139,6 +4145,8 @@ static void mlx5e_build_nic_netdev_priv(struct mlx5_core_dev *mdev, 
	INIT_WORK(&priv->set_rx_mode_work, mlx5e_set_rx_mode_work);

	INIT_WORK(&priv->tx_timeout_work, mlx5e_tx_timeout_work);

	INIT_DELAYED_WORK(&priv->update_stats_work, mlx5e_update_stats_work);



	mlx5e_timestamp_init(priv);

}



static void mlx5e_set_netdev_dev_addr(struct net_device *netdev)