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

Commit 06a91a02 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'cma', 'cxgb3', 'ipath', 'ipoib', 'mad' and 'mlx4' into for-linus

parents 3f446754 be43324d 70117b9e e0819816 cd55ef5a 6e0d733d

drivers/infiniband/core/mad_rmpp.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static void ack_recv(struct mad_rmpp_recv *rmpp_recv, 
	msg = ib_create_send_mad(&rmpp_recv->agent->agent, recv_wc->wc->src_qp,

				 recv_wc->wc->pkey_index, 1, hdr_len,

				 0, GFP_KERNEL);

	if (!msg)

	if (IS_ERR(msg))

		return;



	format_ack(msg, (struct ib_rmpp_mad *) recv_wc->recv_buf.mad, rmpp_recv);

drivers/infiniband/hw/cxgb3/cxio_hal.c

+3 −3
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ static int __cxio_tpt_op(struct cxio_rdev *rdev_p, u32 reset_tpt_entry, 
				V_TPT_STAG_TYPE(type) | V_TPT_PDID(pdid));

		BUG_ON(page_size >= 28);

		tpt.flags_pagesize_qpid = cpu_to_be32(V_TPT_PERM(perm) |

				F_TPT_MW_BIND_ENABLE |

			((perm & TPT_MW_BIND) ? F_TPT_MW_BIND_ENABLE : 0) |

			V_TPT_ADDR_TYPE((zbva ? TPT_ZBTO : TPT_VATO)) |

			V_TPT_PAGE_SIZE(page_size));

		tpt.rsvd_pbl_addr = reset_tpt_entry ? 0 :

drivers/infiniband/hw/cxgb3/iwch_provider.c

+3 −25
Original line number Diff line number Diff line
@@ -1187,28 +1187,6 @@ static ssize_t show_rev(struct device *dev, struct device_attribute *attr, 
	return sprintf(buf, "%d\n", iwch_dev->rdev.t3cdev_p->type);

}



static int fw_supports_fastreg(struct iwch_dev *iwch_dev)

{

	struct ethtool_drvinfo info;

	struct net_device *lldev = iwch_dev->rdev.t3cdev_p->lldev;

	char *cp, *next;

	unsigned fw_maj, fw_min;



	rtnl_lock();

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

	rtnl_unlock();



	next = info.fw_version+1;

	cp = strsep(&next, ".");

	sscanf(cp, "%i", &fw_maj);

	cp = strsep(&next, ".");

	sscanf(cp, "%i", &fw_min);



	PDBG("%s maj %u min %u\n", __func__, fw_maj, fw_min);



	return fw_maj > 6 || (fw_maj == 6 && fw_min > 0);

}



static ssize_t show_fw_ver(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct iwch_dev *iwch_dev = container_of(dev, struct iwch_dev,
@@ -1325,12 +1303,12 @@ int iwch_register_device(struct iwch_dev *dev) 
	memset(&dev->ibdev.node_guid, 0, sizeof(dev->ibdev.node_guid));

	memcpy(&dev->ibdev.node_guid, dev->rdev.t3cdev_p->lldev->dev_addr, 6);

	dev->ibdev.owner = THIS_MODULE;

	dev->device_cap_flags = IB_DEVICE_LOCAL_DMA_LKEY | IB_DEVICE_MEM_WINDOW;

	dev->device_cap_flags = IB_DEVICE_LOCAL_DMA_LKEY |

				IB_DEVICE_MEM_WINDOW |

				IB_DEVICE_MEM_MGT_EXTENSIONS;



	/* cxgb3 supports STag 0. */

	dev->ibdev.local_dma_lkey = 0;

	if (fw_supports_fastreg(dev))

		dev->device_cap_flags |= IB_DEVICE_MEM_MGT_EXTENSIONS;



	dev->ibdev.uverbs_cmd_mask =

	    (1ull << IB_USER_VERBS_CMD_GET_CONTEXT) |

drivers/infiniband/hw/cxgb3/iwch_provider.h

+7 −0
Original line number Diff line number Diff line
@@ -293,9 +293,16 @@ static inline u32 iwch_ib_to_tpt_access(int acc) 
	return (acc & IB_ACCESS_REMOTE_WRITE ? TPT_REMOTE_WRITE : 0) |

	       (acc & IB_ACCESS_REMOTE_READ ? TPT_REMOTE_READ : 0) |

	       (acc & IB_ACCESS_LOCAL_WRITE ? TPT_LOCAL_WRITE : 0) |

	       (acc & IB_ACCESS_MW_BIND ? TPT_MW_BIND : 0) |

	       TPT_LOCAL_READ;

}



static inline u32 iwch_ib_to_tpt_bind_access(int acc)

{

	return (acc & IB_ACCESS_REMOTE_WRITE ? TPT_REMOTE_WRITE : 0) |

	       (acc & IB_ACCESS_REMOTE_READ ? TPT_REMOTE_READ : 0);

}



enum iwch_mmid_state {

	IWCH_STAG_STATE_VALID,

	IWCH_STAG_STATE_INVALID

drivers/infiniband/hw/cxgb3/iwch_qp.c

+8 −17
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ int iwch_bind_mw(struct ib_qp *qp, 
	wqe->bind.type = TPT_VATO;



	/* TBD: check perms */

	wqe->bind.perms = iwch_ib_to_tpt_access(mw_bind->mw_access_flags);

	wqe->bind.perms = iwch_ib_to_tpt_bind_access(mw_bind->mw_access_flags);

	wqe->bind.mr_stag = cpu_to_be32(mw_bind->mr->lkey);

	wqe->bind.mw_stag = cpu_to_be32(mw->rkey);

	wqe->bind.mw_len = cpu_to_be32(mw_bind->length);
@@ -879,20 +879,13 @@ static int rdma_init(struct iwch_dev *rhp, struct iwch_qp *qhp, 
		(qhp->attr.mpa_attr.xmit_marker_enabled << 1) |

		(qhp->attr.mpa_attr.crc_enabled << 2);



	/*

	 * XXX - The IWCM doesn't quite handle getting these

	 * attrs set before going into RTS.  For now, just turn

	 * them on always...

	 */

#if 0

	init_attr.qpcaps = qhp->attr.enableRdmaRead |

		(qhp->attr.enableRdmaWrite << 1) |

		(qhp->attr.enableBind << 2) |

		(qhp->attr.enable_stag0_fastreg << 3) |

		(qhp->attr.enable_stag0_fastreg << 4);

#else

	init_attr.qpcaps = 0x1f;

#endif

	init_attr.qpcaps = uP_RI_QP_RDMA_READ_ENABLE |

			   uP_RI_QP_RDMA_WRITE_ENABLE |

			   uP_RI_QP_BIND_ENABLE;

	if (!qhp->ibqp.uobject)

		init_attr.qpcaps |= uP_RI_QP_STAG0_ENABLE |

				    uP_RI_QP_FAST_REGISTER_ENABLE;



	init_attr.tcp_emss = qhp->ep->emss;

	init_attr.ord = qhp->attr.max_ord;

	init_attr.ird = qhp->attr.max_ird;
@@ -900,8 +893,6 @@ static int rdma_init(struct iwch_dev *rhp, struct iwch_qp *qhp, 
	init_attr.qp_dma_size = (1UL << qhp->wq.size_log2);

	init_attr.rqe_count = iwch_rqes_posted(qhp);

	init_attr.flags = qhp->attr.mpa_attr.initiator ? MPA_INITIATOR : 0;

	if (!qhp->ibqp.uobject)

		init_attr.flags |= PRIV_QP;

	if (peer2peer) {

		init_attr.rtr_type = RTR_READ;

		if (init_attr.ord == 0 && qhp->attr.mpa_attr.initiator)