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

Merge branch 'mlx5-next' 



Eli Cohen says:

====================
mlx5 driver changes related to PCI handling ***

The first of these patches is changing the pci device driver from mlx5_ib to
mlx5_core in a similar manner it is done in mlx4. This set the grounds for us
to introduce Ethernet driver for HW which uses mlx5.

The other two patches contain minor fixes.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4ada97ab 4d2f9bbb

drivers/infiniband/hw/mlx5/cq.c

+24 −24
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static void handle_responder(struct ib_wc *wc, struct mlx5_cqe64 *cqe, 
		struct mlx5_core_srq *msrq = NULL;



		if (qp->ibqp.xrcd) {

			msrq = mlx5_core_get_srq(&dev->mdev,

			msrq = mlx5_core_get_srq(dev->mdev,

						 be32_to_cpu(cqe->srqn));

			srq = to_mibsrq(msrq);

		} else {
@@ -348,7 +348,7 @@ static void handle_atomic(struct mlx5_ib_qp *qp, struct mlx5_cqe64 *cqe64, 
static void handle_atomics(struct mlx5_ib_qp *qp, struct mlx5_cqe64 *cqe64,

			   u16 tail, u16 head)

{

	int idx;

	u16 idx;



	do {

		idx = tail & (qp->sq.wqe_cnt - 1);
@@ -364,7 +364,7 @@ static void handle_atomics(struct mlx5_ib_qp *qp, struct mlx5_cqe64 *cqe64, 


static void free_cq_buf(struct mlx5_ib_dev *dev, struct mlx5_ib_cq_buf *buf)

{

	mlx5_buf_free(&dev->mdev, &buf->buf);

	mlx5_buf_free(dev->mdev, &buf->buf);

}



static void get_sig_err_item(struct mlx5_sig_err_cqe *cqe,
@@ -450,7 +450,7 @@ repoll: 
		 * because CQs will be locked while QPs are removed

		 * from the table.

		 */

		mqp = __mlx5_qp_lookup(&dev->mdev, qpn);

		mqp = __mlx5_qp_lookup(dev->mdev, qpn);

		if (unlikely(!mqp)) {

			mlx5_ib_warn(dev, "CQE@CQ %06x for unknown QPN %6x\n",

				     cq->mcq.cqn, qpn);
@@ -514,11 +514,11 @@ repoll: 
	case MLX5_CQE_SIG_ERR:

		sig_err_cqe = (struct mlx5_sig_err_cqe *)cqe64;



		read_lock(&dev->mdev.priv.mr_table.lock);

		mmr = __mlx5_mr_lookup(&dev->mdev,

		read_lock(&dev->mdev->priv.mr_table.lock);

		mmr = __mlx5_mr_lookup(dev->mdev,

				       mlx5_base_mkey(be32_to_cpu(sig_err_cqe->mkey)));

		if (unlikely(!mmr)) {

			read_unlock(&dev->mdev.priv.mr_table.lock);

			read_unlock(&dev->mdev->priv.mr_table.lock);

			mlx5_ib_warn(dev, "CQE@CQ %06x for unknown MR %6x\n",

				     cq->mcq.cqn, be32_to_cpu(sig_err_cqe->mkey));

			return -EINVAL;
@@ -536,7 +536,7 @@ repoll: 
			     mr->sig->err_item.expected,

			     mr->sig->err_item.actual);



		read_unlock(&dev->mdev.priv.mr_table.lock);

		read_unlock(&dev->mdev->priv.mr_table.lock);

		goto repoll;

	}
@@ -575,8 +575,8 @@ int mlx5_ib_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags flags) 
	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));

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

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



	return 0;

}
@@ -586,7 +586,7 @@ static int alloc_cq_buf(struct mlx5_ib_dev *dev, struct mlx5_ib_cq_buf *buf, 
{

	int err;



	err = mlx5_buf_alloc(&dev->mdev, nent * cqe_size,

	err = mlx5_buf_alloc(dev->mdev, nent * cqe_size,

			     PAGE_SIZE * 2, &buf->buf);

	if (err)

		return err;
@@ -691,7 +691,7 @@ static int create_cq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq, 
{

	int err;



	err = mlx5_db_alloc(&dev->mdev, &cq->db);

	err = mlx5_db_alloc(dev->mdev, &cq->db);

	if (err)

		return err;
@@ -716,7 +716,7 @@ static int create_cq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq, 
	mlx5_fill_page_array(&cq->buf.buf, (*cqb)->pas);



	(*cqb)->ctx.log_pg_sz = cq->buf.buf.page_shift - MLX5_ADAPTER_PAGE_SHIFT;

	*index = dev->mdev.priv.uuari.uars[0].index;

	*index = dev->mdev->priv.uuari.uars[0].index;



	return 0;
@@ -724,14 +724,14 @@ err_buf: 
	free_cq_buf(dev, &cq->buf);



err_db:

	mlx5_db_free(&dev->mdev, &cq->db);

	mlx5_db_free(dev->mdev, &cq->db);

	return err;

}



static void destroy_cq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq)

{

	free_cq_buf(dev, &cq->buf);

	mlx5_db_free(&dev->mdev, &cq->db);

	mlx5_db_free(dev->mdev, &cq->db);

}



struct ib_cq *mlx5_ib_create_cq(struct ib_device *ibdev, int entries,
@@ -752,7 +752,7 @@ struct ib_cq *mlx5_ib_create_cq(struct ib_device *ibdev, int entries, 
		return ERR_PTR(-EINVAL);



	entries = roundup_pow_of_two(entries + 1);

	if (entries > dev->mdev.caps.max_cqes)

	if (entries > dev->mdev->caps.max_cqes)

		return ERR_PTR(-EINVAL);



	cq = kzalloc(sizeof(*cq), GFP_KERNEL);
@@ -789,7 +789,7 @@ struct ib_cq *mlx5_ib_create_cq(struct ib_device *ibdev, int entries, 
	cqb->ctx.c_eqn = cpu_to_be16(eqn);

	cqb->ctx.db_record_addr = cpu_to_be64(cq->db.dma);



	err = mlx5_core_create_cq(&dev->mdev, &cq->mcq, cqb, inlen);

	err = mlx5_core_create_cq(dev->mdev, &cq->mcq, cqb, inlen);

	if (err)

		goto err_cqb;
@@ -809,7 +809,7 @@ struct ib_cq *mlx5_ib_create_cq(struct ib_device *ibdev, int entries, 
	return &cq->ibcq;



err_cmd:

	mlx5_core_destroy_cq(&dev->mdev, &cq->mcq);

	mlx5_core_destroy_cq(dev->mdev, &cq->mcq);



err_cqb:

	mlx5_vfree(cqb);
@@ -834,7 +834,7 @@ int mlx5_ib_destroy_cq(struct ib_cq *cq) 
	if (cq->uobject)

		context = cq->uobject->context;



	mlx5_core_destroy_cq(&dev->mdev, &mcq->mcq);

	mlx5_core_destroy_cq(dev->mdev, &mcq->mcq);

	if (context)

		destroy_cq_user(mcq, context);

	else
@@ -919,7 +919,7 @@ int mlx5_ib_modify_cq(struct ib_cq *cq, u16 cq_count, u16 cq_period) 
	int err;

	u32 fsel;



	if (!(dev->mdev.caps.flags & MLX5_DEV_CAP_FLAG_CQ_MODER))

	if (!(dev->mdev->caps.flags & MLX5_DEV_CAP_FLAG_CQ_MODER))

		return -ENOSYS;



	in = kzalloc(sizeof(*in), GFP_KERNEL);
@@ -931,7 +931,7 @@ int mlx5_ib_modify_cq(struct ib_cq *cq, u16 cq_count, u16 cq_period) 
	in->ctx.cq_period = cpu_to_be16(cq_period);

	in->ctx.cq_max_count = cpu_to_be16(cq_count);

	in->field_select = cpu_to_be32(fsel);

	err = mlx5_core_modify_cq(&dev->mdev, &mcq->mcq, in, sizeof(*in));

	err = mlx5_core_modify_cq(dev->mdev, &mcq->mcq, in, sizeof(*in));

	kfree(in);



	if (err)
@@ -1074,7 +1074,7 @@ int mlx5_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata) 
	int uninitialized_var(cqe_size);

	unsigned long flags;



	if (!(dev->mdev.caps.flags & MLX5_DEV_CAP_FLAG_RESIZE_CQ)) {

	if (!(dev->mdev->caps.flags & MLX5_DEV_CAP_FLAG_RESIZE_CQ)) {

		pr_info("Firmware does not support resize CQ\n");

		return -ENOSYS;

	}
@@ -1083,7 +1083,7 @@ int mlx5_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata) 
		return -EINVAL;



	entries = roundup_pow_of_two(entries + 1);

	if (entries > dev->mdev.caps.max_cqes + 1)

	if (entries > dev->mdev->caps.max_cqes + 1)

		return -EINVAL;



	if (entries == ibcq->cqe + 1)
@@ -1128,7 +1128,7 @@ int mlx5_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata) 
	in->hdr.opmod = cpu_to_be16(MLX5_CQ_OPMOD_RESIZE);

	in->cqn = cpu_to_be32(cq->mcq.cqn);



	err = mlx5_core_modify_cq(&dev->mdev, &cq->mcq, in, inlen);

	err = mlx5_core_modify_cq(dev->mdev, &cq->mcq, in, inlen);

	if (err)

		goto ex_alloc;

drivers/infiniband/hw/mlx5/mad.c

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ enum { 
};



int mlx5_MAD_IFC(struct mlx5_ib_dev *dev, int ignore_mkey, int ignore_bkey,

		 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,

		 u8 port, struct ib_wc *in_wc, struct ib_grh *in_grh,

		 void *in_mad, void *response_mad)

{

	u8 op_modifier = 0;
@@ -54,7 +54,7 @@ int mlx5_MAD_IFC(struct mlx5_ib_dev *dev, int ignore_mkey, int ignore_bkey, 
	if (ignore_bkey || !in_wc)

		op_modifier |= 0x2;



	return mlx5_core_mad_ifc(&dev->mdev, in_mad, response_mad, op_modifier, port);

	return mlx5_core_mad_ifc(dev->mdev, in_mad, response_mad, op_modifier, port);

}



int mlx5_ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
@@ -129,7 +129,7 @@ int mlx5_query_ext_port_caps(struct mlx5_ib_dev *dev, u8 port) 


	packet_error = be16_to_cpu(out_mad->status);



	dev->mdev.caps.ext_port_cap[port - 1] = (!err && !packet_error) ?

	dev->mdev->caps.ext_port_cap[port - 1] = (!err && !packet_error) ?

		MLX_EXT_PORT_CAP_FLAG_EXTENDED_PORT_INFO : 0;



out:

drivers/infiniband/hw/mlx5/main.c

+98 −197
Original line number Diff line number Diff line
@@ -54,96 +54,17 @@ MODULE_DESCRIPTION("Mellanox Connect-IB HCA IB driver"); 
MODULE_LICENSE("Dual BSD/GPL");

MODULE_VERSION(DRIVER_VERSION);



static int prof_sel = 2;

module_param_named(prof_sel, prof_sel, int, 0444);

MODULE_PARM_DESC(prof_sel, "profile selector. Valid range 0 - 2");

static int deprecated_prof_sel = 2;

module_param_named(prof_sel, deprecated_prof_sel, int, 0444);

MODULE_PARM_DESC(prof_sel, "profile selector. Deprecated here. Moved to module mlx5_core");



static char mlx5_version[] =

	DRIVER_NAME ": Mellanox Connect-IB Infiniband driver v"

	DRIVER_VERSION " (" DRIVER_RELDATE ")\n";



static struct mlx5_profile profile[] = {

	[0] = {

		.mask		= 0,

	},

	[1] = {

		.mask		= MLX5_PROF_MASK_QP_SIZE,

		.log_max_qp	= 12,

	},

	[2] = {

		.mask		= MLX5_PROF_MASK_QP_SIZE |

				  MLX5_PROF_MASK_MR_CACHE,

		.log_max_qp	= 17,

		.mr_cache[0]	= {

			.size	= 500,

			.limit	= 250

		},

		.mr_cache[1]	= {

			.size	= 500,

			.limit	= 250

		},

		.mr_cache[2]	= {

			.size	= 500,

			.limit	= 250

		},

		.mr_cache[3]	= {

			.size	= 500,

			.limit	= 250

		},

		.mr_cache[4]	= {

			.size	= 500,

			.limit	= 250

		},

		.mr_cache[5]	= {

			.size	= 500,

			.limit	= 250

		},

		.mr_cache[6]	= {

			.size	= 500,

			.limit	= 250

		},

		.mr_cache[7]	= {

			.size	= 500,

			.limit	= 250

		},

		.mr_cache[8]	= {

			.size	= 500,

			.limit	= 250

		},

		.mr_cache[9]	= {

			.size	= 500,

			.limit	= 250

		},

		.mr_cache[10]	= {

			.size	= 500,

			.limit	= 250

		},

		.mr_cache[11]	= {

			.size	= 500,

			.limit	= 250

		},

		.mr_cache[12]	= {

			.size	= 64,

			.limit	= 32

		},

		.mr_cache[13]	= {

			.size	= 32,

			.limit	= 16

		},

		.mr_cache[14]	= {

			.size	= 16,

			.limit	= 8

		},

		.mr_cache[15]	= {

			.size	= 8,

			.limit	= 4

		},

	},

};



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_table *table = &dev->mdev->priv.eq_table;

	struct mlx5_eq *eq, *n;

	int err = -ENOENT;
@@ -163,7 +84,7 @@ int mlx5_vector2eqn(struct mlx5_ib_dev *dev, int vector, int *eqn, int *irqn) 


static int alloc_comp_eqs(struct mlx5_ib_dev *dev)

{

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

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

	char name[MLX5_MAX_EQ_NAME];

	struct mlx5_eq *eq, *n;

	int ncomp_vec;
@@ -182,9 +103,9 @@ static int alloc_comp_eqs(struct mlx5_ib_dev *dev) 
		}



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

		err = mlx5_create_map_eq(&dev->mdev, eq,

		err = mlx5_create_map_eq(dev->mdev, eq,

					 i + MLX5_EQ_VEC_COMP_BASE, nent, 0,

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

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

		if (err) {

			kfree(eq);

			goto clean;
@@ -204,7 +125,7 @@ clean: 
	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))

		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);
@@ -215,14 +136,14 @@ clean: 


static void free_comp_eqs(struct mlx5_ib_dev *dev)

{

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

	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))

		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);
@@ -255,14 +176,14 @@ static int mlx5_ib_query_device(struct ib_device *ibdev, 


	memset(props, 0, sizeof(*props));



	props->fw_ver = ((u64)fw_rev_maj(&dev->mdev) << 32) |

		(fw_rev_min(&dev->mdev) << 16) |

		fw_rev_sub(&dev->mdev);

	props->fw_ver = ((u64)fw_rev_maj(dev->mdev) << 32) |

		(fw_rev_min(dev->mdev) << 16) |

		fw_rev_sub(dev->mdev);

	props->device_cap_flags    = IB_DEVICE_CHANGE_PHY_PORT |

		IB_DEVICE_PORT_ACTIVE_EVENT		|

		IB_DEVICE_SYS_IMAGE_GUID		|

		IB_DEVICE_RC_RNR_NAK_GEN;

	flags = dev->mdev.caps.flags;

	flags = dev->mdev->caps.flags;

	if (flags & MLX5_DEV_CAP_FLAG_BAD_PKEY_CNTR)

		props->device_cap_flags |= IB_DEVICE_BAD_PKEY_CNTR;

	if (flags & MLX5_DEV_CAP_FLAG_BAD_QKEY_CNTR)
@@ -292,30 +213,30 @@ static int mlx5_ib_query_device(struct ib_device *ibdev, 
	memcpy(&props->sys_image_guid, out_mad->data +	4, 8);



	props->max_mr_size	   = ~0ull;

	props->page_size_cap	   = dev->mdev.caps.min_page_sz;

	props->max_qp		   = 1 << dev->mdev.caps.log_max_qp;

	props->max_qp_wr	   = dev->mdev.caps.max_wqes;

	max_rq_sg = dev->mdev.caps.max_rq_desc_sz / sizeof(struct mlx5_wqe_data_seg);

	max_sq_sg = (dev->mdev.caps.max_sq_desc_sz - sizeof(struct mlx5_wqe_ctrl_seg)) /

	props->page_size_cap	   = dev->mdev->caps.min_page_sz;

	props->max_qp		   = 1 << dev->mdev->caps.log_max_qp;

	props->max_qp_wr	   = dev->mdev->caps.max_wqes;

	max_rq_sg = dev->mdev->caps.max_rq_desc_sz / sizeof(struct mlx5_wqe_data_seg);

	max_sq_sg = (dev->mdev->caps.max_sq_desc_sz - sizeof(struct mlx5_wqe_ctrl_seg)) /

		sizeof(struct mlx5_wqe_data_seg);

	props->max_sge = min(max_rq_sg, max_sq_sg);

	props->max_cq		   = 1 << dev->mdev.caps.log_max_cq;

	props->max_cqe		   = dev->mdev.caps.max_cqes - 1;

	props->max_mr		   = 1 << dev->mdev.caps.log_max_mkey;

	props->max_pd		   = 1 << dev->mdev.caps.log_max_pd;

	props->max_qp_rd_atom	   = dev->mdev.caps.max_ra_req_qp;

	props->max_qp_init_rd_atom = dev->mdev.caps.max_ra_res_qp;

	props->max_cq		   = 1 << dev->mdev->caps.log_max_cq;

	props->max_cqe		   = dev->mdev->caps.max_cqes - 1;

	props->max_mr		   = 1 << dev->mdev->caps.log_max_mkey;

	props->max_pd		   = 1 << dev->mdev->caps.log_max_pd;

	props->max_qp_rd_atom	   = dev->mdev->caps.max_ra_req_qp;

	props->max_qp_init_rd_atom = dev->mdev->caps.max_ra_res_qp;

	props->max_res_rd_atom	   = props->max_qp_rd_atom * props->max_qp;

	props->max_srq		   = 1 << dev->mdev.caps.log_max_srq;

	props->max_srq_wr	   = dev->mdev.caps.max_srq_wqes - 1;

	props->max_srq		   = 1 << dev->mdev->caps.log_max_srq;

	props->max_srq_wr	   = dev->mdev->caps.max_srq_wqes - 1;

	props->max_srq_sge	   = max_rq_sg - 1;

	props->max_fast_reg_page_list_len = (unsigned int)-1;

	props->local_ca_ack_delay  = dev->mdev.caps.local_ca_ack_delay;

	props->local_ca_ack_delay  = dev->mdev->caps.local_ca_ack_delay;

	props->atomic_cap	   = IB_ATOMIC_NONE;

	props->masked_atomic_cap   = IB_ATOMIC_NONE;

	props->max_pkeys	   = be16_to_cpup((__be16 *)(out_mad->data + 28));

	props->max_mcast_grp	   = 1 << dev->mdev.caps.log_max_mcg;

	props->max_mcast_qp_attach = dev->mdev.caps.max_qp_mcg;

	props->max_mcast_grp	   = 1 << dev->mdev->caps.log_max_mcg;

	props->max_mcast_qp_attach = dev->mdev->caps.max_qp_mcg;

	props->max_total_mcast_qp_attach = props->max_mcast_qp_attach *

					   props->max_mcast_grp;

	props->max_map_per_fmr = INT_MAX; /* no limit in ConnectIB */
@@ -336,7 +257,7 @@ int mlx5_ib_query_port(struct ib_device *ibdev, u8 port, 
	int ext_active_speed;

	int err = -ENOMEM;



	if (port < 1 || port > dev->mdev.caps.num_ports) {

	if (port < 1 || port > dev->mdev->caps.num_ports) {

		mlx5_ib_warn(dev, "invalid port number %d\n", port);

		return -EINVAL;

	}
@@ -367,8 +288,8 @@ int mlx5_ib_query_port(struct ib_device *ibdev, u8 port, 
	props->phys_state	= out_mad->data[33] >> 4;

	props->port_cap_flags	= be32_to_cpup((__be32 *)(out_mad->data + 20));

	props->gid_tbl_len	= out_mad->data[50];

	props->max_msg_sz	= 1 << to_mdev(ibdev)->mdev.caps.log_max_msg;

	props->pkey_tbl_len	= to_mdev(ibdev)->mdev.caps.port[port - 1].pkey_table_len;

	props->max_msg_sz	= 1 << to_mdev(ibdev)->mdev->caps.log_max_msg;

	props->pkey_tbl_len	= to_mdev(ibdev)->mdev->caps.port[port - 1].pkey_table_len;

	props->bad_pkey_cntr	= be16_to_cpup((__be16 *)(out_mad->data + 46));

	props->qkey_viol_cntr	= be16_to_cpup((__be16 *)(out_mad->data + 48));

	props->active_width	= out_mad->data[31] & 0xf;
@@ -395,7 +316,7 @@ int mlx5_ib_query_port(struct ib_device *ibdev, u8 port, 


	/* If reported active speed is QDR, check if is FDR-10 */

	if (props->active_speed == 4) {

		if (dev->mdev.caps.ext_port_cap[port - 1] &

		if (dev->mdev->caps.ext_port_cap[port - 1] &

		    MLX_EXT_PORT_CAP_FLAG_EXTENDED_PORT_INFO) {

			init_query_mad(in_mad);

			in_mad->attr_id = MLX5_ATTR_EXTENDED_PORT_INFO;
@@ -508,7 +429,7 @@ static int mlx5_ib_modify_device(struct ib_device *ibdev, int mask, 
	 * a 144 trap.  If cmd fails, just ignore.

	 */

	memcpy(&in, props->node_desc, 64);

	err = mlx5_core_access_reg(&dev->mdev, &in, sizeof(in), &out,

	err = mlx5_core_access_reg(dev->mdev, &in, sizeof(in), &out,

				   sizeof(out), MLX5_REG_NODE_DESC, 0, 1);

	if (err)

		return err;
@@ -535,7 +456,7 @@ static int mlx5_ib_modify_port(struct ib_device *ibdev, u8 port, int mask, 
	tmp = (attr.port_cap_flags | props->set_port_cap_mask) &

		~props->clr_port_cap_mask;



	err = mlx5_set_port_caps(&dev->mdev, port, tmp);

	err = mlx5_set_port_caps(dev->mdev, port, tmp);



out:

	mutex_unlock(&dev->cap_mask_mutex);
@@ -557,7 +478,7 @@ static struct ib_ucontext *mlx5_ib_alloc_ucontext(struct ib_device *ibdev, 
	int uuarn;

	int err;

	int i;

	int reqlen;

	size_t reqlen;



	if (!dev->ib_active)

		return ERR_PTR(-EAGAIN);
@@ -591,14 +512,14 @@ static struct ib_ucontext *mlx5_ib_alloc_ucontext(struct ib_device *ibdev, 


	num_uars = req.total_num_uuars / MLX5_NON_FP_BF_REGS_PER_PAGE;

	gross_uuars = num_uars * MLX5_BF_REGS_PER_PAGE;

	resp.qp_tab_size      = 1 << dev->mdev.caps.log_max_qp;

	resp.bf_reg_size      = dev->mdev.caps.bf_reg_size;

	resp.qp_tab_size      = 1 << dev->mdev->caps.log_max_qp;

	resp.bf_reg_size      = dev->mdev->caps.bf_reg_size;

	resp.cache_line_size  = L1_CACHE_BYTES;

	resp.max_sq_desc_sz = dev->mdev.caps.max_sq_desc_sz;

	resp.max_rq_desc_sz = dev->mdev.caps.max_rq_desc_sz;

	resp.max_send_wqebb = dev->mdev.caps.max_wqes;

	resp.max_recv_wr = dev->mdev.caps.max_wqes;

	resp.max_srq_recv_wr = dev->mdev.caps.max_srq_wqes;

	resp.max_sq_desc_sz = dev->mdev->caps.max_sq_desc_sz;

	resp.max_rq_desc_sz = dev->mdev->caps.max_rq_desc_sz;

	resp.max_send_wqebb = dev->mdev->caps.max_wqes;

	resp.max_recv_wr = dev->mdev->caps.max_wqes;

	resp.max_srq_recv_wr = dev->mdev->caps.max_srq_wqes;



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

	if (!context)
@@ -635,7 +556,7 @@ static struct ib_ucontext *mlx5_ib_alloc_ucontext(struct ib_device *ibdev, 
	}



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

		err = mlx5_cmd_alloc_uar(&dev->mdev, &uars[i].index);

		err = mlx5_cmd_alloc_uar(dev->mdev, &uars[i].index);

		if (err)

			goto out_count;

	}
@@ -644,7 +565,7 @@ static struct ib_ucontext *mlx5_ib_alloc_ucontext(struct ib_device *ibdev, 
	mutex_init(&context->db_page_mutex);



	resp.tot_uuars = req.total_num_uuars;

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

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

	err = ib_copy_to_udata(udata, &resp,

			       sizeof(resp) - sizeof(resp.reserved));

	if (err)
@@ -658,7 +579,7 @@ static struct ib_ucontext *mlx5_ib_alloc_ucontext(struct ib_device *ibdev, 


out_uars:

	for (i--; i >= 0; i--)

		mlx5_cmd_free_uar(&dev->mdev, uars[i].index);

		mlx5_cmd_free_uar(dev->mdev, uars[i].index);

out_count:

	kfree(uuari->count);
@@ -681,7 +602,7 @@ static int mlx5_ib_dealloc_ucontext(struct ib_ucontext *ibcontext) 
	int i;



	for (i = 0; i < uuari->num_uars; i++) {

		if (mlx5_cmd_free_uar(&dev->mdev, uuari->uars[i].index))

		if (mlx5_cmd_free_uar(dev->mdev, uuari->uars[i].index))

			mlx5_ib_warn(dev, "failed to free UAR 0x%x\n", uuari->uars[i].index);

	}
@@ -695,7 +616,7 @@ static int mlx5_ib_dealloc_ucontext(struct ib_ucontext *ibcontext) 


static phys_addr_t uar_index2pfn(struct mlx5_ib_dev *dev, int index)

{

	return (pci_resource_start(dev->mdev.pdev, 0) >> PAGE_SHIFT) + index;

	return (pci_resource_start(dev->mdev->pdev, 0) >> PAGE_SHIFT) + index;

}



static int get_command(unsigned long offset)
@@ -773,7 +694,7 @@ static int alloc_pa_mkey(struct mlx5_ib_dev *dev, u32 *key, u32 pdn) 
	seg->qpn_mkey7_0 = cpu_to_be32(0xffffff << 8);

	seg->start_addr = 0;



	err = mlx5_core_create_mkey(&dev->mdev, &mr, in, sizeof(*in),

	err = mlx5_core_create_mkey(dev->mdev, &mr, in, sizeof(*in),

				    NULL, NULL, NULL);

	if (err) {

		mlx5_ib_warn(dev, "failed to create mkey, %d\n", err);
@@ -798,7 +719,7 @@ static void free_pa_mkey(struct mlx5_ib_dev *dev, u32 key) 


	memset(&mr, 0, sizeof(mr));

	mr.key = key;

	err = mlx5_core_destroy_mkey(&dev->mdev, &mr);

	err = mlx5_core_destroy_mkey(dev->mdev, &mr);

	if (err)

		mlx5_ib_warn(dev, "failed to destroy mkey 0x%x\n", key);

}
@@ -815,7 +736,7 @@ static struct ib_pd *mlx5_ib_alloc_pd(struct ib_device *ibdev, 
	if (!pd)

		return ERR_PTR(-ENOMEM);



	err = mlx5_core_alloc_pd(&to_mdev(ibdev)->mdev, &pd->pdn);

	err = mlx5_core_alloc_pd(to_mdev(ibdev)->mdev, &pd->pdn);

	if (err) {

		kfree(pd);

		return ERR_PTR(err);
@@ -824,14 +745,14 @@ static struct ib_pd *mlx5_ib_alloc_pd(struct ib_device *ibdev, 
	if (context) {

		resp.pdn = pd->pdn;

		if (ib_copy_to_udata(udata, &resp, sizeof(resp))) {

			mlx5_core_dealloc_pd(&to_mdev(ibdev)->mdev, pd->pdn);

			mlx5_core_dealloc_pd(to_mdev(ibdev)->mdev, pd->pdn);

			kfree(pd);

			return ERR_PTR(-EFAULT);

		}

	} else {

		err = alloc_pa_mkey(to_mdev(ibdev), &pd->pa_lkey, pd->pdn);

		if (err) {

			mlx5_core_dealloc_pd(&to_mdev(ibdev)->mdev, pd->pdn);

			mlx5_core_dealloc_pd(to_mdev(ibdev)->mdev, pd->pdn);

			kfree(pd);

			return ERR_PTR(err);

		}
@@ -848,7 +769,7 @@ static int mlx5_ib_dealloc_pd(struct ib_pd *pd) 
	if (!pd->uobject)

		free_pa_mkey(mdev, mpd->pa_lkey);



	mlx5_core_dealloc_pd(&mdev->mdev, mpd->pdn);

	mlx5_core_dealloc_pd(mdev->mdev, mpd->pdn);

	kfree(mpd);



	return 0;
@@ -859,7 +780,7 @@ static int mlx5_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) 
	struct mlx5_ib_dev *dev = to_mdev(ibqp->device);

	int err;



	err = mlx5_core_attach_mcg(&dev->mdev, gid, ibqp->qp_num);

	err = mlx5_core_attach_mcg(dev->mdev, gid, ibqp->qp_num);

	if (err)

		mlx5_ib_warn(dev, "failed attaching QPN 0x%x, MGID %pI6\n",

			     ibqp->qp_num, gid->raw);
@@ -872,7 +793,7 @@ static int mlx5_ib_mcg_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) 
	struct mlx5_ib_dev *dev = to_mdev(ibqp->device);

	int err;



	err = mlx5_core_detach_mcg(&dev->mdev, gid, ibqp->qp_num);

	err = mlx5_core_detach_mcg(dev->mdev, gid, ibqp->qp_num);

	if (err)

		mlx5_ib_warn(dev, "failed detaching QPN 0x%x, MGID %pI6\n",

			     ibqp->qp_num, gid->raw);
@@ -906,7 +827,7 @@ static int init_node_data(struct mlx5_ib_dev *dev) 
	if (err)

		goto out;



	dev->mdev.rev_id = be32_to_cpup((__be32 *)(out_mad->data + 32));

	dev->mdev->rev_id = be32_to_cpup((__be32 *)(out_mad->data + 32));

	memcpy(&dev->ib_dev.node_guid, out_mad->data + 12, 8);



out:
@@ -921,7 +842,7 @@ static ssize_t show_fw_pages(struct device *device, struct device_attribute *att 
	struct mlx5_ib_dev *dev =

		container_of(device, struct mlx5_ib_dev, ib_dev.dev);



	return sprintf(buf, "%d\n", dev->mdev.priv.fw_pages);

	return sprintf(buf, "%d\n", dev->mdev->priv.fw_pages);

}



static ssize_t show_reg_pages(struct device *device,
@@ -930,7 +851,7 @@ static ssize_t show_reg_pages(struct device *device, 
	struct mlx5_ib_dev *dev =

		container_of(device, struct mlx5_ib_dev, ib_dev.dev);



	return sprintf(buf, "%d\n", dev->mdev.priv.reg_pages);

	return sprintf(buf, "%d\n", dev->mdev->priv.reg_pages);

}



static ssize_t show_hca(struct device *device, struct device_attribute *attr,
@@ -938,7 +859,7 @@ static ssize_t show_hca(struct device *device, struct device_attribute *attr, 
{

	struct mlx5_ib_dev *dev =

		container_of(device, struct mlx5_ib_dev, ib_dev.dev);

	return sprintf(buf, "MT%d\n", dev->mdev.pdev->device);

	return sprintf(buf, "MT%d\n", dev->mdev->pdev->device);

}



static ssize_t show_fw_ver(struct device *device, struct device_attribute *attr,
@@ -946,8 +867,8 @@ static ssize_t show_fw_ver(struct device *device, struct device_attribute *attr, 
{

	struct mlx5_ib_dev *dev =

		container_of(device, struct mlx5_ib_dev, ib_dev.dev);

	return sprintf(buf, "%d.%d.%d\n", fw_rev_maj(&dev->mdev),

		       fw_rev_min(&dev->mdev), fw_rev_sub(&dev->mdev));

	return sprintf(buf, "%d.%d.%d\n", fw_rev_maj(dev->mdev),

		       fw_rev_min(dev->mdev), fw_rev_sub(dev->mdev));

}



static ssize_t show_rev(struct device *device, struct device_attribute *attr,
@@ -955,7 +876,7 @@ static ssize_t show_rev(struct device *device, struct device_attribute *attr, 
{

	struct mlx5_ib_dev *dev =

		container_of(device, struct mlx5_ib_dev, ib_dev.dev);

	return sprintf(buf, "%x\n", dev->mdev.rev_id);

	return sprintf(buf, "%x\n", dev->mdev->rev_id);

}



static ssize_t show_board(struct device *device, struct device_attribute *attr,
@@ -964,7 +885,7 @@ static ssize_t show_board(struct device *device, struct device_attribute *attr, 
	struct mlx5_ib_dev *dev =

		container_of(device, struct mlx5_ib_dev, ib_dev.dev);

	return sprintf(buf, "%.*s\n", MLX5_BOARD_ID_LEN,

		       dev->mdev.board_id);

		       dev->mdev->board_id);

}



static DEVICE_ATTR(hw_rev,   S_IRUGO, show_rev,    NULL);
@@ -983,11 +904,12 @@ static struct device_attribute *mlx5_class_attributes[] = { 
	&dev_attr_reg_pages,

};



static void mlx5_ib_event(struct mlx5_core_dev *dev, enum mlx5_dev_event event,

			  void *data)

static void mlx5_ib_event(struct mlx5_core_dev *dev, void *context,

			  enum mlx5_dev_event event, unsigned long param)

{

	struct mlx5_ib_dev *ibdev = container_of(dev, struct mlx5_ib_dev, mdev);

	struct mlx5_ib_dev *ibdev = (struct mlx5_ib_dev *)context;

	struct ib_event ibev;



	u8 port = 0;



	switch (event) {
@@ -998,12 +920,12 @@ static void mlx5_ib_event(struct mlx5_core_dev *dev, enum mlx5_dev_event event, 


	case MLX5_DEV_EVENT_PORT_UP:

		ibev.event = IB_EVENT_PORT_ACTIVE;

		port = *(u8 *)data;

		port = (u8)param;

		break;



	case MLX5_DEV_EVENT_PORT_DOWN:

		ibev.event = IB_EVENT_PORT_ERR;

		port = *(u8 *)data;

		port = (u8)param;

		break;



	case MLX5_DEV_EVENT_PORT_INITIALIZED:
@@ -1012,22 +934,22 @@ static void mlx5_ib_event(struct mlx5_core_dev *dev, enum mlx5_dev_event event, 


	case MLX5_DEV_EVENT_LID_CHANGE:

		ibev.event = IB_EVENT_LID_CHANGE;

		port = *(u8 *)data;

		port = (u8)param;

		break;



	case MLX5_DEV_EVENT_PKEY_CHANGE:

		ibev.event = IB_EVENT_PKEY_CHANGE;

		port = *(u8 *)data;

		port = (u8)param;

		break;



	case MLX5_DEV_EVENT_GUID_CHANGE:

		ibev.event = IB_EVENT_GID_CHANGE;

		port = *(u8 *)data;

		port = (u8)param;

		break;



	case MLX5_DEV_EVENT_CLIENT_REREG:

		ibev.event = IB_EVENT_CLIENT_REREGISTER;

		port = *(u8 *)data;

		port = (u8)param;

		break;

	}
@@ -1047,7 +969,7 @@ static void get_ext_port_caps(struct mlx5_ib_dev *dev) 
{

	int port;



	for (port = 1; port <= dev->mdev.caps.num_ports; port++)

	for (port = 1; port <= dev->mdev->caps.num_ports; port++)

		mlx5_query_ext_port_caps(dev, port);

}
@@ -1072,14 +994,14 @@ static int get_port_caps(struct mlx5_ib_dev *dev) 
		goto out;

	}



	for (port = 1; port <= dev->mdev.caps.num_ports; port++) {

	for (port = 1; port <= dev->mdev->caps.num_ports; port++) {

		err = mlx5_ib_query_port(&dev->ib_dev, port, pprops);

		if (err) {

			mlx5_ib_warn(dev, "query_port %d failed %d\n", port, err);

			break;

		}

		dev->mdev.caps.port[port - 1].pkey_table_len = dprops->max_pkeys;

		dev->mdev.caps.port[port - 1].gid_table_len = pprops->gid_tbl_len;

		dev->mdev->caps.port[port - 1].pkey_table_len = dprops->max_pkeys;

		dev->mdev->caps.port[port - 1].gid_table_len = pprops->gid_tbl_len;

		mlx5_ib_dbg(dev, "pkey_table_len %d, gid_table_len %d\n",

			    dprops->max_pkeys, pprops->gid_tbl_len);

	}
@@ -1328,10 +1250,8 @@ static void destroy_dev_resources(struct mlx5_ib_resources *devr) 
	mlx5_ib_dealloc_pd(devr->p0);

}



static int init_one(struct pci_dev *pdev,

		    const struct pci_device_id *id)

static void *mlx5_ib_add(struct mlx5_core_dev *mdev)

{

	struct mlx5_core_dev *mdev;

	struct mlx5_ib_dev *dev;

	int err;

	int i;
@@ -1340,28 +1260,19 @@ static int init_one(struct pci_dev *pdev, 


	dev = (struct mlx5_ib_dev *)ib_alloc_device(sizeof(*dev));

	if (!dev)

		return -ENOMEM;

		return NULL;



	mdev = &dev->mdev;

	mdev->event = mlx5_ib_event;

	if (prof_sel >= ARRAY_SIZE(profile)) {

		pr_warn("selected pofile out of range, selceting default\n");

		prof_sel = 0;

	}

	mdev->profile = &profile[prof_sel];

	err = mlx5_dev_init(mdev, pdev);

	if (err)

		goto err_free;

	dev->mdev = mdev;



	err = get_port_caps(dev);

	if (err)

		goto err_cleanup;

		goto err_dealloc;



	get_ext_port_caps(dev);



	err = alloc_comp_eqs(dev);

	if (err)

		goto err_cleanup;

		goto err_dealloc;



	MLX5_INIT_DOORBELL_LOCK(&dev->uar_lock);
@@ -1480,7 +1391,7 @@ static int init_one(struct pci_dev *pdev, 


	dev->ib_active = true;



	return 0;

	return dev;



err_umrc:

	destroy_umrc_res(dev);
@@ -1494,49 +1405,39 @@ err_rsrc: 
err_eqs:

	free_comp_eqs(dev);



err_cleanup:

	mlx5_dev_cleanup(mdev);



err_free:

err_dealloc:

	ib_dealloc_device((struct ib_device *)dev);



	return err;

	return NULL;

}



static void remove_one(struct pci_dev *pdev)

static void mlx5_ib_remove(struct mlx5_core_dev *mdev, void *context)

{

	struct mlx5_ib_dev *dev = mlx5_pci2ibdev(pdev);



	struct mlx5_ib_dev *dev = context;

	destroy_umrc_res(dev);

	ib_unregister_device(&dev->ib_dev);

	destroy_dev_resources(&dev->devr);

	free_comp_eqs(dev);

	mlx5_dev_cleanup(&dev->mdev);

	ib_dealloc_device(&dev->ib_dev);

}



static DEFINE_PCI_DEVICE_TABLE(mlx5_ib_pci_table) = {

	{ PCI_VDEVICE(MELLANOX, 4113) }, /* MT4113 Connect-IB */

	{ 0, }

};



MODULE_DEVICE_TABLE(pci, mlx5_ib_pci_table);



static struct pci_driver mlx5_ib_driver = {

	.name		= DRIVER_NAME,

	.id_table	= mlx5_ib_pci_table,

	.probe		= init_one,

	.remove		= remove_one

static struct mlx5_interface mlx5_ib_interface = {

	.add            = mlx5_ib_add,

	.remove         = mlx5_ib_remove,

	.event          = mlx5_ib_event,

};



static int __init mlx5_ib_init(void)

{

	return pci_register_driver(&mlx5_ib_driver);

	if (deprecated_prof_sel != 2)

		pr_warn("prof_sel is deprecated for mlx5_ib, set it for mlx5_core\n");



	return mlx5_register_interface(&mlx5_ib_interface);

}



static void __exit mlx5_ib_cleanup(void)

{

	pci_unregister_driver(&mlx5_ib_driver);

	mlx5_unregister_interface(&mlx5_ib_interface);

}



module_init(mlx5_ib_init);

drivers/infiniband/hw/mlx5/mem.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ int mlx5_ib_get_buf_offset(u64 addr, int page_shift, u32 *offset) 
	u64 off_mask;

	u64 buf_off;



	page_size = 1 << page_shift;

	page_size = (u64)1 << page_shift;

	page_mask = page_size - 1;

	buf_off = addr & page_mask;

	off_size = page_size >> 6;

CRA Git | Maintained and supported by SUSTech CRA and CCSE