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

Commit d90d4392 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

parents 6d67e34d 71eea47d

drivers/infiniband/core/user_mad.c

+3 −2
Original line number Diff line number Diff line
@@ -334,10 +334,11 @@ static ssize_t ib_umad_write(struct file *filp, const char __user *buf, 
			ret = -EINVAL;

			goto err_ah;

		}

		/* Validate that management class can support RMPP */



		/* Validate that the management class can support RMPP */

		if (rmpp_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_ADM) {

			hdr_len = offsetof(struct ib_sa_mad, data);

			data_len = length;

			data_len = length - hdr_len;

		} else if ((rmpp_mad->mad_hdr.mgmt_class >= IB_MGMT_CLASS_VENDOR_RANGE2_START) &&

			    (rmpp_mad->mad_hdr.mgmt_class <= IB_MGMT_CLASS_VENDOR_RANGE2_END)) {

				hdr_len = offsetof(struct ib_vendor_mad, data);

drivers/infiniband/hw/mthca/mthca_eq.c

+5 −11
Original line number Diff line number Diff line
@@ -476,12 +476,8 @@ static int __devinit mthca_create_eq(struct mthca_dev *dev, 
	int i;

	u8 status;



	/* Make sure EQ size is aligned to a power of 2 size. */

	for (i = 1; i < nent; i <<= 1)

		; /* nothing */

	nent = i;



	eq->dev  = dev;

	eq->nent = roundup_pow_of_two(max(nent, 2));



	eq->page_list = kmalloc(npages * sizeof *eq->page_list,

				GFP_KERNEL);
@@ -512,7 +508,7 @@ static int __devinit mthca_create_eq(struct mthca_dev *dev, 
		memset(eq->page_list[i].buf, 0, PAGE_SIZE);

	}



	for (i = 0; i < nent; ++i)

	for (i = 0; i < eq->nent; ++i)

		set_eqe_hw(get_eqe(eq, i));



	eq->eqn = mthca_alloc(&dev->eq_table.alloc);
@@ -528,8 +524,6 @@ static int __devinit mthca_create_eq(struct mthca_dev *dev, 
	if (err)

		goto err_out_free_eq;



	eq->nent = nent;



	memset(eq_context, 0, sizeof *eq_context);

	eq_context->flags           = cpu_to_be32(MTHCA_EQ_STATUS_OK   |

						  MTHCA_EQ_OWNER_HW    |
@@ -538,7 +532,7 @@ static int __devinit mthca_create_eq(struct mthca_dev *dev, 
	if (mthca_is_memfree(dev))

		eq_context->flags  |= cpu_to_be32(MTHCA_EQ_STATE_ARBEL);



	eq_context->logsize_usrpage = cpu_to_be32((ffs(nent) - 1) << 24);

	eq_context->logsize_usrpage = cpu_to_be32((ffs(eq->nent) - 1) << 24);

	if (mthca_is_memfree(dev)) {

		eq_context->arbel_pd = cpu_to_be32(dev->driver_pd.pd_num);

	} else {
@@ -569,7 +563,7 @@ static int __devinit mthca_create_eq(struct mthca_dev *dev, 
	dev->eq_table.arm_mask |= eq->eqn_mask;



	mthca_dbg(dev, "Allocated EQ %d with %d entries\n",

		  eq->eqn, nent);

		  eq->eqn, eq->nent);



	return err;

drivers/infiniband/hw/mthca/mthca_qp.c

+24 −27
Original line number Diff line number Diff line
@@ -227,7 +227,6 @@ static void mthca_wq_init(struct mthca_wq *wq) 
	wq->last_comp = wq->max - 1;

	wq->head      = 0;

	wq->tail      = 0;

	wq->last      = NULL;

}



void mthca_qp_event(struct mthca_dev *dev, u32 qpn,
@@ -687,7 +686,7 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask) 
	}



	if (attr_mask & IB_QP_TIMEOUT) {

		qp_context->pri_path.ackto = attr->timeout;

		qp_context->pri_path.ackto = attr->timeout << 3;

		qp_param->opt_param_mask |= cpu_to_be32(MTHCA_QP_OPTPAR_ACK_TIMEOUT);

	}
@@ -1103,6 +1102,9 @@ static int mthca_alloc_qp_common(struct mthca_dev *dev, 
		}

	}



	qp->sq.last = get_send_wqe(qp, qp->sq.max - 1);

	qp->rq.last = get_recv_wqe(qp, qp->rq.max - 1);



	return 0;

}
@@ -1583,7 +1585,6 @@ int mthca_tavor_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, 
			goto out;

		}



		if (prev_wqe) {

		((struct mthca_next_seg *) prev_wqe)->nda_op =

			cpu_to_be32(((ind << qp->sq.wqe_shift) +

				     qp->send_wqe_offset) |
@@ -1591,7 +1592,6 @@ int mthca_tavor_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, 
		wmb();

		((struct mthca_next_seg *) prev_wqe)->ee_nds =

			cpu_to_be32((size0 ? 0 : MTHCA_NEXT_DBD) | size);

		}



		if (!size0) {

			size0 = size;
@@ -1688,13 +1688,11 @@ int mthca_tavor_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr, 


		qp->wrid[ind] = wr->wr_id;



		if (likely(prev_wqe)) {

		((struct mthca_next_seg *) prev_wqe)->nda_op =

			cpu_to_be32((ind << qp->rq.wqe_shift) | 1);

		wmb();

		((struct mthca_next_seg *) prev_wqe)->ee_nds =

			cpu_to_be32(MTHCA_NEXT_DBD | size);

		}



		if (!size0)

			size0 = size;
@@ -1905,7 +1903,6 @@ int mthca_arbel_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, 
			goto out;

		}



		if (likely(prev_wqe)) {

		((struct mthca_next_seg *) prev_wqe)->nda_op =

			cpu_to_be32(((ind << qp->sq.wqe_shift) +

				     qp->send_wqe_offset) |
@@ -1913,7 +1910,6 @@ int mthca_arbel_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, 
		wmb();

		((struct mthca_next_seg *) prev_wqe)->ee_nds =

			cpu_to_be32(MTHCA_NEXT_DBD | size);

		}



		if (!size0) {

			size0 = size;
@@ -2127,5 +2123,6 @@ void __devexit mthca_cleanup_qp_table(struct mthca_dev *dev) 
	for (i = 0; i < 2; ++i)

		mthca_CONF_SPECIAL_QP(dev, i, 0, &status);



	mthca_array_cleanup(&dev->qp_table.qp, dev->limits.num_qps);

	mthca_alloc_cleanup(&dev->qp_table.alloc);

}

drivers/infiniband/hw/mthca/mthca_srq.c

+11 −14
Original line number Diff line number Diff line
@@ -172,6 +172,8 @@ static int mthca_alloc_srq_buf(struct mthca_dev *dev, struct mthca_pd *pd, 
			scatter->lkey = cpu_to_be32(MTHCA_INVAL_LKEY);

	}



	srq->last = get_wqe(srq, srq->max - 1);



	return 0;

}
@@ -189,7 +191,6 @@ int mthca_alloc_srq(struct mthca_dev *dev, struct mthca_pd *pd, 


	srq->max      = attr->max_wr;

	srq->max_gs   = attr->max_sge;

	srq->last     = NULL;

	srq->counter  = 0;



	if (mthca_is_memfree(dev))
@@ -409,7 +410,7 @@ int mthca_tavor_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr, 
			mthca_err(dev, "SRQ %06x full\n", srq->srqn);

			err = -ENOMEM;

			*bad_wr = wr;

			return nreq;

			break;

		}



		wqe       = get_wqe(srq, ind);
@@ -427,7 +428,7 @@ int mthca_tavor_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr, 
			err = -EINVAL;

			*bad_wr = wr;

			srq->last = prev_wqe;

			return nreq;

			break;

		}



		for (i = 0; i < wr->num_sge; ++i) {
@@ -446,20 +447,16 @@ int mthca_tavor_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr, 
			((struct mthca_data_seg *) wqe)->addr = 0;

		}



		if (likely(prev_wqe)) {

		((struct mthca_next_seg *) prev_wqe)->nda_op =

			cpu_to_be32((ind << srq->wqe_shift) | 1);

		wmb();

		((struct mthca_next_seg *) prev_wqe)->ee_nds =

			cpu_to_be32(MTHCA_NEXT_DBD);

		}



		srq->wrid[ind]  = wr->wr_id;

		srq->first_free = next_ind;

	}



	return nreq;



	if (likely(nreq)) {

		__be32 doorbell[2];
@@ -503,7 +500,7 @@ int mthca_arbel_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr, 
			mthca_err(dev, "SRQ %06x full\n", srq->srqn);

			err = -ENOMEM;

			*bad_wr = wr;

			return nreq;

			break;

		}



		wqe       = get_wqe(srq, ind);
@@ -519,7 +516,7 @@ int mthca_arbel_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr, 
		if (unlikely(wr->num_sge > srq->max_gs)) {

			err = -EINVAL;

			*bad_wr = wr;

			return nreq;

			break;

		}



		for (i = 0; i < wr->num_sge; ++i) {

drivers/infiniband/ulp/ipoib/ipoib.h

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ void ipoib_mcast_send(struct net_device *dev, union ib_gid *mgid, 


void ipoib_mcast_restart_task(void *dev_ptr);

int ipoib_mcast_start_thread(struct net_device *dev);

int ipoib_mcast_stop_thread(struct net_device *dev);

int ipoib_mcast_stop_thread(struct net_device *dev, int flush);



void ipoib_mcast_dev_down(struct net_device *dev);

void ipoib_mcast_dev_flush(struct net_device *dev);