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

Commit 3edac25f 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:
  IPoIB: Fix crash in path_rec_completion()
  IPoIB: Fix hang in ipoib_flush_paths()
  IPoIB: Don't enable NAPI when it's already enabled
  RDMA/cxgb3: Fix deadlock in iw_cxgb3 (hang when configuring interface)
  IB/ehca: Remove reference to special QP in case of port activation failure
  IB/mlx4: Set umem field to NULL in mlx4_ib_alloc_fast_reg_mr()
  mlx4_core: Fix unused variable warning
  RDMA/nes: Mitigate compatibility issue regarding PCIe write credits
  RDMA/nes: Fix CQ allocation scheme for multicast receive queue apps
  RDMA/nes: Correct handling of PBL resources
  RDMA/nes: Reindent mis-indented spinlocks
  RDMA/cxgb3: Fix too-big reserved field zeroing in iwch_post_zb_read()
  IB/ipath: Fix RDMA write with immediate copy of last packet
parents 504765f3 c35a2549

drivers/infiniband/hw/cxgb3/iwch_provider.c

+0 −6
Original line number Diff line number Diff line
@@ -1102,9 +1102,7 @@ static u64 fw_vers_string_to_u64(struct iwch_dev *iwch_dev) 
	char *cp, *next;

	unsigned fw_maj, fw_min, fw_mic;



	rtnl_lock();

	lldev->ethtool_ops->get_drvinfo(lldev, &info);

	rtnl_unlock();



	next = info.fw_version + 1;

	cp = strsep(&next, ".");
@@ -1192,9 +1190,7 @@ static ssize_t show_fw_ver(struct device *dev, struct device_attribute *attr, ch 
	struct net_device *lldev = iwch_dev->rdev.t3cdev_p->lldev;



	PDBG("%s dev 0x%p\n", __func__, dev);

	rtnl_lock();

	lldev->ethtool_ops->get_drvinfo(lldev, &info);

	rtnl_unlock();

	return sprintf(buf, "%s\n", info.fw_version);

}
@@ -1207,9 +1203,7 @@ static ssize_t show_hca(struct device *dev, struct device_attribute *attr, 
	struct net_device *lldev = iwch_dev->rdev.t3cdev_p->lldev;



	PDBG("%s dev 0x%p\n", __func__, dev);

	rtnl_lock();

	lldev->ethtool_ops->get_drvinfo(lldev, &info);

	rtnl_unlock();

	return sprintf(buf, "%s\n", info.driver);

}

drivers/infiniband/hw/cxgb3/iwch_qp.c

+0 −1
Original line number Diff line number Diff line
@@ -745,7 +745,6 @@ int iwch_post_zb_read(struct iwch_qp *qhp) 
	wqe->read.rdmaop = T3_READ_REQ;

	wqe->read.reserved[0] = 0;

	wqe->read.reserved[1] = 0;

	wqe->read.reserved[2] = 0;

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

	wqe->read.rem_to = cpu_to_be64(1);

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

drivers/infiniband/hw/ehca/ehca_irq.c

+28 −16
Original line number Diff line number Diff line
@@ -359,36 +359,48 @@ static void notify_port_conf_change(struct ehca_shca *shca, int port_num) 
	*old_attr = new_attr;

}



/* replay modify_qp for sqps -- return 0 if all is well, 1 if AQP1 destroyed */

static int replay_modify_qp(struct ehca_sport *sport)

{

	int aqp1_destroyed;

	unsigned long flags;



	spin_lock_irqsave(&sport->mod_sqp_lock, flags);



	aqp1_destroyed = !sport->ibqp_sqp[IB_QPT_GSI];



	if (sport->ibqp_sqp[IB_QPT_SMI])

		ehca_recover_sqp(sport->ibqp_sqp[IB_QPT_SMI]);

	if (!aqp1_destroyed)

		ehca_recover_sqp(sport->ibqp_sqp[IB_QPT_GSI]);



	spin_unlock_irqrestore(&sport->mod_sqp_lock, flags);



	return aqp1_destroyed;

}



static void parse_ec(struct ehca_shca *shca, u64 eqe)

{

	u8 ec   = EHCA_BMASK_GET(NEQE_EVENT_CODE, eqe);

	u8 port = EHCA_BMASK_GET(NEQE_PORT_NUMBER, eqe);

	u8 spec_event;

	struct ehca_sport *sport = &shca->sport[port - 1];

	unsigned long flags;



	switch (ec) {

	case 0x30: /* port availability change */

		if (EHCA_BMASK_GET(NEQE_PORT_AVAILABILITY, eqe)) {

			int suppress_event;

			/* replay modify_qp for sqps */

			spin_lock_irqsave(&sport->mod_sqp_lock, flags);

			suppress_event = !sport->ibqp_sqp[IB_QPT_GSI];

			if (sport->ibqp_sqp[IB_QPT_SMI])

				ehca_recover_sqp(sport->ibqp_sqp[IB_QPT_SMI]);

			if (!suppress_event)

				ehca_recover_sqp(sport->ibqp_sqp[IB_QPT_GSI]);

			spin_unlock_irqrestore(&sport->mod_sqp_lock, flags);



			/* AQP1 was destroyed, ignore this event */

			if (suppress_event)

			/* only replay modify_qp calls in autodetect mode;

			 * if AQP1 was destroyed, the port is already down

			 * again and we can drop the event.

			 */

			if (ehca_nr_ports < 0)

				if (replay_modify_qp(sport))

					break;



			sport->port_state = IB_PORT_ACTIVE;

			dispatch_port_event(shca, port, IB_EVENT_PORT_ACTIVE,

					    "is active");

			ehca_query_sma_attr(shca, port,

					    &sport->saved_attr);

			ehca_query_sma_attr(shca, port, &sport->saved_attr);

		} else {

			sport->port_state = IB_PORT_DOWN;

			dispatch_port_event(shca, port, IB_EVENT_PORT_ERR,

drivers/infiniband/hw/ehca/ehca_qp.c

+5 −0
Original line number Diff line number Diff line
@@ -860,6 +860,11 @@ static struct ehca_qp *internal_create_qp( 
	if (qp_type == IB_QPT_GSI) {

		h_ret = ehca_define_sqp(shca, my_qp, init_attr);

		if (h_ret != H_SUCCESS) {

			kfree(my_qp->mod_qp_parm);

			my_qp->mod_qp_parm = NULL;

			/* the QP pointer is no longer valid */

			shca->sport[init_attr->port_num - 1].ibqp_sqp[qp_type] =

				NULL;

			ret = ehca2ib_return_code(h_ret);

			goto create_qp_exit6;

		}

drivers/infiniband/hw/ipath/ipath_ruc.c

+5 −5
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ bail: 
/**

 * ipath_get_rwqe - copy the next RWQE into the QP's RWQE

 * @qp: the QP

 * @wr_id_only: update wr_id only, not SGEs

 * @wr_id_only: update qp->r_wr_id only, not qp->r_sge

 *

 * Return 0 if no RWQE is available, otherwise return 1.

 *
@@ -173,8 +173,6 @@ int ipath_get_rwqe(struct ipath_qp *qp, int wr_id_only) 
	u32 tail;

	int ret;



	qp->r_sge.sg_list = qp->r_sg_list;



	if (qp->ibqp.srq) {

		srq = to_isrq(qp->ibqp.srq);

		handler = srq->ibsrq.event_handler;
@@ -206,8 +204,10 @@ int ipath_get_rwqe(struct ipath_qp *qp, int wr_id_only) 
		wqe = get_rwqe_ptr(rq, tail);

		if (++tail >= rq->size)

			tail = 0;

	} while (!wr_id_only && !ipath_init_sge(qp, wqe, &qp->r_len,

						&qp->r_sge));

		if (wr_id_only)

			break;

		qp->r_sge.sg_list = qp->r_sg_list;

	} while (!ipath_init_sge(qp, wqe, &qp->r_len, &qp->r_sge));

	qp->r_wr_id = wqe->wr_id;

	wq->tail = tail;