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

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

Merge branch 'mlx4-next' 



Amir Vadai says:

====================
Mellanox driver update Jul-22-2014

This patchset contains a fix by Eyal to fix a bug in mlx4_en with bonding
alb/tlb mode.
The second patch, by me, is an ethtool private flag that enable turning off the
BlueFlame hardware feature.
The last two patches, introduce a new low memory profile for mlx4_en and
mlx4_core. This mode is useful when running from a limited resources
environment, like kdump. This will reduce the memory consumed by both drivers
from more than 100M to ~30M.

This patchset was applied and tested on commit 575a1935 ("net: mvpp2: Fix error
return code in mvpp2_probe")
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7861f12b ea1c1af1

drivers/net/ethernet/mellanox/mlx4/en_ethtool.c

+57 −0
Original line number Diff line number Diff line
@@ -98,6 +98,10 @@ mlx4_en_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo) 
	drvinfo->eedump_len = 0;

}



static const char mlx4_en_priv_flags[][ETH_GSTRING_LEN] = {

	"blueflame",

};



static const char main_strings[][ETH_GSTRING_LEN] = {

	"rx_packets", "tx_packets", "rx_bytes", "tx_bytes", "rx_errors",

	"tx_errors", "rx_dropped", "tx_dropped", "multicast", "collisions",
@@ -235,6 +239,8 @@ static int mlx4_en_get_sset_count(struct net_device *dev, int sset) 
	case ETH_SS_TEST:

		return MLX4_EN_NUM_SELF_TEST - !(priv->mdev->dev->caps.flags

					& MLX4_DEV_CAP_FLAG_UC_LOOPBACK) * 2;

	case ETH_SS_PRIV_FLAGS:

		return ARRAY_SIZE(mlx4_en_priv_flags);

	default:

		return -EOPNOTSUPP;

	}
@@ -358,6 +364,12 @@ static void mlx4_en_get_strings(struct net_device *dev, 
#endif

		}

		break;

	case ETH_SS_PRIV_FLAGS:

		for (i = 0; i < ARRAY_SIZE(mlx4_en_priv_flags); i++)

			strcpy(data + i * ETH_GSTRING_LEN,

			       mlx4_en_priv_flags[i]);

		break;



	}

}
@@ -1209,6 +1221,49 @@ static int mlx4_en_get_ts_info(struct net_device *dev, 
	return ret;

}



int mlx4_en_set_priv_flags(struct net_device *dev, u32 flags)

{

	struct mlx4_en_priv *priv = netdev_priv(dev);

	bool bf_enabled_new = !!(flags & MLX4_EN_PRIV_FLAGS_BLUEFLAME);

	bool bf_enabled_old = !!(priv->pflags & MLX4_EN_PRIV_FLAGS_BLUEFLAME);

	int i;



	if (bf_enabled_new == bf_enabled_old)

		return 0; /* Nothing to do */



	if (bf_enabled_new) {

		bool bf_supported = true;



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

			bf_supported &= priv->tx_ring[i]->bf_alloced;



		if (!bf_supported) {

			en_err(priv, "BlueFlame is not supported\n");

			return -EINVAL;

		}



		priv->pflags |= MLX4_EN_PRIV_FLAGS_BLUEFLAME;

	} else {

		priv->pflags &= ~MLX4_EN_PRIV_FLAGS_BLUEFLAME;

	}



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

		priv->tx_ring[i]->bf_enabled = bf_enabled_new;



	en_info(priv, "BlueFlame %s\n",

		bf_enabled_new ?  "Enabled" : "Disabled");



	return 0;

}



u32 mlx4_en_get_priv_flags(struct net_device *dev)

{

	struct mlx4_en_priv *priv = netdev_priv(dev);



	return priv->pflags;

}





const struct ethtool_ops mlx4_en_ethtool_ops = {

	.get_drvinfo = mlx4_en_get_drvinfo,

	.get_settings = mlx4_en_get_settings,
@@ -1236,6 +1291,8 @@ const struct ethtool_ops mlx4_en_ethtool_ops = { 
	.get_channels = mlx4_en_get_channels,

	.set_channels = mlx4_en_set_channels,

	.get_ts_info = mlx4_en_get_ts_info,

	.set_priv_flags = mlx4_en_set_priv_flags,

	.get_priv_flags = mlx4_en_get_priv_flags,

};

drivers/net/ethernet/mellanox/mlx4/en_main.c

+4 −2
Original line number Diff line number Diff line
@@ -129,8 +129,10 @@ static int mlx4_en_get_profile(struct mlx4_en_dev *mdev) 
	int i;



	params->udp_rss = udp_rss;

	params->num_tx_rings_p_up = min_t(int, num_online_cpus(),

			MLX4_EN_MAX_TX_RING_P_UP);

	params->num_tx_rings_p_up = mlx4_low_memory_profile() ?

		MLX4_EN_MIN_TX_RING_P_UP :

		min_t(int, num_online_cpus(), MLX4_EN_MAX_TX_RING_P_UP);



	if (params->udp_rss && !(mdev->dev->caps.flags

					& MLX4_DEV_CAP_FLAG_UDP_RSS)) {

		mlx4_warn(mdev, "UDP RSS is not supported on this device\n");

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+2 −0
Original line number Diff line number Diff line
@@ -644,6 +644,7 @@ static int mlx4_en_get_qp(struct mlx4_en_priv *priv) 
		goto alloc_err;

	}

	memcpy(entry->mac, priv->dev->dev_addr, sizeof(entry->mac));

	memcpy(priv->current_mac, entry->mac, sizeof(priv->current_mac));

	entry->reg_id = reg_id;



	hlist_add_head_rcu(&entry->hlist,
@@ -2464,6 +2465,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, 
	priv->port = port;

	priv->port_up = false;

	priv->flags = prof->flags;

	priv->pflags = MLX4_EN_PRIV_FLAGS_BLUEFLAME;

	priv->ctrl_flags = cpu_to_be32(MLX4_WQE_CTRL_CQ_UPDATE |

			MLX4_WQE_CTRL_SOLICITED);

	priv->num_tx_rings_p_up = mdev->profile.num_tx_rings_p_up;

drivers/net/ethernet/mellanox/mlx4/en_rx.c

+3 −2
Original line number Diff line number Diff line
@@ -335,7 +335,8 @@ void mlx4_en_set_num_rx_rings(struct mlx4_en_dev *mdev) 
					   dev->caps.comp_pool/

					   dev->caps.num_ports) - 1;



		num_rx_rings = min_t(int, num_of_eqs,

		num_rx_rings = mlx4_low_memory_profile() ? MIN_RX_RINGS :

			min_t(int, num_of_eqs,

			      netif_get_num_default_rss_queues());

		mdev->profile.prof[i].rx_ring_num =

			rounddown_pow_of_two(num_rx_rings);

drivers/net/ethernet/mellanox/mlx4/en_tx.c

+9 −4
Original line number Diff line number Diff line
@@ -126,8 +126,13 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv, 
		ring->bf.uar = &mdev->priv_uar;

		ring->bf.uar->map = mdev->uar_map;

		ring->bf_enabled = false;

	} else

		ring->bf_enabled = true;

		ring->bf_alloced = false;

		priv->pflags &= ~MLX4_EN_PRIV_FLAGS_BLUEFLAME;

	} else {

		ring->bf_alloced = true;

		ring->bf_enabled = !!(priv->pflags &

				      MLX4_EN_PRIV_FLAGS_BLUEFLAME);

	}



	ring->hwtstamp_tx_type = priv->hwtstamp_config.tx_type;

	ring->queue_index = queue_index;
@@ -161,7 +166,7 @@ void mlx4_en_destroy_tx_ring(struct mlx4_en_priv *priv, 
	struct mlx4_en_tx_ring *ring = *pring;

	en_dbg(DRV, priv, "Destroying tx ring, qpn: %d\n", ring->qpn);



	if (ring->bf_enabled)

	if (ring->bf_alloced)

		mlx4_bf_free(mdev->dev, &ring->bf);

	mlx4_qp_remove(mdev->dev, &ring->qp);

	mlx4_qp_free(mdev->dev, &ring->qp);
@@ -195,7 +200,7 @@ int mlx4_en_activate_tx_ring(struct mlx4_en_priv *priv, 


	mlx4_en_fill_qp_context(priv, ring->size, ring->stride, 1, 0, ring->qpn,

				ring->cqn, user_prio, &ring->context);

	if (ring->bf_enabled)

	if (ring->bf_alloced)

		ring->context.usr_page = cpu_to_be32(ring->bf.uar->index);



	err = mlx4_qp_to_ready(mdev->dev, &ring->wqres.mtt, &ring->context,