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

Commit 569935db authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'cma', 'cxgb3', 'cxgb4', 'ipoib', 'misc', 'mlx4', 'mlx5',... 

Merge branches 'cma', 'cxgb3', 'cxgb4', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma' and 'qib' into for-next
parents 5eb695c1 246fcdbc ae1fe07f c2904141 ef5ed416 3eac103f 618af384 3c93f039 63ea3749 b268e4db

drivers/infiniband/core/mad.c

+7 −1
Original line number Diff line number Diff line
@@ -2663,6 +2663,7 @@ static int ib_mad_port_start(struct ib_mad_port_private *port_priv) 
	int ret, i;

	struct ib_qp_attr *attr;

	struct ib_qp *qp;

	u16 pkey_index;



	attr = kmalloc(sizeof *attr, GFP_KERNEL);

	if (!attr) {
@@ -2670,6 +2671,11 @@ static int ib_mad_port_start(struct ib_mad_port_private *port_priv) 
		return -ENOMEM;

	}



	ret = ib_find_pkey(port_priv->device, port_priv->port_num,

			   IB_DEFAULT_PKEY_FULL, &pkey_index);

	if (ret)

		pkey_index = 0;



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

		qp = port_priv->qp_info[i].qp;

		if (!qp)
@@ -2680,7 +2686,7 @@ static int ib_mad_port_start(struct ib_mad_port_private *port_priv) 
		 * one is needed for the Reset to Init transition

		 */

		attr->qp_state = IB_QPS_INIT;

		attr->pkey_index = 0;

		attr->pkey_index = pkey_index;

		attr->qkey = (qp->qp_num == 0) ? 0 : IB_QP1_QKEY;

		ret = ib_modify_qp(qp, attr, IB_QP_STATE |

					     IB_QP_PKEY_INDEX | IB_QP_QKEY);

drivers/infiniband/hw/cxgb3/iwch_provider.c

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ static struct ib_cq *iwch_create_cq(struct ib_device *ibdev, int entries, int ve 
			mm->len = PAGE_ALIGN(((1UL << uresp.size_log2) + 1) *

					     sizeof(struct t3_cqe));

			uresp.memsize = mm->len;

			uresp.reserved = 0;

			resplen = sizeof uresp;

		}

		if (ib_copy_to_udata(udata, &uresp, resplen)) {

drivers/infiniband/hw/cxgb4/qp.c

+2 −0
Original line number Diff line number Diff line
@@ -1657,6 +1657,8 @@ struct ib_qp *c4iw_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attrs, 
		if (mm5) {

			uresp.ma_sync_key = ucontext->key;

			ucontext->key += PAGE_SIZE;

		} else {

			uresp.ma_sync_key =  0;

		}

		uresp.sq_key = ucontext->key;

		ucontext->key += PAGE_SIZE;

drivers/infiniband/hw/mlx4/mad.c

+8 −2
Original line number Diff line number Diff line
@@ -1511,6 +1511,12 @@ static int create_pv_sqp(struct mlx4_ib_demux_pv_ctx *ctx, 


	memset(&attr, 0, sizeof attr);

	attr.qp_state = IB_QPS_INIT;

	ret = 0;

	if (create_tun)

		ret = find_slave_port_pkey_ix(to_mdev(ctx->ib_dev), ctx->slave,

					      ctx->port, IB_DEFAULT_PKEY_FULL,

					      &attr.pkey_index);

	if (ret || !create_tun)

		attr.pkey_index =

			to_mdev(ctx->ib_dev)->pkeys.virt2phys_pkey[ctx->slave][ctx->port - 1][0];

	attr.qkey = IB_QP1_QKEY;

drivers/infiniband/hw/mlx5/main.c

+7 −4
Original line number Diff line number Diff line
@@ -619,7 +619,8 @@ static struct ib_ucontext *mlx5_ib_alloc_ucontext(struct ib_device *ibdev, 


	resp.tot_uuars = req.total_num_uuars;

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

	err = ib_copy_to_udata(udata, &resp, sizeof(resp));

	err = ib_copy_to_udata(udata, &resp,

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

	if (err)

		goto out_uars;
@@ -1426,7 +1427,8 @@ static int init_one(struct pci_dev *pdev, 
	if (err)

		goto err_eqs;



	if (ib_register_device(&dev->ib_dev, NULL))

	err = ib_register_device(&dev->ib_dev, NULL);

	if (err)

		goto err_rsrc;



	err = create_umr_res(dev);
@@ -1434,8 +1436,9 @@ static int init_one(struct pci_dev *pdev, 
		goto err_dev;



	for (i = 0; i < ARRAY_SIZE(mlx5_class_attributes); i++) {

		if (device_create_file(&dev->ib_dev.dev,

				       mlx5_class_attributes[i]))

		err = device_create_file(&dev->ib_dev.dev,

					 mlx5_class_attributes[i]);

		if (err)

			goto err_umrc;

	}