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

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

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



Saeed Mahameed says:

====================
mlx5-fixes-2017-01-27

A couple of mlx5 core and ethernet driver fixes.

From Or, A couple of error return values and error handling fixes.
From Hadar, Support TC encapsulation offloads even when the mlx5e uplink
device is stacked  under an upper device.
From Gal, Two patches to fix RSS hash modifications via ethtool.
From Moshe, Added a needed ets capability check.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 051a2e08 d15118af

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

+1 −1
Original line number Diff line number Diff line
@@ -1728,7 +1728,7 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) 
	if (cmd->cmdif_rev > CMD_IF_REV) {

		dev_err(&dev->pdev->dev, "driver does not support command interface version. driver %d, firmware %d\n",

			CMD_IF_REV, cmd->cmdif_rev);

		err = -ENOTSUPP;

		err = -EOPNOTSUPP;

		goto err_free_page;

	}

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

+4 −3
Original line number Diff line number Diff line
@@ -791,7 +791,8 @@ void mlx5e_disable_vlan_filter(struct mlx5e_priv *priv); 
int mlx5e_modify_rqs_vsd(struct mlx5e_priv *priv, bool vsd);



int mlx5e_redirect_rqt(struct mlx5e_priv *priv, u32 rqtn, int sz, int ix);

void mlx5e_build_tir_ctx_hash(void *tirc, struct mlx5e_priv *priv);

void mlx5e_build_indir_tir_ctx_hash(struct mlx5e_priv *priv, void *tirc,

				    enum mlx5e_traffic_types tt);



int mlx5e_open_locked(struct net_device *netdev);

int mlx5e_close_locked(struct net_device *netdev);
@@ -863,12 +864,12 @@ static inline void mlx5e_arfs_destroy_tables(struct mlx5e_priv *priv) {} 


static inline int mlx5e_arfs_enable(struct mlx5e_priv *priv)

{

	return -ENOTSUPP;

	return -EOPNOTSUPP;

}



static inline int mlx5e_arfs_disable(struct mlx5e_priv *priv)

{

	return -ENOTSUPP;

	return -EOPNOTSUPP;

}

#else

int mlx5e_arfs_create_tables(struct mlx5e_priv *priv);

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

+8 −3
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int mlx5e_dcbnl_ieee_getets(struct net_device *netdev, 
	int i;



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

		return -ENOTSUPP;

		return -EOPNOTSUPP;



	ets->ets_cap = mlx5_max_tc(priv->mdev) + 1;

	for (i = 0; i < ets->ets_cap; i++) {
@@ -236,7 +236,7 @@ static int mlx5e_dcbnl_ieee_setets(struct net_device *netdev, 
	int err;



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

		return -ENOTSUPP;

		return -EOPNOTSUPP;



	err = mlx5e_dbcnl_validate_ets(netdev, ets);

	if (err)
@@ -402,7 +402,7 @@ static u8 mlx5e_dcbnl_setall(struct net_device *netdev) 
	struct mlx5_core_dev *mdev = priv->mdev;

	struct ieee_ets ets;

	struct ieee_pfc pfc;

	int err = -ENOTSUPP;

	int err = -EOPNOTSUPP;

	int i;



	if (!MLX5_CAP_GEN(mdev, ets))
@@ -511,6 +511,11 @@ static void mlx5e_dcbnl_getpgtccfgtx(struct net_device *netdev, 
	struct mlx5e_priv *priv = netdev_priv(netdev);

	struct mlx5_core_dev *mdev = priv->mdev;



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

		netdev_err(netdev, "%s, ets is not supported\n", __func__);

		return;

	}



	if (priority >= CEE_DCBX_MAX_PRIO) {

		netdev_err(netdev,

			   "%s, priority is out of range\n", __func__);

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

+26 −15
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ static int mlx5e_get_coalesce(struct net_device *netdev, 
	struct mlx5e_priv *priv = netdev_priv(netdev);



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

		return -ENOTSUPP;

		return -EOPNOTSUPP;



	coal->rx_coalesce_usecs       = priv->params.rx_cq_moderation.usec;

	coal->rx_max_coalesced_frames = priv->params.rx_cq_moderation.pkts;
@@ -620,7 +620,7 @@ static int mlx5e_set_coalesce(struct net_device *netdev, 
	int i;



	if (!MLX5_CAP_GEN(mdev, cq_moderation))

		return -ENOTSUPP;

		return -EOPNOTSUPP;



	mutex_lock(&priv->state_lock);
@@ -980,15 +980,18 @@ static int mlx5e_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key, 


static void mlx5e_modify_tirs_hash(struct mlx5e_priv *priv, void *in, int inlen)

{

	struct mlx5_core_dev *mdev = priv->mdev;

	void *tirc = MLX5_ADDR_OF(modify_tir_in, in, ctx);

	int i;

	struct mlx5_core_dev *mdev = priv->mdev;

	int ctxlen = MLX5_ST_SZ_BYTES(tirc);

	int tt;



	MLX5_SET(modify_tir_in, in, bitmask.hash, 1);

	mlx5e_build_tir_ctx_hash(tirc, priv);



	for (i = 0; i < MLX5E_NUM_INDIR_TIRS; i++)

		mlx5_core_modify_tir(mdev, priv->indir_tir[i].tirn, in, inlen);

	for (tt = 0; tt < MLX5E_NUM_INDIR_TIRS; tt++) {

		memset(tirc, 0, ctxlen);

		mlx5e_build_indir_tir_ctx_hash(priv, tirc, tt);

		mlx5_core_modify_tir(mdev, priv->indir_tir[tt].tirn, in, inlen);

	}

}



static int mlx5e_set_rxfh(struct net_device *dev, const u32 *indir,
@@ -996,6 +999,7 @@ static int mlx5e_set_rxfh(struct net_device *dev, const u32 *indir, 
{

	struct mlx5e_priv *priv = netdev_priv(dev);

	int inlen = MLX5_ST_SZ_BYTES(modify_tir_in);

	bool hash_changed = false;

	void *in;



	if ((hfunc != ETH_RSS_HASH_NO_CHANGE) &&
@@ -1017,13 +1021,20 @@ static int mlx5e_set_rxfh(struct net_device *dev, const u32 *indir, 
		mlx5e_redirect_rqt(priv, rqtn, MLX5E_INDIR_RQT_SIZE, 0);

	}



	if (key)

	if (hfunc != ETH_RSS_HASH_NO_CHANGE &&

	    hfunc != priv->params.rss_hfunc) {

		priv->params.rss_hfunc = hfunc;

		hash_changed = true;

	}



	if (key) {

		memcpy(priv->params.toeplitz_hash_key, key,

		       sizeof(priv->params.toeplitz_hash_key));

		hash_changed = hash_changed ||

			       priv->params.rss_hfunc == ETH_RSS_HASH_TOP;

	}



	if (hfunc != ETH_RSS_HASH_NO_CHANGE)

		priv->params.rss_hfunc = hfunc;



	if (hash_changed)

		mlx5e_modify_tirs_hash(priv, in, inlen);



	mutex_unlock(&priv->state_lock);
@@ -1296,7 +1307,7 @@ static int mlx5e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 
	u32 mlx5_wol_mode;



	if (!wol_supported)

		return -ENOTSUPP;

		return -EOPNOTSUPP;



	if (wol->wolopts & ~wol_supported)

		return -EINVAL;
@@ -1426,7 +1437,7 @@ static int set_pflag_rx_cqe_based_moder(struct net_device *netdev, bool enable) 


	if (rx_cq_period_mode == MLX5_CQ_PERIOD_MODE_START_FROM_CQE &&

	    !MLX5_CAP_GEN(mdev, cq_period_start_from_cqe))

		return -ENOTSUPP;

		return -EOPNOTSUPP;



	if (!rx_mode_changed)

		return 0;
@@ -1452,7 +1463,7 @@ static int set_pflag_rx_cqe_compress(struct net_device *netdev, 
	bool reset;



	if (!MLX5_CAP_GEN(mdev, cqe_compression))

		return -ENOTSUPP;

		return -EOPNOTSUPP;



	if (enable && priv->tstamp.hwtstamp_config.rx_filter != HWTSTAMP_FILTER_NONE) {

		netdev_err(netdev, "Can't enable cqe compression while timestamping is enabled.\n");

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

+1 −1
Original line number Diff line number Diff line
@@ -1089,7 +1089,7 @@ int mlx5e_create_flow_steering(struct mlx5e_priv *priv) 
					       MLX5_FLOW_NAMESPACE_KERNEL);



	if (!priv->fs.ns)

		return -EINVAL;

		return -EOPNOTSUPP;



	err = mlx5e_arfs_create_tables(priv);

	if (err) {