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

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

Merge branch 'mlx4' 



Amir Vadai says:

====================
net/mlx4: Mellanox driver update 27-02-2014

This patchset contains some fixes for small trivial bugs, and
compilation/syntactic parsers warnings

Patchset was applied and tested over commit 750f679c "Merge branch '6lowpan'"

Changes from V1:
-patch 5/9:  Replace mlx4_en_mac_to_u64() with mlx4_mac_to_u64()
  - Remove unnecessary define of ETH_ALEN

Changes from V0:
-patch 3/9:  net/mlx4_en: Pad ethernet packets smaller than 17 bytes
  - Make condition more efficient
  - Didn't use canonical function to pad buffer since using bounce buffer
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 80cbfd36 9717218b

drivers/net/ethernet/mellanox/mlx4/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



config MLX4_EN

	tristate "Mellanox Technologies 10Gbit Ethernet support"

	tristate "Mellanox Technologies 1/10/40Gbit Ethernet support"

	depends on PCI

	select MLX4_CORE

	select PTP_1588_CLOCK

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

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static int mlx4_en_ets_validate(struct mlx4_en_priv *priv, struct ieee_ets *ets) 
	int has_ets_tc = 0;



	for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) {

		if (ets->prio_tc[i] > MLX4_EN_NUM_UP) {

		if (ets->prio_tc[i] >= MLX4_EN_NUM_UP) {

			en_err(priv, "Bad priority in UP <=> TC mapping. TC: %d, UP: %d\n",

					i, ets->prio_tc[i]);

			return -EINVAL;

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

+30 −0
Original line number Diff line number Diff line
@@ -72,6 +72,12 @@ MLX4_EN_PARM_INT(pfctx, 0, "Priority based Flow Control policy on TX[7:0]." 
MLX4_EN_PARM_INT(pfcrx, 0, "Priority based Flow Control policy on RX[7:0]."

			   " Per priority bit mask");



MLX4_EN_PARM_INT(inline_thold, MAX_INLINE,

		 "Threshold for using inline data (range: 17-104, default: 104)");



#define MAX_PFC_TX     0xff

#define MAX_PFC_RX     0xff



int en_print(const char *level, const struct mlx4_en_priv *priv,

	     const char *format, ...)

{
@@ -140,6 +146,7 @@ static int mlx4_en_get_profile(struct mlx4_en_dev *mdev) 
		params->prof[i].tx_ring_num = params->num_tx_rings_p_up *

			MLX4_EN_NUM_UP;

		params->prof[i].rss_rings = 0;

		params->prof[i].inline_thold = inline_thold;

	}



	return 0;
@@ -325,8 +332,31 @@ static struct mlx4_interface mlx4_en_interface = { 
	.protocol	= MLX4_PROT_ETH,

};



void mlx4_en_verify_params(void)

{

	if (pfctx > MAX_PFC_TX) {

		pr_warn("mlx4_en: WARNING: illegal module parameter pfctx 0x%x - should be in range 0-0x%x, will be changed to default (0)\n",

			pfctx, MAX_PFC_TX);

		pfctx = 0;

	}



	if (pfcrx > MAX_PFC_RX) {

		pr_warn("mlx4_en: WARNING: illegal module parameter pfcrx 0x%x - should be in range 0-0x%x, will be changed to default (0)\n",

			pfcrx, MAX_PFC_RX);

		pfcrx = 0;

	}



	if (inline_thold < MIN_PKT_LEN || inline_thold > MAX_INLINE) {

		pr_warn("mlx4_en: WARNING: illegal module parameter inline_thold %d - should be in range %d-%d, will be changed to default (%d)\n",

			inline_thold, MIN_PKT_LEN, MAX_INLINE, MAX_INLINE);

		inline_thold = MAX_INLINE;

	}

}



static int __init mlx4_en_init(void)

{

	mlx4_en_verify_params();



	return mlx4_register_interface(&mlx4_en_interface);

}

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

+10 −22
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ static int mlx4_en_get_qp(struct mlx4_en_priv *priv) 
	int err = 0;

	u64 reg_id;

	int *qpn = &priv->base_qpn;

	u64 mac = mlx4_en_mac_to_u64(priv->dev->dev_addr);

	u64 mac = mlx4_mac_to_u64(priv->dev->dev_addr);



	en_dbg(DRV, priv, "Registering MAC: %pM for adding\n",

	       priv->dev->dev_addr);
@@ -672,7 +672,7 @@ static void mlx4_en_put_qp(struct mlx4_en_priv *priv) 
	u64 mac;



	if (dev->caps.steering_mode == MLX4_STEERING_MODE_A0) {

		mac = mlx4_en_mac_to_u64(priv->dev->dev_addr);

		mac = mlx4_mac_to_u64(priv->dev->dev_addr);

		en_dbg(DRV, priv, "Registering MAC: %pM for deleting\n",

		       priv->dev->dev_addr);

		mlx4_unregister_mac(dev, priv->port, mac);
@@ -685,7 +685,7 @@ static void mlx4_en_put_qp(struct mlx4_en_priv *priv) 
		for (i = 0; i < MLX4_EN_MAC_HASH_SIZE; ++i) {

			bucket = &priv->mac_hash[i];

			hlist_for_each_entry_safe(entry, tmp, bucket, hlist) {

				mac = mlx4_en_mac_to_u64(entry->mac);

				mac = mlx4_mac_to_u64(entry->mac);

				en_dbg(DRV, priv, "Registering MAC: %pM for deleting\n",

				       entry->mac);

				mlx4_en_uc_steer_release(priv, entry->mac,
@@ -715,14 +715,14 @@ static int mlx4_en_replace_mac(struct mlx4_en_priv *priv, int qpn, 
	struct mlx4_en_dev *mdev = priv->mdev;

	struct mlx4_dev *dev = mdev->dev;

	int err = 0;

	u64 new_mac_u64 = mlx4_en_mac_to_u64(new_mac);

	u64 new_mac_u64 = mlx4_mac_to_u64(new_mac);



	if (dev->caps.steering_mode != MLX4_STEERING_MODE_A0) {

		struct hlist_head *bucket;

		unsigned int mac_hash;

		struct mlx4_mac_entry *entry;

		struct hlist_node *tmp;

		u64 prev_mac_u64 = mlx4_en_mac_to_u64(prev_mac);

		u64 prev_mac_u64 = mlx4_mac_to_u64(prev_mac);



		bucket = &priv->mac_hash[prev_mac[MLX4_EN_MAC_HASH_IDX]];

		hlist_for_each_entry_safe(entry, tmp, bucket, hlist) {
@@ -751,18 +751,6 @@ static int mlx4_en_replace_mac(struct mlx4_en_priv *priv, int qpn, 
	return __mlx4_replace_mac(dev, priv->port, qpn, new_mac_u64);

}



u64 mlx4_en_mac_to_u64(u8 *addr)

{

	u64 mac = 0;

	int i;



	for (i = 0; i < ETH_ALEN; i++) {

		mac <<= 8;

		mac |= addr[i];

	}

	return mac;

}



static int mlx4_en_do_set_mac(struct mlx4_en_priv *priv)

{

	int err = 0;
@@ -1081,7 +1069,7 @@ static void mlx4_en_do_multicast(struct mlx4_en_priv *priv, 
		mlx4_en_cache_mclist(dev);

		netif_addr_unlock_bh(dev);

		list_for_each_entry(mclist, &priv->mc_list, list) {

			mcast_addr = mlx4_en_mac_to_u64(mclist->addr);

			mcast_addr = mlx4_mac_to_u64(mclist->addr);

			mlx4_SET_MCAST_FLTR(mdev->dev, priv->port,

					    mcast_addr, 0, MLX4_MCAST_CONFIG);

		}
@@ -1173,7 +1161,7 @@ static void mlx4_en_do_uc_filter(struct mlx4_en_priv *priv, 
				found = true;



			if (!found) {

				mac = mlx4_en_mac_to_u64(entry->mac);

				mac = mlx4_mac_to_u64(entry->mac);

				mlx4_en_uc_steer_release(priv, entry->mac,

							 priv->base_qpn,

							 entry->reg_id);
@@ -1216,7 +1204,7 @@ static void mlx4_en_do_uc_filter(struct mlx4_en_priv *priv, 
				priv->flags |= MLX4_EN_FLAG_FORCE_PROMISC;

				break;

			}

			mac = mlx4_en_mac_to_u64(ha->addr);

			mac = mlx4_mac_to_u64(ha->addr);

			memcpy(entry->mac, ha->addr, ETH_ALEN);

			err = mlx4_register_mac(mdev->dev, priv->port, mac);

			if (err < 0) {
@@ -2206,7 +2194,7 @@ static int mlx4_en_set_vf_mac(struct net_device *dev, int queue, u8 *mac) 
{

	struct mlx4_en_priv *en_priv = netdev_priv(dev);

	struct mlx4_en_dev *mdev = en_priv->mdev;

	u64 mac_u64 = mlx4_en_mac_to_u64(mac);

	u64 mac_u64 = mlx4_mac_to_u64(mac);



	if (!is_valid_ether_addr(mac))

		return -EINVAL;
@@ -2407,7 +2395,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, 
		if (mlx4_is_slave(priv->mdev->dev)) {

			eth_hw_addr_random(dev);

			en_warn(priv, "Assigned random MAC address %pM\n", dev->dev_addr);

			mac_u64 = mlx4_en_mac_to_u64(dev->dev_addr);

			mac_u64 = mlx4_mac_to_u64(dev->dev_addr);

			mdev->dev->caps.def_mac[priv->port] = mac_u64;

		} else {

			en_err(priv, "Port: %d, invalid mac burned: %pM, quiting\n",

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

+6 −0
Original line number Diff line number Diff line
@@ -148,10 +148,16 @@ int mlx4_en_DUMP_ETH_STATS(struct mlx4_en_dev *mdev, u8 port, u8 reset) 
	stats->tx_packets = 0;

	stats->tx_bytes = 0;

	priv->port_stats.tx_chksum_offload = 0;

	priv->port_stats.queue_stopped = 0;

	priv->port_stats.wake_queue = 0;



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

		stats->tx_packets += priv->tx_ring[i]->packets;

		stats->tx_bytes += priv->tx_ring[i]->bytes;

		priv->port_stats.tx_chksum_offload += priv->tx_ring[i]->tx_csum;

		priv->port_stats.queue_stopped +=

			priv->tx_ring[i]->queue_stopped;

		priv->port_stats.wake_queue += priv->tx_ring[i]->wake_queue;

	}



	stats->rx_errors = be64_to_cpu(mlx4_en_stats->PCS) +