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

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

Merge branch 'mlx4' 



Or Gerlitz says:

====================
Here's a batch of fixes to the mlx4 core and ethernet drivers for 3.9

The commit that disabled RFS when running in SRIOV mode fixes a regression which was
introduced in 3.9-rc1 but actually present also in the 3.8 -stable series. It turns out
that a slightly different fix is needed there and we will generate and submit it there.

Patches done against net commit 66d29cbc "benet: Wait f/w POST until timeout"
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 43b18db8 a229e488

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

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ void __mlx4_cq_free_icm(struct mlx4_dev *dev, int cqn) 


static void mlx4_cq_free_icm(struct mlx4_dev *dev, int cqn)

{

	u64 in_param;

	u64 in_param = 0;

	int err;



	if (mlx4_is_mfunc(dev)) {

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

+46 −40
Original line number Diff line number Diff line
@@ -565,34 +565,38 @@ static void mlx4_en_put_qp(struct mlx4_en_priv *priv) 
	struct mlx4_en_dev *mdev = priv->mdev;

	struct mlx4_dev *dev = mdev->dev;

	int qpn = priv->base_qpn;

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

	u64 mac;



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

		mac = mlx4_en_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);



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

	} else {

		struct mlx4_mac_entry *entry;

		struct hlist_node *tmp;

		struct hlist_head *bucket;

		unsigned int mac_hash;

		unsigned int i;



		mac_hash = priv->dev->dev_addr[MLX4_EN_MAC_HASH_IDX];

		bucket = &priv->mac_hash[mac_hash];

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

			bucket = &priv->mac_hash[i];

			hlist_for_each_entry_safe(entry, tmp, bucket, hlist) {

			if (ether_addr_equal_64bits(entry->mac,

						    priv->dev->dev_addr)) {

				en_dbg(DRV, priv, "Releasing qp: port %d, MAC %pM, qpn %d\n",

				       priv->port, priv->dev->dev_addr, qpn);

				mac = mlx4_en_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,

							 qpn, entry->reg_id);

				mlx4_qp_release_range(dev, qpn, 1);



				mlx4_unregister_mac(dev, priv->port, mac);

				hlist_del_rcu(&entry->hlist);

				kfree_rcu(entry, rcu);

				break;

			}

		}



		en_dbg(DRV, priv, "Releasing qp: port %d, qpn %d\n",

		       priv->port, qpn);

		mlx4_qp_release_range(dev, qpn, 1);

		priv->flags &= ~MLX4_EN_FLAG_FORCE_PROMISC;

	}

}
@@ -650,28 +654,10 @@ u64 mlx4_en_mac_to_u64(u8 *addr) 
	return mac;

}



static int mlx4_en_set_mac(struct net_device *dev, void *addr)

static int mlx4_en_do_set_mac(struct mlx4_en_priv *priv)

{

	struct mlx4_en_priv *priv = netdev_priv(dev);

	struct mlx4_en_dev *mdev = priv->mdev;

	struct sockaddr *saddr = addr;



	if (!is_valid_ether_addr(saddr->sa_data))

		return -EADDRNOTAVAIL;



	memcpy(dev->dev_addr, saddr->sa_data, ETH_ALEN);

	queue_work(mdev->workqueue, &priv->mac_task);

	return 0;

}



static void mlx4_en_do_set_mac(struct work_struct *work)

{

	struct mlx4_en_priv *priv = container_of(work, struct mlx4_en_priv,

						 mac_task);

	struct mlx4_en_dev *mdev = priv->mdev;

	int err = 0;



	mutex_lock(&mdev->state_lock);

	if (priv->port_up) {

		/* Remove old MAC and insert the new one */

		err = mlx4_en_replace_mac(priv, priv->base_qpn,
@@ -683,7 +669,26 @@ static void mlx4_en_do_set_mac(struct work_struct *work) 
	} else

		en_dbg(HW, priv, "Port is down while registering mac, exiting...\n");



	return err;

}



static int mlx4_en_set_mac(struct net_device *dev, void *addr)

{

	struct mlx4_en_priv *priv = netdev_priv(dev);

	struct mlx4_en_dev *mdev = priv->mdev;

	struct sockaddr *saddr = addr;

	int err;



	if (!is_valid_ether_addr(saddr->sa_data))

		return -EADDRNOTAVAIL;



	memcpy(dev->dev_addr, saddr->sa_data, ETH_ALEN);



	mutex_lock(&mdev->state_lock);

	err = mlx4_en_do_set_mac(priv);

	mutex_unlock(&mdev->state_lock);



	return err;

}



static void mlx4_en_clear_list(struct net_device *dev)
@@ -1348,7 +1353,7 @@ static void mlx4_en_do_get_stats(struct work_struct *work) 
		queue_delayed_work(mdev->workqueue, &priv->stats_task, STATS_DELAY);

	}

	if (mdev->mac_removed[MLX4_MAX_PORTS + 1 - priv->port]) {

		queue_work(mdev->workqueue, &priv->mac_task);

		mlx4_en_do_set_mac(priv);

		mdev->mac_removed[MLX4_MAX_PORTS + 1 - priv->port] = 0;

	}

	mutex_unlock(&mdev->state_lock);
@@ -1828,9 +1833,11 @@ int mlx4_en_alloc_resources(struct mlx4_en_priv *priv) 
	}



#ifdef CONFIG_RFS_ACCEL

	if (priv->mdev->dev->caps.comp_pool) {

		priv->dev->rx_cpu_rmap = alloc_irq_cpu_rmap(priv->mdev->dev->caps.comp_pool);

		if (!priv->dev->rx_cpu_rmap)

			goto err;

	}

#endif



	return 0;
@@ -2078,7 +2085,6 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, 
	priv->msg_enable = MLX4_EN_MSG_LEVEL;

	spin_lock_init(&priv->stats_lock);

	INIT_WORK(&priv->rx_mode_task, mlx4_en_do_set_rx_mode);

	INIT_WORK(&priv->mac_task, mlx4_en_do_set_mac);

	INIT_WORK(&priv->watchdog_task, mlx4_en_restart);

	INIT_WORK(&priv->linkstate_task, mlx4_en_linkstate);

	INIT_DELAYED_WORK(&priv->stats_task, mlx4_en_do_get_stats);

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

+8 −0
Original line number Diff line number Diff line
@@ -787,6 +787,14 @@ int mlx4_QUERY_DEV_CAP_wrapper(struct mlx4_dev *dev, int slave, 
	bmme_flags &= ~MLX4_BMME_FLAG_TYPE_2_WIN;

	MLX4_PUT(outbox->buf, bmme_flags, QUERY_DEV_CAP_BMME_FLAGS_OFFSET);



	/* turn off device-managed steering capability if not enabled */

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

		MLX4_GET(field, outbox->buf,

			 QUERY_DEV_CAP_FLOW_STEERING_RANGE_EN_OFFSET);

		field &= 0x7f;

		MLX4_PUT(outbox->buf, field,

			 QUERY_DEV_CAP_FLOW_STEERING_RANGE_EN_OFFSET);

	}

	return 0;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -1555,7 +1555,7 @@ void __mlx4_counter_free(struct mlx4_dev *dev, u32 idx) 


void mlx4_counter_free(struct mlx4_dev *dev, u32 idx)

{

	u64 in_param;

	u64 in_param = 0;



	if (mlx4_is_mfunc(dev)) {

		set_param_l(&in_param, idx);

drivers/net/ethernet/mellanox/mlx4/mlx4.h

+1 −1
Original line number Diff line number Diff line
@@ -1235,7 +1235,7 @@ int mlx4_get_qp_per_mgm(struct mlx4_dev *dev); 


static inline void set_param_l(u64 *arg, u32 val)

{

	*((u32 *)arg) = val;

	*arg = (*arg & 0xffffffff00000000ULL) | (u64) val;

}



static inline void set_param_h(u64 *arg, u32 val)