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

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

Merge branch 'mlx4' 



Amir Vadai says:

====================
net/mlx4: Mellanox driver update 07-11-2013

This patchset contains some enhancements and bug fixes for the mlx4_* drivers.
Patchset was applied and tested against commit: "9bb8ca86 virtio-net: switch to
use XPS to choose txq"
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3cdcf133 163561a4

drivers/infiniband/hw/mlx4/main.c

+0 −6
Original line number Diff line number Diff line
@@ -526,7 +526,6 @@ static int mlx4_ib_modify_device(struct ib_device *ibdev, int mask, 
	if (IS_ERR(mailbox))

		return 0;



	memset(mailbox->buf, 0, 256);

	memcpy(mailbox->buf, props->node_desc, 64);

	mlx4_cmd(to_mdev(ibdev)->dev, mailbox->dma, 1, 0,

		 MLX4_CMD_SET_NODE, MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);
@@ -547,8 +546,6 @@ static int mlx4_SET_PORT(struct mlx4_ib_dev *dev, u8 port, int reset_qkey_viols, 
	if (IS_ERR(mailbox))

		return PTR_ERR(mailbox);



	memset(mailbox->buf, 0, 256);



	if (dev->dev->flags & MLX4_FLAG_OLD_PORT_CMDS) {

		*(u8 *) mailbox->buf	     = !!reset_qkey_viols << 6;

		((__be32 *) mailbox->buf)[2] = cpu_to_be32(cap_mask);
@@ -879,8 +876,6 @@ static int __mlx4_ib_create_flow(struct ib_qp *qp, struct ib_flow_attr *flow_att 
	struct mlx4_ib_dev *mdev = to_mdev(qp->device);

	struct mlx4_cmd_mailbox *mailbox;

	struct mlx4_net_trans_rule_hw_ctrl *ctrl;

	size_t rule_size = sizeof(struct mlx4_net_trans_rule_hw_ctrl) +

			   (sizeof(struct _rule_hw) * flow_attr->num_of_specs);



	static const u16 __mlx4_domain[] = {

		[IB_FLOW_DOMAIN_USER] = MLX4_DOMAIN_UVERBS,
@@ -905,7 +900,6 @@ static int __mlx4_ib_create_flow(struct ib_qp *qp, struct ib_flow_attr *flow_att 
	mailbox = mlx4_alloc_cmd_mailbox(mdev->dev);

	if (IS_ERR(mailbox))

		return PTR_ERR(mailbox);

	memset(mailbox->buf, 0, rule_size);

	ctrl = mailbox->buf;



	ctrl->prio = cpu_to_be16(__mlx4_domain[domain] |

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

+16 −20
Original line number Diff line number Diff line
@@ -1539,11 +1539,6 @@ out: 
	return ret;

}



static int calculate_transition(u16 oper_vlan, u16 admin_vlan)

{

	return (2 * (oper_vlan == MLX4_VGT) + (admin_vlan == MLX4_VGT));

}



static int mlx4_master_immediate_activate_vlan_qos(struct mlx4_priv *priv,

					    int slave, int port)

{
@@ -1553,7 +1548,6 @@ static int mlx4_master_immediate_activate_vlan_qos(struct mlx4_priv *priv, 
	struct mlx4_dev *dev = &(priv->dev);

	int err;

	int admin_vlan_ix = NO_INDX;

	enum mlx4_vlan_transition vlan_trans;



	vp_oper = &priv->mfunc.master.vf_oper[slave].vport[port];

	vp_admin = &priv->mfunc.master.vf_admin[slave].vport[port];
@@ -1563,12 +1557,8 @@ static int mlx4_master_immediate_activate_vlan_qos(struct mlx4_priv *priv, 
	    vp_oper->state.link_state == vp_admin->link_state)

		return 0;



	vlan_trans = calculate_transition(vp_oper->state.default_vlan,

					  vp_admin->default_vlan);



	if (!(priv->mfunc.master.slave_state[slave].active &&

	      dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_UPDATE_QP &&

	      vlan_trans == MLX4_VLAN_TRANSITION_VST_VST)) {

	      dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_UPDATE_QP)) {

		/* even if the UPDATE_QP command isn't supported, we still want

		 * to set this VF link according to the admin directive

		 */
@@ -1586,6 +1576,7 @@ static int mlx4_master_immediate_activate_vlan_qos(struct mlx4_priv *priv, 
		return -ENOMEM;



	if (vp_oper->state.default_vlan != vp_admin->default_vlan) {

		if (MLX4_VGT != vp_admin->default_vlan) {

			err = __mlx4_register_vlan(&priv->dev, port,

						   vp_admin->default_vlan,

						   &admin_vlan_ix);
@@ -1596,6 +1587,9 @@ static int mlx4_master_immediate_activate_vlan_qos(struct mlx4_priv *priv, 
					  slave, port);

				return err;

			}

		} else {

			admin_vlan_ix = NO_INDX;

		}

		work->flags |= MLX4_VF_IMMED_VLAN_FLAG_VLAN;

		mlx4_dbg((&(priv->dev)),

			 "alloc vlan %d idx  %d slave %d port %d\n",
@@ -2199,6 +2193,8 @@ struct mlx4_cmd_mailbox *mlx4_alloc_cmd_mailbox(struct mlx4_dev *dev) 
		return ERR_PTR(-ENOMEM);

	}



	memset(mailbox->buf, 0, MLX4_MAILBOX_SIZE);



	return mailbox;

}

EXPORT_SYMBOL_GPL(mlx4_alloc_cmd_mailbox);

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

+0 −6
Original line number Diff line number Diff line
@@ -128,8 +128,6 @@ int mlx4_cq_modify(struct mlx4_dev *dev, struct mlx4_cq *cq, 
		return PTR_ERR(mailbox);



	cq_context = mailbox->buf;

	memset(cq_context, 0, sizeof *cq_context);



	cq_context->cq_max_count = cpu_to_be16(count);

	cq_context->cq_period    = cpu_to_be16(period);
@@ -153,8 +151,6 @@ int mlx4_cq_resize(struct mlx4_dev *dev, struct mlx4_cq *cq, 
		return PTR_ERR(mailbox);



	cq_context = mailbox->buf;

	memset(cq_context, 0, sizeof *cq_context);



	cq_context->logsize_usrpage = cpu_to_be32(ilog2(entries) << 24);

	cq_context->log_page_size   = mtt->page_shift - 12;

	mtt_addr = mlx4_mtt_addr(dev, mtt);
@@ -274,8 +270,6 @@ int mlx4_cq_alloc(struct mlx4_dev *dev, int nent, 
	}



	cq_context = mailbox->buf;

	memset(cq_context, 0, sizeof *cq_context);



	cq_context->flags	    = cpu_to_be32(!!collapsed << 18);

	if (timestamp_en)

		cq_context->flags  |= cpu_to_be32(1 << 19);

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

+36 −9
Original line number Diff line number Diff line
@@ -44,12 +44,23 @@ static void mlx4_en_cq_event(struct mlx4_cq *cq, enum mlx4_event event) 




int mlx4_en_create_cq(struct mlx4_en_priv *priv,

		      struct mlx4_en_cq *cq,

		      int entries, int ring, enum cq_type mode)

		      struct mlx4_en_cq **pcq,

		      int entries, int ring, enum cq_type mode,

		      int node)

{

	struct mlx4_en_dev *mdev = priv->mdev;

	struct mlx4_en_cq *cq;

	int err;



	cq = kzalloc_node(sizeof(*cq), GFP_KERNEL, node);

	if (!cq) {

		cq = kzalloc(sizeof(*cq), GFP_KERNEL);

		if (!cq) {

			en_err(priv, "Failed to allocate CQ structure\n");

			return -ENOMEM;

		}

	}



	cq->size = entries;

	cq->buf_size = cq->size * mdev->dev->caps.cqe_size;
@@ -57,17 +68,30 @@ int mlx4_en_create_cq(struct mlx4_en_priv *priv, 
	cq->is_tx = mode;

	spin_lock_init(&cq->lock);



	/* Allocate HW buffers on provided NUMA node.

	 * dev->numa_node is used in mtt range allocation flow.

	 */

	set_dev_node(&mdev->dev->pdev->dev, node);

	err = mlx4_alloc_hwq_res(mdev->dev, &cq->wqres,

				cq->buf_size, 2 * PAGE_SIZE);

	set_dev_node(&mdev->dev->pdev->dev, mdev->dev->numa_node);

	if (err)

		return err;

		goto err_cq;



	err = mlx4_en_map_buffer(&cq->wqres.buf);

	if (err)

		mlx4_free_hwq_res(mdev->dev, &cq->wqres, cq->buf_size);

	else

		goto err_res;



	cq->buf = (struct mlx4_cqe *)cq->wqres.buf.direct.buf;

	*pcq = cq;



	return 0;



err_res:

	mlx4_free_hwq_res(mdev->dev, &cq->wqres, cq->buf_size);

err_cq:

	kfree(cq);

	*pcq = NULL;

	return err;

}
@@ -117,12 +141,12 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq, 
		struct mlx4_en_cq *rx_cq;



		cq_idx = cq_idx % priv->rx_ring_num;

		rx_cq = &priv->rx_cq[cq_idx];

		rx_cq = priv->rx_cq[cq_idx];

		cq->vector = rx_cq->vector;

	}



	if (!cq->is_tx)

		cq->size = priv->rx_ring[cq->ring].actual_size;

		cq->size = priv->rx_ring[cq->ring]->actual_size;



	if ((cq->is_tx && priv->hwtstamp_config.tx_type) ||

	    (!cq->is_tx && priv->hwtstamp_config.rx_filter))
@@ -146,9 +170,10 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq, 
	return 0;

}



void mlx4_en_destroy_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq)

void mlx4_en_destroy_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq **pcq)

{

	struct mlx4_en_dev *mdev = priv->mdev;

	struct mlx4_en_cq *cq = *pcq;



	mlx4_en_unmap_buffer(&cq->wqres.buf);

	mlx4_free_hwq_res(mdev->dev, &cq->wqres, cq->buf_size);
@@ -157,6 +182,8 @@ void mlx4_en_destroy_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq) 
	cq->vector = 0;

	cq->buf_size = 0;

	cq->buf = NULL;

	kfree(cq);

	*pcq = NULL;

}



void mlx4_en_deactivate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq)

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

+18 −18
Original line number Diff line number Diff line
@@ -51,10 +51,10 @@ static int mlx4_en_moderation_update(struct mlx4_en_priv *priv) 
	int err = 0;



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

		priv->tx_cq[i].moder_cnt = priv->tx_frames;

		priv->tx_cq[i].moder_time = priv->tx_usecs;

		priv->tx_cq[i]->moder_cnt = priv->tx_frames;

		priv->tx_cq[i]->moder_time = priv->tx_usecs;

		if (priv->port_up) {

			err = mlx4_en_set_cq_moder(priv, &priv->tx_cq[i]);

			err = mlx4_en_set_cq_moder(priv, priv->tx_cq[i]);

			if (err)

				return err;

		}
@@ -64,11 +64,11 @@ static int mlx4_en_moderation_update(struct mlx4_en_priv *priv) 
		return 0;



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

		priv->rx_cq[i].moder_cnt = priv->rx_frames;

		priv->rx_cq[i].moder_time = priv->rx_usecs;

		priv->rx_cq[i]->moder_cnt = priv->rx_frames;

		priv->rx_cq[i]->moder_time = priv->rx_usecs;

		priv->last_moder_time[i] = MLX4_EN_AUTO_CONF;

		if (priv->port_up) {

			err = mlx4_en_set_cq_moder(priv, &priv->rx_cq[i]);

			err = mlx4_en_set_cq_moder(priv, priv->rx_cq[i]);

			if (err)

				return err;

		}
@@ -274,16 +274,16 @@ static void mlx4_en_get_ethtool_stats(struct net_device *dev, 
		}

	}

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

		data[index++] = priv->tx_ring[i].packets;

		data[index++] = priv->tx_ring[i].bytes;

		data[index++] = priv->tx_ring[i]->packets;

		data[index++] = priv->tx_ring[i]->bytes;

	}

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

		data[index++] = priv->rx_ring[i].packets;

		data[index++] = priv->rx_ring[i].bytes;

		data[index++] = priv->rx_ring[i]->packets;

		data[index++] = priv->rx_ring[i]->bytes;

#ifdef CONFIG_NET_RX_BUSY_POLL

		data[index++] = priv->rx_ring[i].yields;

		data[index++] = priv->rx_ring[i].misses;

		data[index++] = priv->rx_ring[i].cleaned;

		data[index++] = priv->rx_ring[i]->yields;

		data[index++] = priv->rx_ring[i]->misses;

		data[index++] = priv->rx_ring[i]->cleaned;

#endif

	}

	spin_unlock_bh(&priv->stats_lock);
@@ -510,9 +510,9 @@ static int mlx4_en_set_ringparam(struct net_device *dev, 
	tx_size = max_t(u32, tx_size, MLX4_EN_MIN_TX_SIZE);

	tx_size = min_t(u32, tx_size, MLX4_EN_MAX_TX_SIZE);



	if (rx_size == (priv->port_up ? priv->rx_ring[0].actual_size :

					priv->rx_ring[0].size) &&

	    tx_size == priv->tx_ring[0].size)

	if (rx_size == (priv->port_up ? priv->rx_ring[0]->actual_size :

					priv->rx_ring[0]->size) &&

	    tx_size == priv->tx_ring[0]->size)

		return 0;



	mutex_lock(&mdev->state_lock);
@@ -553,8 +553,8 @@ static void mlx4_en_get_ringparam(struct net_device *dev, 
	param->rx_max_pending = MLX4_EN_MAX_RX_SIZE;

	param->tx_max_pending = MLX4_EN_MAX_TX_SIZE;

	param->rx_pending = priv->port_up ?

		priv->rx_ring[0].actual_size : priv->rx_ring[0].size;

	param->tx_pending = priv->tx_ring[0].size;

		priv->rx_ring[0]->actual_size : priv->rx_ring[0]->size;

	param->tx_pending = priv->tx_ring[0]->size;

}



static u32 mlx4_en_get_rxfh_indir_size(struct net_device *dev)