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

Commit c0369b29 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'cma', 'ipoib', 'misc', 'mlx4', 'ocrdma', 'qib' and 'srp' into for-next

parents 418edaab 6c723a68 142ad5db a0675a38 d549f55f 51fa3ca3 22032991

drivers/infiniband/hw/amso1100/c2_rnic.c

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ static int c2_rnic_close(struct c2_dev *c2dev) 


/*

 * Called by c2_probe to initialize the RNIC. This principally

 * involves initalizing the various limits and resouce pools that

 * involves initializing the various limits and resource pools that

 * comprise the RNIC instance.

 */

int __devinit c2_rnic_init(struct c2_dev *c2dev)

drivers/infiniband/hw/cxgb3/iwch_cm.c

+1 −1
Original line number Diff line number Diff line
@@ -1680,7 +1680,7 @@ static int close_con_rpl(struct t3cdev *tdev, struct sk_buff *skb, void *ctx) 
 * T3A does 3 things when a TERM is received:

 * 1) send up a CPL_RDMA_TERMINATE message with the TERM packet

 * 2) generate an async event on the QP with the TERMINATE opcode

 * 3) post a TERMINATE opcde cqe into the associated CQ.

 * 3) post a TERMINATE opcode cqe into the associated CQ.

 *

 * For (1), we save the message in the qp for later consumer consumption.

 * For (2), we move the QP into TERMINATE, post a QP event and disconnect.

drivers/infiniband/hw/mlx4/mad.c

+10 −6
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ static void update_sm_ah(struct mlx4_ib_dev *dev, u8 port_num, u16 lid, u8 sl) 
{

	struct ib_ah *new_ah;

	struct ib_ah_attr ah_attr;

	unsigned long flags;



	if (!dev->send_agent[port_num - 1][0])

		return;
@@ -139,11 +140,11 @@ static void update_sm_ah(struct mlx4_ib_dev *dev, u8 port_num, u16 lid, u8 sl) 
	if (IS_ERR(new_ah))

		return;



	spin_lock(&dev->sm_lock);

	spin_lock_irqsave(&dev->sm_lock, flags);

	if (dev->sm_ah[port_num - 1])

		ib_destroy_ah(dev->sm_ah[port_num - 1]);

	dev->sm_ah[port_num - 1] = new_ah;

	spin_unlock(&dev->sm_lock);

	spin_unlock_irqrestore(&dev->sm_lock, flags);

}



/*
@@ -197,13 +198,15 @@ static void smp_snoop(struct ib_device *ibdev, u8 port_num, struct ib_mad *mad, 
static void node_desc_override(struct ib_device *dev,

			       struct ib_mad *mad)

{

	unsigned long flags;



	if ((mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_LID_ROUTED ||

	     mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE) &&

	    mad->mad_hdr.method == IB_MGMT_METHOD_GET_RESP &&

	    mad->mad_hdr.attr_id == IB_SMP_ATTR_NODE_DESC) {

		spin_lock(&to_mdev(dev)->sm_lock);

		spin_lock_irqsave(&to_mdev(dev)->sm_lock, flags);

		memcpy(((struct ib_smp *) mad)->data, dev->node_desc, 64);

		spin_unlock(&to_mdev(dev)->sm_lock);

		spin_unlock_irqrestore(&to_mdev(dev)->sm_lock, flags);

	}

}
@@ -213,6 +216,7 @@ static void forward_trap(struct mlx4_ib_dev *dev, u8 port_num, struct ib_mad *ma 
	struct ib_mad_send_buf *send_buf;

	struct ib_mad_agent *agent = dev->send_agent[port_num - 1][qpn];

	int ret;

	unsigned long flags;



	if (agent) {

		send_buf = ib_create_send_mad(agent, qpn, 0, 0, IB_MGMT_MAD_HDR,
@@ -225,13 +229,13 @@ static void forward_trap(struct mlx4_ib_dev *dev, u8 port_num, struct ib_mad *ma 
		 * wrong following the IB spec strictly, but we know

		 * it's OK for our devices).

		 */

		spin_lock(&dev->sm_lock);

		spin_lock_irqsave(&dev->sm_lock, flags);

		memcpy(send_buf->mad, mad, sizeof *mad);

		if ((send_buf->ah = dev->sm_ah[port_num - 1]))

			ret = ib_post_send_mad(send_buf, NULL);

		else

			ret = -EINVAL;

		spin_unlock(&dev->sm_lock);

		spin_unlock_irqrestore(&dev->sm_lock, flags);



		if (ret)

			ib_free_send_mad(send_buf);

drivers/infiniband/hw/mlx4/main.c

+3 −2
Original line number Diff line number Diff line
@@ -423,6 +423,7 @@ static int mlx4_ib_modify_device(struct ib_device *ibdev, int mask, 
				 struct ib_device_modify *props)

{

	struct mlx4_cmd_mailbox *mailbox;

	unsigned long flags;



	if (mask & ~IB_DEVICE_MODIFY_NODE_DESC)

		return -EOPNOTSUPP;
@@ -430,9 +431,9 @@ static int mlx4_ib_modify_device(struct ib_device *ibdev, int mask, 
	if (!(mask & IB_DEVICE_MODIFY_NODE_DESC))

		return 0;



	spin_lock(&to_mdev(ibdev)->sm_lock);

	spin_lock_irqsave(&to_mdev(ibdev)->sm_lock, flags);

	memcpy(ibdev->node_desc, props->node_desc, 64);

	spin_unlock(&to_mdev(ibdev)->sm_lock);

	spin_unlock_irqrestore(&to_mdev(ibdev)->sm_lock, flags);



	/*

	 * If possible, pass node desc to FW, so it can generate

drivers/infiniband/hw/mlx4/qp.c

+5 −1
Original line number Diff line number Diff line
@@ -1407,6 +1407,7 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_send_wr *wr, 
	struct mlx4_wqe_mlx_seg *mlx = wqe;

	struct mlx4_wqe_inline_seg *inl = wqe + sizeof *mlx;

	struct mlx4_ib_ah *ah = to_mah(wr->wr.ud.ah);

	struct net_device *ndev;

	union ib_gid sgid;

	u16 pkey;

	int send_size;
@@ -1483,7 +1484,10 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_send_wr *wr, 


		memcpy(sqp->ud_header.eth.dmac_h, ah->av.eth.mac, 6);

		/* FIXME: cache smac value? */

		smac = to_mdev(sqp->qp.ibqp.device)->iboe.netdevs[sqp->qp.port - 1]->dev_addr;

		ndev = to_mdev(sqp->qp.ibqp.device)->iboe.netdevs[sqp->qp.port - 1];

		if (!ndev)

			return -ENODEV;

		smac = ndev->dev_addr;

		memcpy(sqp->ud_header.eth.smac_h, smac, 6);

		if (!memcmp(sqp->ud_header.eth.smac_h, sqp->ud_header.eth.dmac_h, 6))

			mlx->flags |= cpu_to_be32(MLX4_WQE_CTRL_FORCE_LOOPBACK);