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

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (42 commits)
  IB/qib: Fix refcount leak in lkey/rkey validation
  IB/qib: Improve SERDES tunning on QMH boards
  IB/qib: Unnecessary delayed completions on RC connection
  IB/qib: Issue pre-emptive NAKs on eager buffer overflow
  IB/qib: RDMA lkey/rkey validation is inefficient for large MRs
  IB/qib: Change QPN increment
  IB/qib: Add fix missing from earlier patch
  IB/qib: Change receive queue/QPN selection
  IB/qib: Fix interrupt mitigation
  IB/qib: Avoid duplicate writes to the rcv head register
  IB/qib: Add a few new SERDES tunings
  IB/qib: Reset packet list after freeing
  IB/qib: New SERDES init routine and improvements to SI quality
  IB/qib: Clear WAIT_SEND flags when setting QP to error state
  IB/qib: Fix context allocation with multiple HCAs
  IB/qib: Fix multi-Florida HCA host panic on reboot
  IB/qib: Handle transitions from ACTIVE_DEFERRED to ACTIVE better
  IB/qib: UD send with immediate receive completion has wrong size
  IB/qib: Set port physical state even if other fields are invalid
  IB/qib: Generate completion callback on errors
  ...
parents b9d919a4 2b76c057

drivers/infiniband/hw/cxgb3/cxio_hal.c

+2 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ int cxio_create_cq(struct cxio_rdev *rdev_p, struct t3_cq *cq, int kernel) 
	return (rdev_p->t3cdev_p->ctl(rdev_p->t3cdev_p, RDMA_CQ_SETUP, &setup));

}



#ifdef notyet

int cxio_resize_cq(struct cxio_rdev *rdev_p, struct t3_cq *cq)

{

	struct rdma_cq_setup setup;
@@ -200,6 +201,7 @@ int cxio_resize_cq(struct cxio_rdev *rdev_p, struct t3_cq *cq) 
	setup.ovfl_mode = 1;

	return (rdev_p->t3cdev_p->ctl(rdev_p->t3cdev_p, RDMA_CQ_SETUP, &setup));

}

#endif



static u32 get_qpid(struct cxio_rdev *rdev_p, struct cxio_ucontext *uctx)

{

drivers/infiniband/hw/cxgb3/iwch_provider.h

+0 −2
Original line number Diff line number Diff line
@@ -335,8 +335,6 @@ int iwch_post_terminate(struct iwch_qp *qhp, struct respQ_msg_t *rsp_msg); 
int iwch_post_zb_read(struct iwch_qp *qhp);

int iwch_register_device(struct iwch_dev *dev);

void iwch_unregister_device(struct iwch_dev *dev);

int iwch_quiesce_qps(struct iwch_cq *chp);

int iwch_resume_qps(struct iwch_cq *chp);

void stop_read_rep_timer(struct iwch_qp *qhp);

int iwch_register_mem(struct iwch_dev *rhp, struct iwch_pd *php,

		      struct iwch_mr *mhp, int shift);

drivers/infiniband/hw/cxgb3/iwch_qp.c

+0 −56
Original line number Diff line number Diff line
@@ -1149,59 +1149,3 @@ int iwch_modify_qp(struct iwch_dev *rhp, struct iwch_qp *qhp, 
	PDBG("%s exit state %d\n", __func__, qhp->attr.state);

	return ret;

}
 


static int quiesce_qp(struct iwch_qp *qhp)

{

	spin_lock_irq(&qhp->lock);

	iwch_quiesce_tid(qhp->ep);

	qhp->flags |= QP_QUIESCED;

	spin_unlock_irq(&qhp->lock);

	return 0;

}



static int resume_qp(struct iwch_qp *qhp)

{

	spin_lock_irq(&qhp->lock);

	iwch_resume_tid(qhp->ep);

	qhp->flags &= ~QP_QUIESCED;

	spin_unlock_irq(&qhp->lock);

	return 0;

}



int iwch_quiesce_qps(struct iwch_cq *chp)

{

	int i;

	struct iwch_qp *qhp;



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

		qhp = get_qhp(chp->rhp, i);

		if (!qhp)

			continue;

		if ((qhp->attr.rcq == chp->cq.cqid) && !qp_quiesced(qhp)) {

			quiesce_qp(qhp);

			continue;

		}

		if ((qhp->attr.scq == chp->cq.cqid) && !qp_quiesced(qhp))

			quiesce_qp(qhp);

	}

	return 0;

}



int iwch_resume_qps(struct iwch_cq *chp)

{

	int i;

	struct iwch_qp *qhp;



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

		qhp = get_qhp(chp->rhp, i);

		if (!qhp)

			continue;

		if ((qhp->attr.rcq == chp->cq.cqid) && qp_quiesced(qhp)) {

			resume_qp(qhp);

			continue;

		}

		if ((qhp->attr.scq == chp->cq.cqid) && qp_quiesced(qhp))

			resume_qp(qhp);

	}

	return 0;

}

drivers/infiniband/hw/cxgb4/iw_cxgb4.h

+0 −1
Original line number Diff line number Diff line
@@ -760,7 +760,6 @@ int c4iw_flush_rq(struct t4_wq *wq, struct t4_cq *cq, int count); 
int c4iw_flush_sq(struct t4_wq *wq, struct t4_cq *cq, int count);

int c4iw_ev_handler(struct c4iw_dev *rnicp, u32 qid);

u16 c4iw_rqes_posted(struct c4iw_qp *qhp);

int c4iw_post_zb_read(struct c4iw_qp *qhp);

int c4iw_post_terminate(struct c4iw_qp *qhp, struct t4_cqe *err_cqe);

u32 c4iw_get_cqid(struct c4iw_rdev *rdev, struct c4iw_dev_ucontext *uctx);

void c4iw_put_cqid(struct c4iw_rdev *rdev, u32 qid,

drivers/infiniband/hw/cxgb4/qp.c

+0 −32
Original line number Diff line number Diff line
@@ -892,36 +892,6 @@ static inline void build_term_codes(struct t4_cqe *err_cqe, u8 *layer_type, 
	}

}



int c4iw_post_zb_read(struct c4iw_qp *qhp)

{

	union t4_wr *wqe;

	struct sk_buff *skb;

	u8 len16;



	PDBG("%s enter\n", __func__);

	skb = alloc_skb(40, GFP_KERNEL);

	if (!skb) {

		printk(KERN_ERR "%s cannot send zb_read!!\n", __func__);

		return -ENOMEM;

	}

	set_wr_txq(skb, CPL_PRIORITY_DATA, qhp->ep->txq_idx);



	wqe = (union t4_wr *)skb_put(skb, sizeof wqe->read);

	memset(wqe, 0, sizeof wqe->read);

	wqe->read.r2 = cpu_to_be64(0);

	wqe->read.stag_sink = cpu_to_be32(1);

	wqe->read.to_sink_hi = cpu_to_be32(0);

	wqe->read.to_sink_lo = cpu_to_be32(1);

	wqe->read.stag_src = cpu_to_be32(1);

	wqe->read.plen = cpu_to_be32(0);

	wqe->read.to_src_hi = cpu_to_be32(0);

	wqe->read.to_src_lo = cpu_to_be32(1);

	len16 = DIV_ROUND_UP(sizeof wqe->read, 16);

	init_wr_hdr(wqe, 0, FW_RI_RDMA_READ_WR, FW_RI_COMPLETION_FLAG, len16);



	return c4iw_ofld_send(&qhp->rhp->rdev, skb);

}



static void post_terminate(struct c4iw_qp *qhp, struct t4_cqe *err_cqe,

			   gfp_t gfp)

{
@@ -1029,7 +999,6 @@ static int rdma_fini(struct c4iw_dev *rhp, struct c4iw_qp *qhp, 
	wqe->cookie = (unsigned long) &ep->com.wr_wait;



	wqe->u.fini.type = FW_RI_TYPE_FINI;

	c4iw_init_wr_wait(&ep->com.wr_wait);

	ret = c4iw_ofld_send(&rhp->rdev, skb);

	if (ret)

		goto out;
@@ -1125,7 +1094,6 @@ static int rdma_init(struct c4iw_dev *rhp, struct c4iw_qp *qhp) 
	if (qhp->attr.mpa_attr.initiator)

		build_rtr_msg(qhp->attr.mpa_attr.p2p_type, &wqe->u.init);



	c4iw_init_wr_wait(&qhp->ep->com.wr_wait);

	ret = c4iw_ofld_send(&rhp->rdev, skb);

	if (ret)

		goto out;