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

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

Merge branch 'mlx5-next' 



Eli Cohen says:

====================
mlx5 batch of patches for net-next

This series contains small fixes to the mlx5 core driver and also
preparation steps towards adding Ethernet support for ConnectX4
devices which will be part of mlx5 driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c448b5e7 64613d94

drivers/infiniband/hw/mlx5/ah.c

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, Mellanox Technologies inc.  All rights reserved.

 * Copyright (c) 2013-2015, Mellanox Technologies. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

drivers/infiniband/hw/mlx5/cq.c

+8 −6
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, Mellanox Technologies inc.  All rights reserved.

 * Copyright (c) 2013-2015, Mellanox Technologies. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU
@@ -572,11 +572,15 @@ int mlx5_ib_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc) 


int mlx5_ib_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags flags)

{

	struct mlx5_core_dev *mdev = to_mdev(ibcq->device)->mdev;

	void __iomem *uar_page = mdev->priv.uuari.uars[0].map;



	mlx5_cq_arm(&to_mcq(ibcq)->mcq,

		    (flags & IB_CQ_SOLICITED_MASK) == IB_CQ_SOLICITED ?

		    MLX5_CQ_DB_REQ_NOT_SOL : MLX5_CQ_DB_REQ_NOT,

		    to_mdev(ibcq->device)->mdev->priv.uuari.uars[0].map,

		    MLX5_GET_DOORBELL_LOCK(&to_mdev(ibcq->device)->mdev->priv.cq_uar_lock));

		    uar_page,

		    MLX5_GET_DOORBELL_LOCK(&mdev->priv.cq_uar_lock),

		    to_mcq(ibcq)->mcq.cons_index);



	return 0;

}
@@ -697,8 +701,6 @@ static int create_cq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq, 


	cq->mcq.set_ci_db  = cq->db.db;

	cq->mcq.arm_db     = cq->db.db + 1;

	*cq->mcq.set_ci_db = 0;

	*cq->mcq.arm_db    = 0;

	cq->mcq.cqe_sz = cqe_size;



	err = alloc_cq_buf(dev, &cq->buf, entries, cqe_size);
@@ -782,7 +784,7 @@ struct ib_cq *mlx5_ib_create_cq(struct ib_device *ibdev, int entries, 
	cq->cqe_size = cqe_size;

	cqb->ctx.cqe_sz_flags = cqe_sz_to_mlx_sz(cqe_size) << 5;

	cqb->ctx.log_sz_usr_page = cpu_to_be32((ilog2(entries) << 24) | index);

	err = mlx5_vector2eqn(dev, vector, &eqn, &irqn);

	err = mlx5_vector2eqn(dev->mdev, vector, &eqn, &irqn);

	if (err)

		goto err_cqb;

drivers/infiniband/hw/mlx5/doorbell.c

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, Mellanox Technologies inc.  All rights reserved.

 * Copyright (c) 2013-2015, Mellanox Technologies. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

drivers/infiniband/hw/mlx5/mad.c

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, Mellanox Technologies inc.  All rights reserved.

 * Copyright (c) 2013-2015, Mellanox Technologies. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

drivers/infiniband/hw/mlx5/main.c

+6 −101
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, Mellanox Technologies inc.  All rights reserved.

 * Copyright (c) 2013-2015, Mellanox Technologies. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU
@@ -62,95 +62,6 @@ static char mlx5_version[] = 
	DRIVER_NAME ": Mellanox Connect-IB Infiniband driver v"

	DRIVER_VERSION " (" DRIVER_RELDATE ")\n";



int mlx5_vector2eqn(struct mlx5_ib_dev *dev, int vector, int *eqn, int *irqn)

{

	struct mlx5_eq_table *table = &dev->mdev->priv.eq_table;

	struct mlx5_eq *eq, *n;

	int err = -ENOENT;



	spin_lock(&table->lock);

	list_for_each_entry_safe(eq, n, &dev->eqs_list, list) {

		if (eq->index == vector) {

			*eqn = eq->eqn;

			*irqn = eq->irqn;

			err = 0;

			break;

		}

	}

	spin_unlock(&table->lock);



	return err;

}



static int alloc_comp_eqs(struct mlx5_ib_dev *dev)

{

	struct mlx5_eq_table *table = &dev->mdev->priv.eq_table;

	char name[MLX5_MAX_EQ_NAME];

	struct mlx5_eq *eq, *n;

	int ncomp_vec;

	int nent;

	int err;

	int i;



	INIT_LIST_HEAD(&dev->eqs_list);

	ncomp_vec = table->num_comp_vectors;

	nent = MLX5_COMP_EQ_SIZE;

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

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

		if (!eq) {

			err = -ENOMEM;

			goto clean;

		}



		snprintf(name, MLX5_MAX_EQ_NAME, "mlx5_comp%d", i);

		err = mlx5_create_map_eq(dev->mdev, eq,

					 i + MLX5_EQ_VEC_COMP_BASE, nent, 0,

					 name, &dev->mdev->priv.uuari.uars[0]);

		if (err) {

			kfree(eq);

			goto clean;

		}

		mlx5_ib_dbg(dev, "allocated completion EQN %d\n", eq->eqn);

		eq->index = i;

		spin_lock(&table->lock);

		list_add_tail(&eq->list, &dev->eqs_list);

		spin_unlock(&table->lock);

	}



	dev->num_comp_vectors = ncomp_vec;

	return 0;



clean:

	spin_lock(&table->lock);

	list_for_each_entry_safe(eq, n, &dev->eqs_list, list) {

		list_del(&eq->list);

		spin_unlock(&table->lock);

		if (mlx5_destroy_unmap_eq(dev->mdev, eq))

			mlx5_ib_warn(dev, "failed to destroy EQ 0x%x\n", eq->eqn);

		kfree(eq);

		spin_lock(&table->lock);

	}

	spin_unlock(&table->lock);

	return err;

}



static void free_comp_eqs(struct mlx5_ib_dev *dev)

{

	struct mlx5_eq_table *table = &dev->mdev->priv.eq_table;

	struct mlx5_eq *eq, *n;



	spin_lock(&table->lock);

	list_for_each_entry_safe(eq, n, &dev->eqs_list, list) {

		list_del(&eq->list);

		spin_unlock(&table->lock);

		if (mlx5_destroy_unmap_eq(dev->mdev, eq))

			mlx5_ib_warn(dev, "failed to destroy EQ 0x%x\n", eq->eqn);

		kfree(eq);

		spin_lock(&table->lock);

	}

	spin_unlock(&table->lock);

}



static int mlx5_ib_query_device(struct ib_device *ibdev,

				struct ib_device_attr *props)

{
@@ -1291,10 +1202,6 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) 


	get_ext_port_caps(dev);



	err = alloc_comp_eqs(dev);

	if (err)

		goto err_dealloc;



	MLX5_INIT_DOORBELL_LOCK(&dev->uar_lock);



	strlcpy(dev->ib_dev.name, "mlx5_%d", IB_DEVICE_NAME_MAX);
@@ -1303,7 +1210,8 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) 
	dev->ib_dev.local_dma_lkey	= mdev->caps.gen.reserved_lkey;

	dev->num_ports		= mdev->caps.gen.num_ports;

	dev->ib_dev.phys_port_cnt     = dev->num_ports;

	dev->ib_dev.num_comp_vectors	= dev->num_comp_vectors;

	dev->ib_dev.num_comp_vectors    =

		dev->mdev->priv.eq_table.num_comp_vectors;

	dev->ib_dev.dma_device	= &mdev->pdev->dev;



	dev->ib_dev.uverbs_abi_ver	= MLX5_IB_UVERBS_ABI_VERSION;
@@ -1390,13 +1298,13 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) 


	err = init_node_data(dev);

	if (err)

		goto err_eqs;

		goto err_dealloc;



	mutex_init(&dev->cap_mask_mutex);



	err = create_dev_resources(&dev->devr);

	if (err)

		goto err_eqs;

		goto err_dealloc;



	err = mlx5_ib_odp_init_one(dev);

	if (err)
@@ -1433,9 +1341,6 @@ err_odp: 
err_rsrc:

	destroy_dev_resources(&dev->devr);



err_eqs:

	free_comp_eqs(dev);



err_dealloc:

	ib_dealloc_device((struct ib_device *)dev);
@@ -1450,7 +1355,6 @@ static void mlx5_ib_remove(struct mlx5_core_dev *mdev, void *context) 
	destroy_umrc_res(dev);

	mlx5_ib_odp_remove_one(dev);

	destroy_dev_resources(&dev->devr);

	free_comp_eqs(dev);

	ib_dealloc_device(&dev->ib_dev);

}
@@ -1458,6 +1362,7 @@ static struct mlx5_interface mlx5_ib_interface = { 
	.add            = mlx5_ib_add,

	.remove         = mlx5_ib_remove,

	.event          = mlx5_ib_event,

	.protocol	= MLX5_INTERFACE_PROTOCOL_IB,

};



static int __init mlx5_ib_init(void)