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

Commit 1583676d authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'cma', 'misc', 'mlx4', 'nes', 'qib' and 'uverbs' into for-next

parents c89d1bed 6f233d30 9106c410 196f40c8 8d4548f2 e214a0fe

drivers/infiniband/core/cm_msgs.h

+1 −0
Original line number Diff line number Diff line
@@ -799,6 +799,7 @@ struct cm_apr_msg { 


	u8 info_length;

	u8 ap_status;

	__be16 rsvd;

	u8 info[IB_CM_APR_INFO_LENGTH];



	u8 private_data[IB_CM_APR_PRIVATE_DATA_SIZE];

drivers/infiniband/core/uverbs_cmd.c

+17 −4
Original line number Diff line number Diff line
@@ -241,11 +241,24 @@ static struct ib_qp *idr_read_qp(int qp_handle, struct ib_ucontext *context) 
	return idr_read_obj(&ib_uverbs_qp_idr, qp_handle, context, 0);

}



static struct ib_qp *idr_write_qp(int qp_handle, struct ib_ucontext *context)

{

	struct ib_uobject *uobj;



	uobj = idr_write_uobj(&ib_uverbs_qp_idr, qp_handle, context);

	return uobj ? uobj->object : NULL;

}



static void put_qp_read(struct ib_qp *qp)

{

	put_uobj_read(qp->uobject);

}



static void put_qp_write(struct ib_qp *qp)

{

	put_uobj_write(qp->uobject);

}



static struct ib_srq *idr_read_srq(int srq_handle, struct ib_ucontext *context)

{

	return idr_read_obj(&ib_uverbs_srq_idr, srq_handle, context, 0);
@@ -2375,7 +2388,7 @@ ssize_t ib_uverbs_attach_mcast(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof cmd))

		return -EFAULT;



	qp = idr_read_qp(cmd.qp_handle, file->ucontext);

	qp = idr_write_qp(cmd.qp_handle, file->ucontext);

	if (!qp)

		return -EINVAL;
@@ -2404,7 +2417,7 @@ ssize_t ib_uverbs_attach_mcast(struct ib_uverbs_file *file, 
		kfree(mcast);



out_put:

	put_qp_read(qp);

	put_qp_write(qp);



	return ret ? ret : in_len;

}
@@ -2422,7 +2435,7 @@ ssize_t ib_uverbs_detach_mcast(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof cmd))

		return -EFAULT;



	qp = idr_read_qp(cmd.qp_handle, file->ucontext);

	qp = idr_write_qp(cmd.qp_handle, file->ucontext);

	if (!qp)

		return -EINVAL;
@@ -2441,7 +2454,7 @@ ssize_t ib_uverbs_detach_mcast(struct ib_uverbs_file *file, 
		}



out_put:

	put_qp_read(qp);

	put_qp_write(qp);



	return ret ? ret : in_len;

}

drivers/infiniband/hw/mlx4/ah.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static struct ib_ah *create_iboe_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr 
		ah->av.ib.dlid = cpu_to_be16(0xc000);



	memcpy(ah->av.eth.dgid, ah_attr->grh.dgid.raw, 16);

	ah->av.eth.sl_tclass_flowlabel = cpu_to_be32(ah_attr->sl << 28);

	ah->av.eth.sl_tclass_flowlabel = cpu_to_be32(ah_attr->sl << 29);



	return &ah->ibah;

}

drivers/infiniband/hw/mlx4/cq.c

+5 −1
Original line number Diff line number Diff line
@@ -715,13 +715,17 @@ repoll: 
		}



		wc->slid	   = be16_to_cpu(cqe->rlid);

		wc->sl		   = be16_to_cpu(cqe->sl_vid) >> 12;

		g_mlpath_rqpn	   = be32_to_cpu(cqe->g_mlpath_rqpn);

		wc->src_qp	   = g_mlpath_rqpn & 0xffffff;

		wc->dlid_path_bits = (g_mlpath_rqpn >> 24) & 0x7f;

		wc->wc_flags	  |= g_mlpath_rqpn & 0x80000000 ? IB_WC_GRH : 0;

		wc->pkey_index     = be32_to_cpu(cqe->immed_rss_invalid) & 0x7f;

		wc->csum_ok	   = mlx4_ib_ipoib_csum_ok(cqe->status, cqe->checksum);

		if (rdma_port_get_link_layer(wc->qp->device,

				(*cur_qp)->port) == IB_LINK_LAYER_ETHERNET)

			wc->sl  = be16_to_cpu(cqe->sl_vid) >> 13;

		else

			wc->sl  = be16_to_cpu(cqe->sl_vid) >> 12;

	}



	return 0;

drivers/infiniband/hw/mlx4/qp.c

+2 −2
Original line number Diff line number Diff line
@@ -962,7 +962,7 @@ static int mlx4_set_path(struct mlx4_ib_dev *dev, const struct ib_ah_attr *ah, 


	if (is_eth) {

		path->sched_queue = MLX4_IB_DEFAULT_SCHED_QUEUE |

			((port - 1) << 6) | ((ah->sl & 7) << 3) | ((ah->sl & 8) >> 1);

			((port - 1) << 6) | ((ah->sl & 7) << 3);



		if (!(ah->ah_flags & IB_AH_GRH))

			return -1;
@@ -1437,7 +1437,7 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_send_wr *wr, 
			u16 pcp;



			sqp->ud_header.vlan.type = cpu_to_be16(MLX4_IB_IBOE_ETHERTYPE);

			pcp = (be32_to_cpu(ah->av.ib.sl_tclass_flowlabel) >> 27 & 3) << 13;

			pcp = (be32_to_cpu(ah->av.ib.sl_tclass_flowlabel) >> 29) << 13;

			sqp->ud_header.vlan.tag = cpu_to_be16(vlan | pcp);

		}

	} else {